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

convert the remaining param lists

Browse Source
This commit is contained in:
Michael Zanetti 2014-07-06 21:51:56 +02:00
parent 824464e09b
commit 0614e79193
22 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libguh/devicemanager.cpp
View File

@ -131,7 +131,7 @@ DevicePlugin *DeviceManager::plugin(const PluginId &id) const
return m_devicePlugins.value(id);
}
QPair<DeviceManager::DeviceError, QString> DeviceManager::setPluginConfig(const PluginId &pluginId, const QList<Param> &pluginConfig)
QPair<DeviceManager::DeviceError, QString> DeviceManager::setPluginConfig(const PluginId &pluginId, const ParamList &pluginConfig)
{
DevicePlugin *plugin = m_devicePlugins.value(pluginId);
if (!plugin) {
@ -246,7 +246,7 @@ QPair<DeviceManager::DeviceError, QString> DeviceManager::addConfiguredDevice(co
return addConfiguredDeviceInternal(deviceClassId, descriptor.params(), deviceId);
}
QPair<DeviceManager::DeviceError, QString> DeviceManager::pairDevice(const DeviceClassId &deviceClassId, const QList<Param> &params)
QPair<DeviceManager::DeviceError, QString> DeviceManager::pairDevice(const DeviceClassId &deviceClassId, const ParamList &params)
{
DeviceClass deviceClass = findDeviceClass(deviceClassId);
if (deviceClass.id().isNull()) {
@ -260,7 +260,7 @@ QPair<DeviceManager::DeviceError, QString> DeviceManager::pairDevice(const Devic
}
QUuid pairingTransactionId = QUuid::createUuid();
m_pairingsJustAdd.insert(pairingTransactionId, qMakePair<DeviceClassId, QList<Param> >(deviceClassId, params));
m_pairingsJustAdd.insert(pairingTransactionId, qMakePair<DeviceClassId, ParamList>(deviceClassId, params));
if (deviceClass.setupMethod() == DeviceClass::SetupMethodDisplayPin) {
// TODO: fetch PIN from device plugin
@ -524,7 +524,7 @@ void DeviceManager::loadPlugins()
}
QSettings settings(m_settingsFile);
settings.beginGroup("PluginConfig");
QList<Param> params;
ParamList params;
if (settings.childGroups().contains(pluginIface->pluginId().toString())) {
settings.beginGroup(pluginIface->pluginId().toString());
foreach (const QString &paramName, settings.allKeys()) {
@ -566,7 +566,7 @@ void DeviceManager::loadConfiguredDevices()
Device *device = new Device(PluginId(settings.value("pluginid").toString()), DeviceId(idString), DeviceClassId(settings.value("deviceClassId").toString()), this);
device->setName(settings.value("devicename").toString());
QList<Param> params;
ParamList params;
settings.beginGroup("Params");
foreach (QString paramNameString, settings.allKeys()) {
Param param(paramNameString);
@ -689,11 +689,11 @@ void DeviceManager::slotPairingFinished(const QUuid &pairingTransactionId, Devic
}
DeviceClassId deviceClassId;
QList<Param> params;
ParamList params;
// Do this before checking status to make sure we clean up our hashes properly
if (m_pairingsJustAdd.contains(pairingTransactionId)) {
QPair<DeviceClassId, QList<Param> > pair = m_pairingsJustAdd.take(pairingTransactionId);
QPair<DeviceClassId, ParamList> pair = m_pairingsJustAdd.take(pairingTransactionId);
deviceClassId = pair.first;
params = pair.second;
}
@ -800,7 +800,7 @@ void DeviceManager::slotDeviceStateValueChanged(const QUuid &stateTypeId, const
emit deviceStateChanged(device, stateTypeId, value);
Param valueParam("value", value);
Event event(EventTypeId(stateTypeId.toString()), device->id(), QList<Param>() << valueParam);
Event event(EventTypeId(stateTypeId.toString()), device->id(), ParamList() << valueParam);
emit eventTriggered(event);
}

6
libguh/devicemanager.h
View File

@ -74,7 +74,7 @@ public:
QList<DevicePlugin*> plugins() const;
DevicePlugin* plugin(const PluginId &id) const;
QPair<DeviceError, QString> setPluginConfig(const PluginId &pluginId, const QList<Param> &pluginConfig);
QPair<DeviceError, QString> setPluginConfig(const PluginId &pluginId, const ParamList &pluginConfig);
QList<Vendor> supportedVendors() const;
QList<DeviceClass> supportedDevices(const VendorId &vendorId = VendorId()) const;
@ -83,7 +83,7 @@ public:
QList<Device*> configuredDevices() const;
QPair<DeviceError, QString> addConfiguredDevice(const DeviceClassId &deviceClassId, const ParamList &params, const DeviceId id = DeviceId::createDeviceId());
QPair<DeviceError, QString> addConfiguredDevice(const DeviceClassId &deviceClassId, const DeviceDescriptorId &deviceDescriptorId, const DeviceId &id = DeviceId::createDeviceId());
QPair<DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const QList<Param> &params);
QPair<DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const ParamList &params);
QPair<DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const DeviceDescriptorId &deviceDescriptorId);
QPair<DeviceError, QString> confirmPairing(const QUuid &pairingTransactionId, const QString &secret = QString());
QPair<DeviceError, QString> removeConfiguredDevice(const DeviceId &deviceId);
@ -146,7 +146,7 @@ private:
QTimer m_pluginTimer;
QList<Device*> m_pluginTimerUsers;
QHash<QUuid, QPair<DeviceClassId, QList<Param> > > m_pairingsJustAdd;
QHash<QUuid, QPair<DeviceClassId, ParamList> > m_pairingsJustAdd;
QHash<QUuid, QPair<DeviceClassId, DeviceDescriptorId> > m_pairingsDiscovery;
friend class DevicePlugin;

6
libguh/plugin/device.cpp
View File

@ -90,13 +90,13 @@ void Device::setName(const QString &name)
}
/*! Returns the parameter of this Device. It must match the parameter description in the associated \l{DeviceClass}. */
QList<Param> Device::params() const
ParamList Device::params() const
{
return m_params;
}
/*! Sets the \a params of this Device. It must match the parameter description in the associated \l{DeviceClass}. */
void Device::setParams(const QList<Param> &params)
void Device::setParams(const ParamList &params)
{
m_params = params;
}
@ -113,7 +113,7 @@ QVariant Device::paramValue(const QString &paramName) const
void Device::setParamValue(const QString &paramName, const QVariant &value)
{
QList<Param> params;
ParamList params;
foreach (Param param, m_params) {
if (param.name() == paramName) {
param.setValue(value);

6
libguh/plugin/device.h
View File

@ -44,9 +44,9 @@ public:
QString name() const;
void setName(const QString &name);
QList<Param> params() const;
ParamList params() const;
bool hasParam(const QString &paramName) const;
void setParams(const QList<Param> &params);
void setParams(const ParamList &params);
QVariant paramValue(const QString &paramName) const;
void setParamValue(const QString &paramName, const QVariant &value);
@ -76,7 +76,7 @@ private:
DeviceClassId m_deviceClassId;
PluginId m_pluginId;
QString m_name;
QList<Param> m_params;
ParamList m_params;
QList<State> m_states;
bool m_setupComplete;
};

8
libguh/plugin/deviceplugin.cpp
View File

@ -172,7 +172,7 @@ void DevicePlugin::deviceRemoved(Device *device)
Q_UNUSED(device)
}
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePlugin::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params)
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePlugin::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList &params)
{
Q_UNUSED(pairingTransactionId)
Q_UNUSED(deviceClassId)
@ -199,7 +199,7 @@ void DevicePlugin::initPlugin(DeviceManager *deviceManager)
When implementing a new plugin, override this and fill in the empty configuration if your plugin requires any.
*/
QList<Param> DevicePlugin::configuration() const
ParamList DevicePlugin::configuration() const
{
return m_config;
}
@ -223,7 +223,7 @@ QVariant DevicePlugin::configValue(const QString &paramName) const
/*!
Will be called by the DeviceManager to set a plugin's \a configuration.
*/
QPair<DeviceManager::DeviceError, QString> DevicePlugin::setConfiguration(const QList<Param> &configuration)
QPair<DeviceManager::DeviceError, QString> DevicePlugin::setConfiguration(const ParamList &configuration)
{
foreach (const Param &param, configuration) {
qDebug() << "setting config" << param;
@ -311,7 +311,7 @@ QList<Device *> DevicePlugin::myDevices() const
Find a certain device from myDevices() by its params. All parameters must
match or the device will not be found. Be prepared for nullptrs.
*/
Device *DevicePlugin::findDeviceByParams(const QList<Param> &params) const
Device *DevicePlugin::findDeviceByParams(const ParamList &params) const
{
foreach (Device *device, myDevices()) {
bool matching = true;

10
libguh/plugin/deviceplugin.h
View File

@ -55,7 +55,7 @@ public:
virtual QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device);
virtual void deviceRemoved(Device *device);
virtual QPair<DeviceManager::DeviceSetupStatus, QString> confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params);
virtual QPair<DeviceManager::DeviceSetupStatus, QString> confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList &params);
// Hardware input
virtual void radioData(QList<int> rawData) {Q_UNUSED(rawData)}
@ -63,8 +63,8 @@ public:
// Configuration
virtual QList<ParamType> configurationDescription() const;
QPair<DeviceManager::DeviceError, QString> setConfiguration(const QList<Param> &configuration);
QList<Param> configuration() const;
QPair<DeviceManager::DeviceError, QString> setConfiguration(const ParamList &configuration);
ParamList configuration() const;
QVariant configValue(const QString &paramName) const;
QPair<DeviceManager::DeviceError, QString> setConfigValue(const QString &paramName, const QVariant &value);
@ -86,7 +86,7 @@ signals:
protected:
DeviceManager *deviceManager() const;
QList<Device*> myDevices() const;
Device* findDeviceByParams(const QList<Param> &params) const;
Device* findDeviceByParams(const ParamList &params) const;
void transmitData(QList<int> rawData);
@ -97,7 +97,7 @@ private:
DeviceManager *m_deviceManager;
QList<Param> m_config;
ParamList m_config;
friend class DeviceManager;
};

6
libguh/types/event.cpp
View File

@ -42,7 +42,7 @@ Event::Event():
/*! Constructs a Event reflecting the \l{Event} given by \a EventTypeId, associated with
the \l{Device} given by \a deviceId and the parameters given by \a params. The parameters must
match the description in the reflecting \l{Event}.*/
Event::Event(const EventTypeId &eventTypeId, const DeviceId &deviceId, const QList<Param> &params):
Event::Event(const EventTypeId &eventTypeId, const DeviceId &deviceId, const ParamList &params):
m_id(EventId::createEventId()),
m_eventTypeId(eventTypeId),
m_deviceId(deviceId),
@ -82,13 +82,13 @@ void Event::setDeviceId(const DeviceId &deviceId)
}
/*! Returns the parameters of this Event.*/
QList<Param> Event::params() const
ParamList Event::params() const
{
return m_params;
}
/*! Set the parameters of this Event to \a params.*/
void Event::setParams(const QList<Param> &params)
void Event::setParams(const ParamList &params)
{
m_params = params;
}

8
libguh/types/event.h
View File

@ -30,7 +30,7 @@ class Event
{
public:
Event();
Event(const EventTypeId &eventTypeId, const DeviceId &deviceId, const QList<Param> &params = QList<Param>());
Event(const EventTypeId &eventTypeId, const DeviceId &deviceId, const ParamList &params = ParamList());
EventId eventId() const;
@ -40,8 +40,8 @@ public:
DeviceId deviceId() const;
void setDeviceId(const DeviceId &deviceId);
QList<Param> params() const;
void setParams(const QList<Param> &params);
ParamList params() const;
void setParams(const ParamList &params);
Param param(const QString &paramName) const;
bool operator ==(const Event &other) const;
@ -50,7 +50,7 @@ private:
EventId m_id;
EventTypeId m_eventTypeId;
DeviceId m_deviceId;
QList<Param> m_params;
ParamList m_params;
};
Q_DECLARE_METATYPE(Event)
QDebug operator<<(QDebug dbg, const Event &event);

8
libguh/types/param.cpp
View File

@ -58,7 +58,7 @@ QDebug operator<<(QDebug dbg, const Param &param)
return dbg.space();
}
QDebug operator<<(QDebug dbg, const QList<Param> &params)
QDebug operator<<(QDebug dbg, const ParamList &params)
{
dbg.nospace() << "ParamList (count:" << params.count() << ")" << endl;
for (int i = 0; i < params.count(); i++ ) {
@ -98,3 +98,9 @@ void ParamList::setParamValue(const QString &paramName, const QVariant &value)
}
}
}
ParamList ParamList::operator<<(const Param &param)
{
this->append(param);
return *this;
}

3
libguh/types/param.h
View File

@ -42,7 +42,6 @@ private:
Q_DECLARE_METATYPE(Param)
QDebug operator<<(QDebug dbg, const Param &param);
QDebug operator<<(QDebug dbg, const QList<Param> &params);
class ParamList: public QList<Param>
{
@ -50,6 +49,8 @@ public:
bool hasParam(const QString &paramName) const;
QVariant paramValue(const QString &paramName) const;
void setParamValue(const QString &paramName, const QVariant &value);
ParamList operator<<(const Param &param);
};
QDebug operator<<(QDebug dbg, const ParamList &params);
#endif // PARAM_H

2
plugins/deviceplugins/boblight/devicepluginboblight.cpp
View File

@ -100,7 +100,7 @@ void DevicePluginBoblight::startMonitoringAutoDevices()
QList<DeviceDescriptor> deviceDescriptorList;
for (int i = loadedDevices.count(); i < m_bobClient->lightsCount(); i++) {
DeviceDescriptor deviceDescriptor(boblightDeviceClassId, "Boblight Channel " + QString::number(i));
QList<Param> params;
ParamList params;
Param param("channel");
param.setValue(i);
params.append(param);

1
plugins/deviceplugins/boblight/devicepluginboblight.h
View File

@ -55,7 +55,6 @@ private slots:
private:
BobClient *m_bobClient;
QList<Param> m_config;
};
#endif // DEVICEPLUGINBOBLIGHT_H

2
plugins/deviceplugins/elro/devicepluginelro.cpp
View File

@ -428,7 +428,7 @@ void DevicePluginElro::radioData(QList<int> rawData)
return;
}
QList<Param> params;
ParamList params;
Param powerParam("power", power);
params.append(powerParam);

2
plugins/deviceplugins/intertechno/devicepluginintertechno.cpp
View File

@ -686,7 +686,7 @@ void DevicePluginIntertechno::radioData(QList<int> rawData)
return;
}
QList<Param> params;
ParamList params;
Param powerParam("power", power);
params.append(powerParam);

2
plugins/deviceplugins/lircd/devicepluginlircd.cpp
View File

@ -129,7 +129,7 @@ void DevicePluginLircd::buttonPressed(const QString &remoteName, const QString &
qDebug() << "found remote" << remoteName << supportedDevices().first().eventTypes().count();
foreach (const EventType &eventType, supportedDevices().first().eventTypes()) {
if (eventType.name() == buttonName) {
QList<Param> params;
ParamList params;
Param param("repeat", repeat);
params.append(param);
Event event(eventType.id(), remote->id(), params);

1
plugins/deviceplugins/mock/devicepluginmock.h
View File

@ -62,7 +62,6 @@ private slots:
void emitActionExecuted();
private:
QList<Param> m_config;
QHash<Device*, HttpDaemon*> m_daemons;
QList<Device*> m_asyncSetupDevices;
QList<QPair<Action, Device*> > m_asyncActions;

2
plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
View File

@ -239,7 +239,7 @@ QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::setupDe
return reportDeviceSetup(DeviceManager::DeviceSetupStatusAsync);
}
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params)
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList &params)
{
Param ipParam;
foreach (const Param &param, params) {

3
plugins/deviceplugins/philipshue/devicepluginphilipshue.h
View File

@ -50,7 +50,7 @@ public:
QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device) override;
QPair<DeviceManager::DeviceSetupStatus, QString> confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params) override;
QPair<DeviceManager::DeviceSetupStatus, QString> confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList &params) override;
void guhTimer() override;
@ -67,7 +67,6 @@ private slots:
void lightStateChanged();
private:
QList<Param> m_config;
Discovery *m_discovery;
class PairingInfo {

4
server/guhcore.cpp
View File

@ -63,7 +63,7 @@ QList<DevicePlugin *> GuhCore::plugins() const
return m_deviceManager->plugins();
}
QPair<DeviceManager::DeviceError, QString> GuhCore::setPluginConfig(const PluginId &pluginId, const QList<Param> params)
QPair<DeviceManager::DeviceError, QString> GuhCore::setPluginConfig(const PluginId &pluginId, const ParamList &params)
{
return m_deviceManager->setPluginConfig(pluginId, params);
}
@ -117,7 +117,7 @@ QPair<DeviceManager::DeviceError, QString> GuhCore::pairDevice(const DeviceClass
return m_deviceManager->pairDevice(deviceClassId, deviceDescriptorId);
}
QPair<DeviceManager::DeviceError, QString> GuhCore::pairDevice(const DeviceClassId &deviceClassId, const QList<Param> &params)
QPair<DeviceManager::DeviceError, QString> GuhCore::pairDevice(const DeviceClassId &deviceClassId, const ParamList &params)
{
return m_deviceManager->pairDevice(deviceClassId, params);
}

4
server/guhcore.h
View File

@ -43,7 +43,7 @@ public:
void destroy();
QList<DevicePlugin *> plugins() const;
QPair<DeviceManager::DeviceError, QString> setPluginConfig(const PluginId &pluginId, const QList<Param> params);
QPair<DeviceManager::DeviceError, QString> setPluginConfig(const PluginId &pluginId, const ParamList &params);
// Device handling
QList<Vendor> supportedVendors() const;
@ -58,7 +58,7 @@ public:
QPair<DeviceManager::DeviceError, QString> removeConfiguredDevice(const DeviceId &deviceId, const QHash<RuleId, RuleEngine::RemovePolicy> &removePolicyList);
QPair<DeviceManager::DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const DeviceDescriptorId &deviceDescriptorId);
QPair<DeviceManager::DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const QList<Param> &params);
QPair<DeviceManager::DeviceError, QString> pairDevice(const DeviceClassId &deviceClassId, const ParamList &params);
QPair<DeviceManager::DeviceError, QString> confirmPairing(const QUuid &pairingTransactionId, const QString &secret = QString());
QPair<DeviceManager::DeviceError, QString> executeAction(const Action &action);

2
server/jsonrpc/jsontypes.cpp
View File

@ -448,7 +448,7 @@ ParamList JsonTypes::unpackParams(const QVariantList &paramList)
{
ParamList params;
foreach (const QVariant &paramVariant, paramList) {
qDebug() << "unpacking param" << paramVariant;
// qDebug() << "unpacking param" << paramVariant;
params.append(unpackParam(paramVariant.toMap()));
}
return params;

2
tests/auto/events/testevents.cpp
View File

@ -98,7 +98,7 @@ void TestEvents::triggerStateChangeEvent()
void TestEvents::params()
{
Event event;
QList<Param> params;
ParamList params;
Param p("foo", "bar");
params.append(p);
event.setParams(params);