ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1/head
Simon Stürz 2014-01-04 02:48:31 +01:00
parent 7d549fae01 f49d747dd5
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;
}
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
#define DEVICE_H
#include "trigger.h"
#include "action.h"
#include "state.h"
#include <QObject>
#include <QUuid>
@ -25,6 +24,9 @@ public:
QVariantMap params() const;
void setParams(const QVariantMap &params);
QList<State> states() const;
void setStates(const QList<State> &states);
private:
Device(const QUuid &pluginId, const QUuid &id, const QUuid &deviceClassId, QObject *parent = 0);
Device(const QUuid &pluginId, const QUuid &deviceClassId, QObject *parent = 0);
@ -35,6 +37,7 @@ private:
QUuid m_pluginId;
QString m_name;
QVariantMap m_params;
QList<State> m_states;
};
#endif

3
libhive/deviceplugin.cpp
View File

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