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

fix some param handling issues

Browse Source
This commit is contained in:
Michael Zanetti 2014-07-06 21:11:55 +02:00
parent 944adda293
commit 913f08edd8
4 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libguh/types/param.cpp
View File

@ -98,9 +98,3 @@ void ParamList::setParamValue(const QString &paramName, const QVariant &value)
} }
} }
} }
ParamList ParamList::operator<<(const Param &param)
{
this->append(param);
return *this;
}

8
libguh/types/param.h
View File

@ -53,4 +53,12 @@ public:
}; };
QDebug operator<<(QDebug dbg, const ParamList &params); QDebug operator<<(QDebug dbg, const ParamList &params);
class ParamList: public QList<Param>
{
public:
bool hasParam(const QString &paramName) const;
QVariant paramValue(const QString &paramName) const;
void setParamValue(const QString &paramName, const QVariant &value);
};
#endif // PARAM_H #endif // PARAM_H

4
plugins/deviceplugins/mock/devicepluginmock.cpp
View File

@ -274,9 +274,7 @@ void DevicePluginMock::startMonitoringAutoDevices()
DeviceDescriptor mockDescriptor(mockDeviceAutoClassId, "Mock Device (Auto created)"); DeviceDescriptor mockDescriptor(mockDeviceAutoClassId, "Mock Device (Auto created)");
ParamList params; ParamList params;
qsrand(QDateTime::currentMSecsSinceEpoch()); Param param("httpport", 4242);
int port = 4242 + (qrand() % 1000);
Param param("httpport", port);
params.append(param); params.append(param);
mockDescriptor.setParams(params); mockDescriptor.setParams(params);

28
plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
View File

@ -425,24 +425,22 @@ QList<DeviceClass> DevicePluginOpenweathermap::supportedDevices() const
QPair<DeviceManager::DeviceError, QString> DevicePluginOpenweathermap::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) QPair<DeviceManager::DeviceError, QString> DevicePluginOpenweathermap::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
{ {
if(deviceClassId == openweathermapDeviceClassId){
QString location; qDebug() << "should discover devices with params:" << params;
foreach (const Param &param, params) { QString location;
if (param.name() == "location") { foreach (const Param &param, params) {
location = param.value().toString(); qDebug() << "### got param:" << param;
} if (param.name() == "location") {
location = param.value().toString();
} }
qDebug() << "Searching for... " << location;
if (location.isEmpty()){
m_openweaher->searchAutodetect();
}else{
m_openweaher->search(location);
}
return DeviceManager::DeviceErrorAsync;
}else{
return DeviceManager::DeviceErrorDeviceClassNotFound;
} }
if (location.isEmpty()){
m_openweaher->searchAutodetect();
return report(DeviceManager::DeviceErrorAsync);
}
m_openweaher->search(location);
return report(DeviceManager::DeviceErrorAsync);
} }
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginOpenweathermap::setupDevice(Device *device) QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginOpenweathermap::setupDevice(Device *device)