From 86ff25258ea3b48c572abce97dd31d78cd150722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 2 Jan 2014 16:01:16 +0100 Subject: [PATCH] fixed plugin names --- .../devicepluginelro.cpp} | 42 +++++++++---------- .../devicepluginelro.h} | 12 +++--- .../devicepluginelro.json} | 0 .../devicepluginelro.pro} | 6 +-- .../devicepluginintertechno.cpp} | 18 ++++---- .../devicepluginintertechno.h} | 12 +++--- .../devicepluginintertechno.json} | 0 .../devicepluginintertechno.pro} | 6 +-- plugins/deviceplugins/deviceplugins.pro | 2 +- 9 files changed, 49 insertions(+), 49 deletions(-) rename plugins/deviceplugins/{rfremotemumbi/rfremotemumbi.cpp => devicepluginelro/devicepluginelro.cpp} (89%) rename plugins/deviceplugins/{rfremotemumbi/rfremotemumbi.h => devicepluginelro/devicepluginelro.h} (70%) rename plugins/deviceplugins/{rfremoteintertechno/rfremoteintertechno.json => devicepluginelro/devicepluginelro.json} (100%) rename plugins/deviceplugins/{rfremotemumbi/rfremotemumbi.pro => devicepluginelro/devicepluginelro.pro} (58%) rename plugins/deviceplugins/{rfremoteintertechno/rfremoteintertechno.cpp => devicepluginintertechno/devicepluginintertechno.cpp} (94%) rename plugins/deviceplugins/{rfremoteintertechno/rfremoteintertechno.h => devicepluginintertechno/devicepluginintertechno.h} (66%) rename plugins/deviceplugins/{rfremotemumbi/rfremotemumbi.json => devicepluginintertechno/devicepluginintertechno.json} (100%) rename plugins/deviceplugins/{rfremoteintertechno/rfremoteintertechno.pro => devicepluginintertechno/devicepluginintertechno.pro} (53%) diff --git a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.cpp b/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp similarity index 89% rename from plugins/deviceplugins/rfremotemumbi/rfremotemumbi.cpp rename to plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp index 14ffc105..9e0d4048 100644 --- a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.cpp +++ b/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp @@ -1,4 +1,4 @@ -#include "rfremotemumbi.h" +#include "devicepluginelro.h" #include "device.h" #include "devicemanager.h" @@ -7,26 +7,26 @@ #include #include -QUuid mumbiRemote = QUuid("d85c1ef4-197c-4053-8e40-707aa671d302"); -QUuid mumbiRfRemoteMumbi = QUuid("308ae6e6-38b3-4b3a-a513-3199da2764f8"); +QUuid elroRemote = QUuid("d85c1ef4-197c-4053-8e40-707aa671d302"); +QUuid elroDevicePlugin = QUuid("308ae6e6-38b3-4b3a-a513-3199da2764f8"); -RfRemoteMumbi::RfRemoteMumbi() +DevicePluginElro::DevicePluginElro() { } -void RfRemoteMumbi::init() +void DevicePluginElro::init() { - connect(deviceManager()->radio433(), &Radio433::dataReceived, this, &RfRemoteMumbi::dataReceived); + connect(deviceManager()->radio433(), &Radio433::dataReceived, this, &DevicePluginElro::dataReceived); } -QList RfRemoteMumbi::supportedDevices() const +QList DevicePluginElro::supportedDevices() const { // TODO: load list from config with static uuid QList ret; // Remote - DeviceClass deviceClassRfRemoteMumbi(pluginId(), mumbiRemote); - deviceClassRfRemoteMumbi.setName("Mumbi Remote"); + DeviceClass deviceClassDevicePluginElro(pluginId(), elroRemote); + deviceClassDevicePluginElro.setName("Elro Remote"); QVariantList deviceParamsRemote; QVariantMap channelParam; @@ -46,7 +46,7 @@ QList RfRemoteMumbi::supportedDevices() const channelParam.insert("type", "bool"); deviceParamsRemote.append(channelParam); - deviceClassRfRemoteMumbi.setParams(deviceParamsRemote); + deviceClassDevicePluginElro.setParams(deviceParamsRemote); QList buttonTriggers; @@ -81,12 +81,12 @@ QList RfRemoteMumbi::supportedDevices() const buttonETrigger.setParameters(paramsRemote); buttonTriggers.append(buttonETrigger); - deviceClassRfRemoteMumbi.setTriggers(buttonTriggers); - ret.append(deviceClassRfRemoteMumbi); + deviceClassDevicePluginElro.setTriggers(buttonTriggers); + ret.append(deviceClassDevicePluginElro); // Switch - DeviceClass deviceClassRfSwitchMumbi(pluginId(), mumbiRfRemoteMumbi); - deviceClassRfSwitchMumbi.setName("Mumbi Power Switch"); + DeviceClass deviceClassRfSwitchMumbi(pluginId(), elroDevicePlugin); + deviceClassRfSwitchMumbi.setName("Elro Power Switch"); QVariantList deviceParamsSwitch; QVariantMap paramSwitch; @@ -140,17 +140,17 @@ QList RfRemoteMumbi::supportedDevices() const return ret; } -QString RfRemoteMumbi::pluginName() const +QString DevicePluginElro::pluginName() const { - return QStringLiteral("RF Remote Mumbi"); + return QStringLiteral("Elro"); } -QUuid RfRemoteMumbi::pluginId() const +QUuid DevicePluginElro::pluginId() const { return QUuid("2b267f81-d9ae-4f4f-89a0-7386b547cfd3"); } -void RfRemoteMumbi::executeAction(Device *device, const Action &action) +void DevicePluginElro::executeAction(Device *device, const Action &action) { QList rawData; @@ -244,7 +244,7 @@ void RfRemoteMumbi::executeAction(Device *device, const Action &action) deviceManager()->radio433()->sendData(rawData); } -void RfRemoteMumbi::dataReceived(QList rawData) +void DevicePluginElro::dataReceived(QList rawData) { // filter right here a wrong signal length if(rawData.length() != 49){ @@ -332,7 +332,7 @@ void RfRemoteMumbi::dataReceived(QList rawData) } Device *device = 0; - QList deviceList = deviceManager()->findConfiguredDevices(mumbiRemote); + QList deviceList = deviceManager()->findConfiguredDevices(elroRemote); foreach (Device *dev, deviceList) { if (dev->params().contains("channel1") && dev->params().value("channel1").toBool() == group.at(0) && dev->params().contains("channel2") && dev->params().value("channel2").toBool() == group.at(1) && @@ -346,7 +346,7 @@ void RfRemoteMumbi::dataReceived(QList rawData) } } if (!device) { - qWarning() << "couldn't find any configured device for mumbi:" << binCode.left(10) ; + qWarning() << "couldn't find any configured device for elro:" << binCode.left(10) ; return; } diff --git a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.h b/plugins/deviceplugins/devicepluginelro/devicepluginelro.h similarity index 70% rename from plugins/deviceplugins/rfremotemumbi/rfremotemumbi.h rename to plugins/deviceplugins/devicepluginelro/devicepluginelro.h index a2aac0bd..15262f96 100644 --- a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.h +++ b/plugins/deviceplugins/devicepluginelro/devicepluginelro.h @@ -1,17 +1,17 @@ -#ifndef RFREMOTEMUMBI_H -#define RFREMOTEMUMBI_H +#ifndef DEVICEPLUGINELRO_H +#define DEVICEPLUGINELRO_H #include "deviceplugin.h" -class RfRemoteMumbi : public DevicePlugin +class DevicePluginElro : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.hiveyourhome.DevicePlugin" FILE "rfremotemumbi.json") + Q_PLUGIN_METADATA(IID "org.hiveyourhome.DevicePlugin" FILE "devicepluginelro.json") Q_INTERFACES(DevicePlugin) public: - explicit RfRemoteMumbi(); + explicit DevicePluginElro(); void init() override; QList supportedDevices() const override; @@ -26,4 +26,4 @@ private slots: void dataReceived(QList rawData); }; -#endif // RFREMOTEMUMBI_H +#endif // DEVICEPLUGINELRO_H diff --git a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.json b/plugins/deviceplugins/devicepluginelro/devicepluginelro.json similarity index 100% rename from plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.json rename to plugins/deviceplugins/devicepluginelro/devicepluginelro.json diff --git a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.pro b/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro similarity index 58% rename from plugins/deviceplugins/rfremotemumbi/rfremotemumbi.pro rename to plugins/deviceplugins/devicepluginelro/devicepluginelro.pro index 193da2f0..2db9f266 100644 --- a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.pro +++ b/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += plugin static -TARGET = $$qtLibraryTarget(hive_rfremotemumbi) +TARGET = $$qtLibraryTarget(hive_devicepluginelro) INCLUDEPATH += ../../../libhive LIBS += -L../../../libhive -lhive SOURCES += \ - rfremotemumbi.cpp + devicepluginelro.cpp HEADERS += \ - rfremotemumbi.h + devicepluginelro.h diff --git a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.cpp b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp similarity index 94% rename from plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.cpp rename to plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp index 2a36ead9..f61c644c 100644 --- a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.cpp +++ b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp @@ -1,4 +1,4 @@ -#include "rfremoteintertechno.h" +#include "devicepluginintertechno.h" #include "device.h" #include "devicemanager.h" @@ -9,16 +9,16 @@ QUuid intertechnoRemote = QUuid("ab73ad2f-6594-45a3-9063-8f72d365c5e5"); -RfRemoteIntertechno::RfRemoteIntertechno() +DevicePluginIntertechno::DevicePluginIntertechno() { } -void RfRemoteIntertechno::init() +void DevicePluginIntertechno::init() { - connect(deviceManager()->radio433(), &Radio433::dataReceived, this, &RfRemoteIntertechno::dataReceived); + connect(deviceManager()->radio433(), &Radio433::dataReceived, this, &DevicePluginIntertechno::dataReceived); } -QList RfRemoteIntertechno::supportedDevices() const +QList DevicePluginIntertechno::supportedDevices() const { QList ret; @@ -76,22 +76,22 @@ QList RfRemoteIntertechno::supportedDevices() const return ret; } -QString RfRemoteIntertechno::pluginName() const +QString DevicePluginIntertechno::pluginName() const { return "RF Remote Intertechno"; } -QUuid RfRemoteIntertechno::pluginId() const +QUuid DevicePluginIntertechno::pluginId() const { return QUuid("e998d934-0397-42c1-ad63-9141bcac8563"); } -void RfRemoteIntertechno::executeAction(Device *device, const Action &action) +void DevicePluginIntertechno::executeAction(Device *device, const Action &action) { } -void RfRemoteIntertechno::dataReceived(QList rawData) +void DevicePluginIntertechno::dataReceived(QList rawData) { // filter right here a wrong signal length if(rawData.length() != 49){ diff --git a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.h b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h similarity index 66% rename from plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.h rename to plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h index 980db66c..ce29612a 100644 --- a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.h +++ b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h @@ -1,17 +1,17 @@ -#ifndef RFREMOTEINTERTECHNO_H -#define RFREMOTEINTERTECHNO_H +#ifndef DEVICEPLUGININTERTECHNO_H +#define DEVICEPLUGININTERTECHNO_H #include "deviceplugin.h" -class RfRemoteIntertechno : public DevicePlugin +class DevicePluginIntertechno : public DevicePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.hiveyourhome.DevicePlugin" FILE "rfremoteintertechno.json") + Q_PLUGIN_METADATA(IID "org.hiveyourhome.DevicePlugin" FILE "devicepluginintertechno.json") Q_INTERFACES(DevicePlugin) public: - explicit RfRemoteIntertechno(); + explicit DevicePluginIntertechno(); void init() override; QList supportedDevices() const override; @@ -26,4 +26,4 @@ private slots: void dataReceived(QList rawData); }; -#endif // RFREMOTEINTERTECHNO_H +#endif // DEVICEPLUGININTERTECHNO_H diff --git a/plugins/deviceplugins/rfremotemumbi/rfremotemumbi.json b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json similarity index 100% rename from plugins/deviceplugins/rfremotemumbi/rfremotemumbi.json rename to plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json diff --git a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.pro b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro similarity index 53% rename from plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.pro rename to plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro index 218ed603..c4f66002 100644 --- a/plugins/deviceplugins/rfremoteintertechno/rfremoteintertechno.pro +++ b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += plugin static -TARGET = $$qtLibraryTarget(hive_rfremoteintertechno) +TARGET = $$qtLibraryTarget(hive_devicepluginintertechno) INCLUDEPATH += ../../../libhive LIBS += -L../../../libhive -lhive SOURCES += \ - rfremoteintertechno.cpp + devicepluginintertechno.cpp HEADERS += \ - rfremoteintertechno.h + devicepluginintertechno.h diff --git a/plugins/deviceplugins/deviceplugins.pro b/plugins/deviceplugins/deviceplugins.pro index b376bacf..8b2e62a6 100644 --- a/plugins/deviceplugins/deviceplugins.pro +++ b/plugins/deviceplugins/deviceplugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += rfremotemumbi rfremoteintertechno +SUBDIRS += devicepluginelro devicepluginintertechno