moved hardware/upnpdiscover* -> network/upnpdiscovery/*

libguh/devicemanager.h

@@ -27,8 +27,8 @@
 #include "types/action.h"
 #include "types/vendor.h"
 
-#include "hardware/upnpdiscovery/upnpdiscovery.h"
+#include "network/upnpdiscovery/upnpdiscovery.h"
-#include "hardware/upnpdiscovery/upnpdevicedescriptor.h"
+#include "network/upnpdiscovery/upnpdevicedescriptor.h"
 
 #include <QObject>
 #include <QTimer>

libguh/libguh.pro

@@ -19,9 +19,10 @@ SOURCES += plugin/device.cpp \
            hardware/radio433/radio433transmitter.cpp \
            hardware/radio433/radio433receiver.cpp \
            hardware/radio433/radio433brennenstuhlgateway.cpp \
-           hardware/upnpdiscovery/upnpdiscovery.cpp \
+           network/upnpdiscovery/upnpdiscovery.cpp \
-           hardware/upnpdiscovery/upnpdevice.cpp \
+           network/upnpdiscovery/upnpdevice.cpp \
-           hardware/upnpdiscovery/upnpdevicedescriptor.cpp \
+           network/upnpdiscovery/upnpdevicedescriptor.cpp \
+           network/upnpdiscovery/upnpdiscoveryrequest.cpp \
            types/action.cpp \
            types/actiontype.cpp \
            types/state.cpp \
@@ -34,7 +35,6 @@ SOURCES += plugin/device.cpp \
            types/param.cpp \
            types/paramdescriptor.cpp \
            types/statedescriptor.cpp \
-    hardware/upnpdiscovery/upnpdiscoveryrequest.cpp
 
 HEADERS += plugin/device.h \
            plugin/deviceclass.h \
@@ -47,9 +47,10 @@ HEADERS += plugin/device.h \
            hardware/radio433/radio433transmitter.h \
            hardware/radio433/radio433receiver.h \
            hardware/radio433/radio433brennenstuhlgateway.h \
-           hardware/upnpdiscovery/upnpdiscovery.h \
+           network/upnpdiscovery/upnpdiscovery.h \
-           hardware/upnpdiscovery/upnpdevice.h \
+           network/upnpdiscovery/upnpdevice.h \
-           hardware/upnpdiscovery/upnpdevicedescriptor.h \
+           network/upnpdiscovery/upnpdevicedescriptor.h \
+           network/upnpdiscovery/upnpdiscoveryrequest.h \
            types/action.h \
            types/actiontype.h \
            types/state.h \
@@ -64,4 +65,3 @@ HEADERS += plugin/device.h \
            types/paramdescriptor.h \
            types/statedescriptor.h \
            typeutils.h \
-    hardware/upnpdiscovery/upnpdiscoveryrequest.h

libguh/plugin/deviceplugin.cpp

@@ -125,7 +125,7 @@
 
 #include "devicemanager.h"
 #include "hardware/radio433/radio433.h"
-#include "hardware/upnpdiscovery/upnpdiscovery.h"
+#include "network/upnpdiscovery/upnpdiscovery.h"
 
 #include <QDebug>
 #include <QFileInfo>

plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h

@@ -19,9 +19,9 @@
 #ifndef DEVICEPLUGINLGSMARTTV_H
 #define DEVICEPLUGINLGSMARTTV_H
 
-#include "hardware/upnpdiscovery/upnpdevicedescriptor.h"
 #include "plugin/deviceplugin.h"
 #include "tvdevice.h"
+#include "network/upnpdiscovery/upnpdevicedescriptor.h"
 
 class DevicePluginLgSmartTv : public DevicePlugin
 {

plugins/deviceplugins/lgsmarttv/tvdevice.h

@@ -33,7 +33,7 @@
 
 #include "plugin/deviceplugin.h"
 #include "tveventhandler.h"
-#include "hardware/upnpdiscovery/upnpdevice.h"
+#include "network/upnpdiscovery/upnpdevice.h"
 
 class TvDevice : public UpnpDevice
 {

plugins/deviceplugins/wemo/wemoswitch.h

@@ -30,7 +30,7 @@
 #include <QXmlStreamAttributes>
 
 #include "plugin/deviceplugin.h"
-#include "hardware/upnpdiscovery/upnpdevice.h"
+#include "network/upnpdiscovery/upnpdevice.h"
 
 class WemoSwitch : public UpnpDevice
 {