From b5f510dcad718578c1624659650c3e7b0955f624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 4 Apr 2014 13:35:28 +0200 Subject: [PATCH] added weatherground plugin frame --- libguh/deviceplugin.h | 2 +- plugins/deviceplugins/conrad/devicepluginconrad.h | 2 +- plugins/deviceplugins/deviceplugins.pro | 1 + plugins/deviceplugins/elro/devicepluginelro.h | 2 +- plugins/deviceplugins/intertechno/devicepluginintertechno.h | 2 +- plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h | 2 +- plugins/deviceplugins/mock/devicepluginmock.h | 2 +- plugins/deviceplugins/wifidetector/devicepluginwifidetector.h | 2 +- server/main.cpp | 1 + server/rule.cpp | 2 +- server/server.pro | 1 + tests/auto/testjsonrpc.cpp | 2 +- tests/mocks/mockdeviceplugin/devicepluginmockdevice.h | 2 +- 13 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libguh/deviceplugin.h b/libguh/deviceplugin.h index e0739ef6..f551373f 100644 --- a/libguh/deviceplugin.h +++ b/libguh/deviceplugin.h @@ -72,6 +72,6 @@ private: friend class DeviceManager; }; -Q_DECLARE_INTERFACE(DevicePlugin, "org.guhyourhome.DevicePlugin") +Q_DECLARE_INTERFACE(DevicePlugin, "org.guh.DevicePlugin") #endif diff --git a/plugins/deviceplugins/conrad/devicepluginconrad.h b/plugins/deviceplugins/conrad/devicepluginconrad.h index 8fdcd279..2772a035 100644 --- a/plugins/deviceplugins/conrad/devicepluginconrad.h +++ b/plugins/deviceplugins/conrad/devicepluginconrad.h @@ -25,7 +25,7 @@ class DevicePluginConrad : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginconrad.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginconrad.json") Q_INTERFACES(DevicePlugin) public: diff --git a/plugins/deviceplugins/deviceplugins.pro b/plugins/deviceplugins/deviceplugins.pro index 412a08cf..dbde40b1 100644 --- a/plugins/deviceplugins/deviceplugins.pro +++ b/plugins/deviceplugins/deviceplugins.pro @@ -5,5 +5,6 @@ SUBDIRS += elro \ wifidetector \ conrad \ mock \ + weatherground \ # boblight \ diff --git a/plugins/deviceplugins/elro/devicepluginelro.h b/plugins/deviceplugins/elro/devicepluginelro.h index 8c95dcca..5deb6afb 100644 --- a/plugins/deviceplugins/elro/devicepluginelro.h +++ b/plugins/deviceplugins/elro/devicepluginelro.h @@ -25,7 +25,7 @@ class DevicePluginElro : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginelro.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginelro.json") Q_INTERFACES(DevicePlugin) public: diff --git a/plugins/deviceplugins/intertechno/devicepluginintertechno.h b/plugins/deviceplugins/intertechno/devicepluginintertechno.h index 0c8e2c34..a9ed31bc 100644 --- a/plugins/deviceplugins/intertechno/devicepluginintertechno.h +++ b/plugins/deviceplugins/intertechno/devicepluginintertechno.h @@ -25,7 +25,7 @@ class DevicePluginIntertechno : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginintertechno.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginintertechno.json") Q_INTERFACES(DevicePlugin) public: diff --git a/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h index 1f73c6dc..f0277550 100644 --- a/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h +++ b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h @@ -26,7 +26,7 @@ class DevicePluginMeisterAnker : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginmeisteranker.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginmeisteranker.json") Q_INTERFACES(DevicePlugin) public: diff --git a/plugins/deviceplugins/mock/devicepluginmock.h b/plugins/deviceplugins/mock/devicepluginmock.h index c85f3d33..40eff0b7 100644 --- a/plugins/deviceplugins/mock/devicepluginmock.h +++ b/plugins/deviceplugins/mock/devicepluginmock.h @@ -29,7 +29,7 @@ class DevicePluginMock : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginmock.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginmock.json") Q_INTERFACES(DevicePlugin) public: diff --git a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h index b586ad9b..01323096 100644 --- a/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h +++ b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h @@ -27,7 +27,7 @@ class DevicePluginWifiDetector : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginwifidetector.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginwifidetector.json") Q_INTERFACES(DevicePlugin) public: diff --git a/server/main.cpp b/server/main.cpp index 907e592a..7e8cb0a3 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -27,6 +27,7 @@ Q_IMPORT_PLUGIN(DevicePluginMeisterAnker) Q_IMPORT_PLUGIN(DevicePluginWifiDetector) Q_IMPORT_PLUGIN(DevicePluginConrad) Q_IMPORT_PLUGIN(DevicePluginMock) +Q_IMPORT_PLUGIN(DevicePluginWeatherground) int main(int argc, char *argv[]) { diff --git a/server/rule.cpp b/server/rule.cpp index ccbf3b02..22a84926 100644 --- a/server/rule.cpp +++ b/server/rule.cpp @@ -23,7 +23,7 @@ \ingroup rules \inmodule server - A Rule is always evented by a \l{Event}, has \l{State}{States} + A Rule is always evented by an \l{Event}, has \l{State}{States} to be compared and \l{Action}{Actions} to be executed. Additionally a Rule is either of type \l{Rule::RuleTypeAll} or \l{Rule::RuleTypeAny} which determines if all or any of the \l{State}{States} must be matching diff --git a/server/server.pro b/server/server.pro index 34e0376e..dd558b44 100644 --- a/server/server.pro +++ b/server/server.pro @@ -21,3 +21,4 @@ LIBS += -L../plugins/deviceplugins/meisteranker/ -lguh_devicepluginmeisteranker LIBS += -L../plugins/deviceplugins/wifidetector/ -lguh_devicepluginwifidetector LIBS += -L../plugins/deviceplugins/conrad -lguh_devicepluginconrad LIBS += -L../plugins/deviceplugins/mock -lguh_devicepluginmock +LIBS += -L../plugins/deviceplugins/weatherground -lguh_devicepluginweatherground diff --git a/tests/auto/testjsonrpc.cpp b/tests/auto/testjsonrpc.cpp index 4577ed64..09244cb8 100644 --- a/tests/auto/testjsonrpc.cpp +++ b/tests/auto/testjsonrpc.cpp @@ -51,7 +51,7 @@ private: void TestJSONRPC::initTestcase() { - QCoreApplication::instance()->setOrganizationName("guhyourhome-test"); + QCoreApplication::instance()->setOrganizationName("guh-test"); qDebug() << "creating core"; GuhCore::instance(); qDebug() << "creating spy"; diff --git a/tests/mocks/mockdeviceplugin/devicepluginmockdevice.h b/tests/mocks/mockdeviceplugin/devicepluginmockdevice.h index a5531acc..a3701deb 100644 --- a/tests/mocks/mockdeviceplugin/devicepluginmockdevice.h +++ b/tests/mocks/mockdeviceplugin/devicepluginmockdevice.h @@ -25,7 +25,7 @@ class DevicePluginMockDevice: public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.guhyourhome.DevicePlugin" FILE "devicepluginmockdevice.json") + Q_PLUGIN_METADATA(IID "org.guh.DevicePlugin" FILE "devicepluginmockdevice.json") Q_INTERFACES(DevicePlugin) public: