ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed inline comments

Browse Source
This commit is contained in:
Simon Stürz 2015-02-17 10:14:51 +01:00 committed by Michael Zanetti
parent 475cadb03b
commit 957a42955a
5 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libguh/devicemanager.cpp
View File

@ -938,7 +938,24 @@ void DeviceManager::replyReady(const PluginId &pluginId, QNetworkReply *reply)
{
foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
if (devicePlugin->requiredHardware().testFlag(HardwareResourceNetworkManager) && devicePlugin->pluginId() == pluginId) {
devicePlugin->replyReady(reply);
devicePlugin->networkManagerReplyReady(reply);
}
}
}
void DeviceManager::upnpDiscoveryFinished(const QList<UpnpDeviceDescriptor> &deviceDescriptorList, const PluginId &pluginId)
{
foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
if (devicePlugin->requiredHardware().testFlag(HardwareResourceUpnpDisovery) && devicePlugin->pluginId() == pluginId) {
devicePlugin->upnpDiscoveryFinished(deviceDescriptorList);
}
}
}
void DeviceManager::upnpNotifyReceived(const QByteArray &notifyData)
{
foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
if (devicePlugin->requiredHardware().testFlag(HardwareResourceUpnpDisovery)) {
devicePlugin->upnpNotifyReceived(notifyData);
}
}
}

8
libguh/network/networkmanager.cpp
View File

@ -29,21 +29,21 @@ NetworkManager::NetworkManager(QObject *parent) :
QNetworkReply *NetworkManager::get(const PluginId &pluginId, const QNetworkRequest &request)
{
QNetworkReply *reply = m_manager->get(request);
m_replys.insert(reply, pluginId);
m_replies.insert(reply, pluginId);
return reply;
}
QNetworkReply *NetworkManager::post(const PluginId &pluginId, const QNetworkRequest &request, const QByteArray &data)
{
QNetworkReply *reply = m_manager->post(request, data);
m_replys.insert(reply, pluginId);
m_replies.insert(reply, pluginId);
return reply;
}
QNetworkReply *NetworkManager::put(const PluginId &pluginId, const QNetworkRequest &request, const QByteArray &data)
{
QNetworkReply *reply = m_manager->put(request, data);
m_replys.insert(reply, pluginId);
m_replies.insert(reply, pluginId);
return reply;
}
@ -54,6 +54,6 @@ void NetworkManager::replyFinished(QNetworkReply *reply)
}
// NOTE: Each plugin has to delete his own replys with deleteLater()!!
PluginId pluginId = m_replys.take(reply);
PluginId pluginId = m_replies.take(reply);
emit replyReady(pluginId, reply);
}

4
libguh/network/networkmanager.h
View File

@ -42,7 +42,7 @@ public:
private:
QNetworkAccessManager *m_manager;
QHash<QNetworkReply *, PluginId> m_replys;
QHash<QNetworkReply *, PluginId> m_replies;
signals:
void replyReady(const PluginId &pluginId, QNetworkReply *reply);
@ -50,8 +50,6 @@ signals:
private slots:
void replyFinished(QNetworkReply *reply);
public slots:
};
#endif // NETWORKMANAGER_H

6
libguh/plugin/deviceplugin.cpp
View File

@ -519,7 +519,7 @@ bool DevicePlugin::transmitData(int delay, QList<int> rawData, int repetitions)
return false;
}
QNetworkReply *DevicePlugin::get(const QNetworkRequest &request)
QNetworkReply *DevicePlugin::networkManagerGet(const QNetworkRequest &request)
{
if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
return deviceManager()->m_networkManager->get(pluginId(), request);
@ -529,7 +529,7 @@ QNetworkReply *DevicePlugin::get(const QNetworkRequest &request)
return nullptr;
}
QNetworkReply *DevicePlugin::post(const QNetworkRequest &request, const QByteArray &data)
QNetworkReply *DevicePlugin::networkManagerPost(const QNetworkRequest &request, const QByteArray &data)
{
if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
return deviceManager()->m_networkManager->post(pluginId(), request, data);
@ -539,7 +539,7 @@ QNetworkReply *DevicePlugin::post(const QNetworkRequest &request, const QByteArr
return nullptr;
}
QNetworkReply *DevicePlugin::put(const QNetworkRequest &request, const QByteArray &data)
QNetworkReply *DevicePlugin::networkManagerPut(const QNetworkRequest &request, const QByteArray &data)
{
if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
return deviceManager()->m_networkManager->put(pluginId(), request, data);

8
libguh/plugin/deviceplugin.h
View File

@ -64,7 +64,7 @@ public:
virtual void upnpDiscoveryFinished(const QList<UpnpDeviceDescriptor> &upnpDeviceDescriptorList) {Q_UNUSED(upnpDeviceDescriptorList)}
virtual void upnpNotifyReceived(const QByteArray &notifyData) {Q_UNUSED(notifyData)}
virtual void replyReady(QNetworkReply *reply) {Q_UNUSED(reply)}
virtual void networkManagerReplyReady(QNetworkReply *reply) {Q_UNUSED(reply)}
// Configuration
virtual QList<ParamType> configurationDescription() const;
@ -97,9 +97,9 @@ protected:
bool transmitData(int delay, QList<int> rawData);
// Network manager
QNetworkReply *get(const QNetworkRequest &request);
QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
QNetworkReply *networkManagerGet(const QNetworkRequest &request);
QNetworkReply *networkManagerPost(const QNetworkRequest &request, const QByteArray &data);
QNetworkReply *networkManagerPut(const QNetworkRequest &request, const QByteArray &data);
private:
void initPlugin(const QJsonObject &metaData, DeviceManager *deviceManager);