Merge pull request #16 from lpotter/master

[sensorfw] get rid of mce buildtime requirement
sailfishos · Oct 8, 2013 · 4553a14 · 4553a14
2 parents cf139b2 + c1fe223
commit 4553a14
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/adaptors/alsadaptor/alsadaptor.h b/adaptors/alsadaptor/alsadaptor.h
@@ -38,8 +38,11 @@
 #include <QDBusInterface>
 
 #ifdef SENSORFW_MCE_WATCHER
-    #include <mce/mode-names.h>
-    #include <mce/dbus-names.h>
+// these come from mce/mode-names.h
+// and mce/dbus-names.h
+#define MCE_SERVICE                     "com.nokia.mce"
+#define MCE_REQUEST_PATH                "/com/nokia/mce/request"
+#define MCE_REQUEST_IF                  "com.nokia.mce.request"
 #endif
 
 /**

diff --git a/adaptors/proximityadaptor/proximityadaptor.h b/adaptors/proximityadaptor/proximityadaptor.h
@@ -35,8 +35,11 @@
 #include "datatypes/orientationdata.h"
 
 #ifdef SENSORFW_MCE_WATCHER
-#include <mce/mode-names.h>
-#include <mce/dbus-names.h>
+// these come from mce/mode-names.h
+// and mce/dbus-names.h
+#define MCE_SERVICE                     "com.nokia.mce"
+#define MCE_REQUEST_PATH                "/com/nokia/mce/request"
+#define MCE_REQUEST_IF                  "com.nokia.mce.request"
 #endif
 
 /**

diff --git a/core/mcewatcher.cpp b/core/mcewatcher.cpp
@@ -25,10 +25,9 @@
  */
 
 
-#include <mce/mode-names.h>
-#include <mce/dbus-names.h>
 #include "mcewatcher.h"
 
+
 MceWatcher::MceWatcher(QObject* parent) : QObject(parent),
                                           dbusIfc(new QDBusInterface(MCE_SERVICE,
                                                                      MCE_SIGNAL_PATH,

diff --git a/core/mcewatcher.h b/core/mcewatcher.h
@@ -32,7 +32,12 @@
 #include <QObject>
 #include <QDBusInterface>
 #include <QString>
-
+#define MCE_SERVICE                     "com.nokia.mce"
+#define MCE_SIGNAL_PATH                 "/com/nokia/mce/signal"
+#define MCE_SIGNAL_IF                   "com.nokia.mce.signal"
+#define MCE_DISPLAY_OFF_STRING                  "off"
+#define MCE_PSM_STATE_SIG               "psm_state_ind"
+#define MCE_DISPLAY_SIG                 "display_status_ind"
 /**
  * Class for monitoring various MCE signals.
  */

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -34,7 +34,6 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(mce)
 Provides:   sensord-qt5
 Obsoletes:   sensorframework
 

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -24,7 +24,6 @@ PkgConfigBR:
     - Qt5Network
     - Qt5Test
     - gconf-2.0
-    - mce
 
 Obsoletes:
     - sensorframework