From df0a9c7617b1750948a7032ad472d33e82cf5cd3 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 7 Jul 2015 13:57:36 +0300 Subject: [PATCH] move #definitions to .cpp --- connd/wakeupwatcher.cpp | 12 ++++++++++++ connd/wakeupwatcher.h | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/connd/wakeupwatcher.cpp b/connd/wakeupwatcher.cpp index 755688d..9f6cef8 100644 --- a/connd/wakeupwatcher.cpp +++ b/connd/wakeupwatcher.cpp @@ -19,6 +19,18 @@ #include "wakeupwatcher.h" +#define MCE_SERVICE "com.nokia.mce" +#define MCE_SIGNAL_PATH "/com/nokia/mce/signal" +#define MCE_SIGNAL_INTERFACE "com.nokia.mce.signal" +#define MCE_PSM_STATE_IND "psm_state_ind" +#define MCE_DISPLAY_IND "display_status_ind" + +#define MCE_REQUEST_PATH "/com/nokia/mce/request" +#define MCE_REQUEST_INTERFACE "com.nokia.mce.request" +#define MCE_DISPLAY_STATUS_GET "get_display_status" +#define MCE_PSM_STATE_GET "get_psm_state" + + WakeupWatcher::WakeupWatcher(QObject *parent) : QObject(parent), currentPowerSave(false) diff --git a/connd/wakeupwatcher.h b/connd/wakeupwatcher.h index a5386df..5fca3cf 100644 --- a/connd/wakeupwatcher.h +++ b/connd/wakeupwatcher.h @@ -20,17 +20,6 @@ #include #include -#define MCE_SERVICE "com.nokia.mce" -#define MCE_SIGNAL_PATH "/com/nokia/mce/signal" -#define MCE_SIGNAL_INTERFACE "com.nokia.mce.signal" -#define MCE_PSM_STATE_IND "psm_state_ind" -#define MCE_DISPLAY_IND "display_status_ind" - -#define MCE_REQUEST_PATH "/com/nokia/mce/request" -#define MCE_REQUEST_INTERFACE "com.nokia.mce.request" -#define MCE_DISPLAY_STATUS_GET "get_display_status" -#define MCE_PSM_STATE_GET "get_psm_state" - class WakeupWatcher : public QObject { Q_OBJECT @@ -40,11 +29,11 @@ class WakeupWatcher : public QObject signals: void displayStateChanged(const QString&); void sleepStateChanged(bool); -public slots: private slots: void mceDisplayStateChanged(const QString &state); void mceSleepStateChanged(bool mode); + private: QDBusInterface *mceInterface; QString currentDisplayState;