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

Merge branch 'master' of https://github.com/HiveFive/Hive

Browse Source
This commit is contained in:
Simon Stürz 2014-01-04 02:48:31 +01:00
commit 7b1a9cb19d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libhive/device.cpp
View File

@ -52,3 +52,13 @@ void Device::setParams(const QVariantMap &params)
{ {
m_params = params; m_params = params;
} }
QList<State> Device::states() const
{
return m_states;
}
void Device::setStates(const QList<State> &states)
{
m_states = states;
}

7
libhive/device.h
View File

@ -1,8 +1,7 @@
#ifndef DEVICE_H #ifndef DEVICE_H
#define DEVICE_H #define DEVICE_H
#include "trigger.h" #include "state.h"
#include "action.h"
#include <QObject> #include <QObject>
#include <QUuid> #include <QUuid>
@ -25,6 +24,9 @@ public:
QVariantMap params() const; QVariantMap params() const;
void setParams(const QVariantMap &params); void setParams(const QVariantMap &params);
QList<State> states() const;
void setStates(const QList<State> &states);
private: private:
Device(const QUuid &pluginId, const QUuid &id, const QUuid &deviceClassId, QObject *parent = 0); Device(const QUuid &pluginId, const QUuid &id, const QUuid &deviceClassId, QObject *parent = 0);
Device(const QUuid &pluginId, const QUuid &deviceClassId, QObject *parent = 0); Device(const QUuid &pluginId, const QUuid &deviceClassId, QObject *parent = 0);
@ -35,6 +37,7 @@ private:
QUuid m_pluginId; QUuid m_pluginId;
QString m_name; QString m_name;
QVariantMap m_params; QVariantMap m_params;
QList<State> m_states;
}; };
#endif #endif

3
libhive/deviceplugin.cpp
View File

@ -5,7 +5,8 @@
#include <QDebug> #include <QDebug>
DevicePlugin::DevicePlugin() DevicePlugin::DevicePlugin():
m_deviceManager(0)
{ {
} }