Minor changes to engine.cpp and routingservice.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 53bc0ce..bc2c67b 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -51,7 +51,7 @@ const qreal USER_MOVEMENT_MINIMUM_LATITUDE_DIFFERENCE = 0.001;///< Min value for
 const int MIN_UPDATE_INTERVAL_MSECS = 5*60*1000;
 
 SituareEngine::SituareEngine()
-    : m_autoCenteringEnabled(false),
+    : //m_autoCenteringEnabled(false),
       m_automaticUpdateFirstStart(true),
       m_automaticUpdateRequest(false),
       m_userMoved(false),
@@ -245,8 +245,8 @@ void SituareEngine::enablePowerSave(bool enabled)
 
     m_gps->enablePowerSave(enabled);
 
-    if(m_autoCenteringEnabled)
-        m_mapEngine->setAutoCentering(!enabled);
+//    if(m_autoCenteringEnabled)
+//        m_mapEngine->setAutoCentering(!enabled);
 }
 
 void SituareEngine::error(const int context, const int error)
@@ -524,8 +524,8 @@ void SituareEngine::setFirstStartZoomLevel()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (m_autoCenteringEnabled) // autocentering is disabled when map is scrolled
-        m_mapEngine->setZoomLevel(DEFAULT_ZOOM_LEVEL_WHEN_GPS_IS_AVAILABLE);
+//    if (m_autoCenteringEnabled) // autocentering is disabled when map is scrolled
+//        m_mapEngine->setZoomLevel(DEFAULT_ZOOM_LEVEL_WHEN_GPS_IS_AVAILABLE);
 
     disconnect(m_gps, SIGNAL(position(GeoCoordinate, qreal)),
                this, SLOT(setFirstStartZoomLevel()));

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());