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

fix merge

Browse Source
This commit is contained in:
Michael Zanetti 2013-12-30 22:13:31 +01:00
parent 992ccd3a04
commit 9f7fd197bb
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libhive/devicemanager.cpp
View File

@ -17,25 +17,7 @@ DeviceManager::DeviceManager(QObject *parent) :
{ {
m_radio433 = new Radio433(this); m_radio433 = new Radio433(this);
<<<<<<< HEAD
QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection);
=======
qDebug() << "loading plugins";
foreach (QObject *pluginObject, QPluginLoader::staticInstances()) {
DevicePlugin *pluginIface = qobject_cast<DevicePlugin*>(pluginObject);
qDebug() << "got plugin instance";
if (pluginIface) {
qDebug() << "got device plugin" << pluginIface->pluginName();
}
}
// TODO: load dynamically
// RfSwitch *rfSwitch = new RfSwitch(this);
// m_supportedDevices.append(rfSwitch->supportedDevices());
// m_devicePlugins.append(rfSwitch);
>>>>>>> radio thread fixed
} }
QList<DeviceClass> DeviceManager::supportedDevices() QList<DeviceClass> DeviceManager::supportedDevices()