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

cleanup

Browse Source
This commit is contained in:
Michael Zanetti 2019-11-12 18:11:15 +01:00
parent e47a4062ee
commit fd401a850a
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnymea-core/devices/scriptdeviceplugin.cpp
View File

@ -53,12 +53,6 @@ bool ScriptDevicePlugin::loadScript(const QString &fileName)
}
m_metaData = QJsonObject::fromVariantMap(jsonDoc.toVariant().toMap());
QFile scriptFile(fileName);
if (!scriptFile.open(QIODevice::ReadOnly)) {
return false;
}
m_engine = new QQmlEngine(this);
m_engine->installExtensions(QJSEngine::AllExtensions);
@ -181,7 +175,6 @@ void ScriptDevicePlugin::setupDevice(DeviceSetupInfo *info)
ScriptDeviceSetupInfo *scriptInfo = new ScriptDeviceSetupInfo(info, scriptDevice);
qWarning() << "Setup params" << info->device()->params();
QJSValue jsInfo = m_engine->newQObject(scriptInfo);
QJSValue ret = setupFunction.call({jsInfo});

2
libnymea-core/jsonrpc/devicehandler.cpp
View File

@ -455,8 +455,6 @@ JsonReply *DeviceHandler::GetDiscoveredDevices(const QVariantMap &params) const
QVariantList deviceDescriptorList;
foreach (const DeviceDescriptor &deviceDescriptor, info->deviceDescriptors()) {
deviceDescriptorList.append(pack(deviceDescriptor));
qWarning() << "*** Discovery result:" << deviceDescriptor.params();
qWarning() << "Packed:" << pack(deviceDescriptor);
}
returns.insert("deviceDescriptors", deviceDescriptorList);
}

14
libnymea/typeutils.h
View File

@ -29,19 +29,11 @@
#include "libnymea.h"
class GadgetUuid: public QUuid
{
Q_GADGET
public:
GadgetUuid() {}
GadgetUuid(const QUuid &uuid): QUuid(uuid) {}
};
#define DECLARE_TYPE_ID(type) class type##Id: public GadgetUuid \
#define DECLARE_TYPE_ID(type) class type##Id: public QUuid \
{ \
public: \
type##Id(const QUuid &uuid): GadgetUuid(uuid) {} \
type##Id(): GadgetUuid() {} \
type##Id(const QUuid &uuid): QUuid(uuid) {} \
type##Id(): QUuid() {} \
static type##Id create##type##Id() { return type##Id(QUuid::createUuid()); } \
bool operator==(const type##Id &other) const { \
return toString() == other.toString(); \