jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Send sensor events as QDateTime instead of just an int

Browse source
This commit is contained in:
Micke Prag 2011-10-27 16:06:35 +02:00
parent c41a84b582
commit 12fdaf2d77
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
telldus-gui/Plugins/TelldusCore/tellduscoreobject.cpp
View file

@ -160,6 +160,6 @@ void WINAPI TelldusCoreObject::deviceEventCallback(int deviceId, int method, con
void WINAPI TelldusCoreObject::sensorEventCallback(const char *protocol, const char *model, int id, int dataType, const char *value, int timestamp, int callbackId, void *context) { void WINAPI TelldusCoreObject::sensorEventCallback(const char *protocol, const char *model, int id, int dataType, const char *value, int timestamp, int callbackId, void *context) {
TelldusCoreObject *parent = static_cast<TelldusCoreObject *>(context); TelldusCoreObject *parent = static_cast<TelldusCoreObject *>(context);
if (parent) { if (parent) {
emit parent->sensorEvent(QString::fromUtf8(protocol), QString::fromUtf8(model), id, dataType, QString::fromUtf8(value), timestamp); emit parent->sensorEvent(QString::fromUtf8(protocol), QString::fromUtf8(model), id, dataType, QString::fromUtf8(value), QDateTime::fromTime_t(timestamp));
} }
} }

3
telldus-gui/Plugins/TelldusCore/tellduscoreobject.h
View file

@ -3,6 +3,7 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #include <QVariantMap>
#include <QDateTime>
#include <telldus-core.h> #include <telldus-core.h>
class TelldusCoreObject : public QObject class TelldusCoreObject : public QObject
@ -15,7 +16,7 @@ public:
signals: signals:
void deviceChange( int deviceId, int eventId ); void deviceChange( int deviceId, int eventId );
void deviceEvent( int deviceId, int method, const QString &data ); void deviceEvent( int deviceId, int method, const QString &data );
void sensorEvent( const QString &protocol, const QString &model, int id, int dataType, const QString &value, int timestamp); void sensorEvent( const QString &protocol, const QString &model, int id, int dataType, const QString &value, const QDateTime timestamp);
void errorOccurred( int deviceId, int errorId, const QString &errorString ); void errorOccurred( int deviceId, int errorId, const QString &errorString );
public slots: public slots: