Changed to QDbusInterface and QDBusMessage to be used only when running app in armel

Removed hardcoded route request

Reviewed by: Jussi Laitinen

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 035e793..059aca6 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -132,9 +132,6 @@ SituareEngine::SituareEngine()
 
     m_mce = new MCE(this);
     connect(m_mce, SIGNAL(displayOff(bool)), this, SLOT(enablePowerSave(bool)));
-
-    /// @todo for testing, remove after real route start and end points are available
-    //m_routingService->requestRoute(QPointF(65.010193,25.509859), QPointF(65.015152, 25.46645));
 }
 
 SituareEngine::~SituareEngine()

diff --git a/src/routing/routingservice.cpp b/src/routing/routingservice.cpp
index 8bedaf2..678145d 100644 (file)
--- a/src/routing/routingservice.cpp
+++ b/src/routing/routingservice.cpp
@@ -126,7 +126,7 @@ void RoutingService::requestAuthorizationToken()
     QString uidPart = "?userid=";
     QByteArray rawData;
 
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5) & defined(ARMEL)
     // get the device IMEI code
     QDBusInterface interface(SIM_DBUS_SERVICE, SIM_DBUS_PATH, SIM_DBUS_IFACE,
                              QDBusConnection::systemBus());