From 4a241cf1d52e7e7b1728c0eae5e8ff0efc6276ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 13 Feb 2015 09:49:43 +0100 Subject: [PATCH] moved hardware/upnpdiscover* -> network/upnpdiscovery/* --- libguh/devicemanager.h | 4 ++-- libguh/libguh.pro | 16 ++++++++-------- .../upnpdiscovery/upnpdevice.cpp | 0 .../upnpdiscovery/upnpdevice.h | 0 .../upnpdiscovery/upnpdevicedescriptor.cpp | 0 .../upnpdiscovery/upnpdevicedescriptor.h | 0 .../upnpdiscovery/upnpdiscovery.cpp | 0 .../upnpdiscovery/upnpdiscovery.h | 0 .../upnpdiscovery/upnpdiscoveryrequest.cpp | 0 .../upnpdiscovery/upnpdiscoveryrequest.h | 0 libguh/plugin/deviceplugin.cpp | 2 +- .../lgsmarttv/devicepluginlgsmarttv.h | 2 +- plugins/deviceplugins/lgsmarttv/tvdevice.h | 2 +- plugins/deviceplugins/wemo/wemoswitch.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename libguh/{hardware => network}/upnpdiscovery/upnpdevice.cpp (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdevice.h (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdevicedescriptor.cpp (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdevicedescriptor.h (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdiscovery.cpp (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdiscovery.h (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdiscoveryrequest.cpp (100%) rename libguh/{hardware => network}/upnpdiscovery/upnpdiscoveryrequest.h (100%) diff --git a/libguh/devicemanager.h b/libguh/devicemanager.h index bb11f0f9..7dc56e1b 100644 --- a/libguh/devicemanager.h +++ b/libguh/devicemanager.h @@ -27,8 +27,8 @@ #include "types/action.h" #include "types/vendor.h" -#include "hardware/upnpdiscovery/upnpdiscovery.h" -#include "hardware/upnpdiscovery/upnpdevicedescriptor.h" +#include "network/upnpdiscovery/upnpdiscovery.h" +#include "network/upnpdiscovery/upnpdevicedescriptor.h" #include #include diff --git a/libguh/libguh.pro b/libguh/libguh.pro index dfb70655..69e8bd15 100644 --- a/libguh/libguh.pro +++ b/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 \ - hardware/upnpdiscovery/upnpdevice.cpp \ - hardware/upnpdiscovery/upnpdevicedescriptor.cpp \ + network/upnpdiscovery/upnpdiscovery.cpp \ + network/upnpdiscovery/upnpdevice.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 \ - hardware/upnpdiscovery/upnpdevice.h \ - hardware/upnpdiscovery/upnpdevicedescriptor.h \ + network/upnpdiscovery/upnpdiscovery.h \ + network/upnpdiscovery/upnpdevice.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 diff --git a/libguh/hardware/upnpdiscovery/upnpdevice.cpp b/libguh/network/upnpdiscovery/upnpdevice.cpp similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdevice.cpp rename to libguh/network/upnpdiscovery/upnpdevice.cpp diff --git a/libguh/hardware/upnpdiscovery/upnpdevice.h b/libguh/network/upnpdiscovery/upnpdevice.h similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdevice.h rename to libguh/network/upnpdiscovery/upnpdevice.h diff --git a/libguh/hardware/upnpdiscovery/upnpdevicedescriptor.cpp b/libguh/network/upnpdiscovery/upnpdevicedescriptor.cpp similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdevicedescriptor.cpp rename to libguh/network/upnpdiscovery/upnpdevicedescriptor.cpp diff --git a/libguh/hardware/upnpdiscovery/upnpdevicedescriptor.h b/libguh/network/upnpdiscovery/upnpdevicedescriptor.h similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdevicedescriptor.h rename to libguh/network/upnpdiscovery/upnpdevicedescriptor.h diff --git a/libguh/hardware/upnpdiscovery/upnpdiscovery.cpp b/libguh/network/upnpdiscovery/upnpdiscovery.cpp similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdiscovery.cpp rename to libguh/network/upnpdiscovery/upnpdiscovery.cpp diff --git a/libguh/hardware/upnpdiscovery/upnpdiscovery.h b/libguh/network/upnpdiscovery/upnpdiscovery.h similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdiscovery.h rename to libguh/network/upnpdiscovery/upnpdiscovery.h diff --git a/libguh/hardware/upnpdiscovery/upnpdiscoveryrequest.cpp b/libguh/network/upnpdiscovery/upnpdiscoveryrequest.cpp similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdiscoveryrequest.cpp rename to libguh/network/upnpdiscovery/upnpdiscoveryrequest.cpp diff --git a/libguh/hardware/upnpdiscovery/upnpdiscoveryrequest.h b/libguh/network/upnpdiscovery/upnpdiscoveryrequest.h similarity index 100% rename from libguh/hardware/upnpdiscovery/upnpdiscoveryrequest.h rename to libguh/network/upnpdiscovery/upnpdiscoveryrequest.h diff --git a/libguh/plugin/deviceplugin.cpp b/libguh/plugin/deviceplugin.cpp index c94a4e73..81952815 100644 --- a/libguh/plugin/deviceplugin.cpp +++ b/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 #include diff --git a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h index 0d7ea40b..b327ef7c 100644 --- a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h +++ b/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 { diff --git a/plugins/deviceplugins/lgsmarttv/tvdevice.h b/plugins/deviceplugins/lgsmarttv/tvdevice.h index c4950d11..408a9f60 100644 --- a/plugins/deviceplugins/lgsmarttv/tvdevice.h +++ b/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 { diff --git a/plugins/deviceplugins/wemo/wemoswitch.h b/plugins/deviceplugins/wemo/wemoswitch.h index 2c341dc8..ca08c1f3 100644 --- a/plugins/deviceplugins/wemo/wemoswitch.h +++ b/plugins/deviceplugins/wemo/wemoswitch.h @@ -30,7 +30,7 @@ #include #include "plugin/deviceplugin.h" -#include "hardware/upnpdiscovery/upnpdevice.h" +#include "network/upnpdiscovery/upnpdevice.h" class WemoSwitch : public UpnpDevice {