X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fengine%2Fengine.cpp;h=c146edd7967044240831aaac4f490c98eae6f559;hb=b7a197c0d436f032478e62a7117651ef766a8f49;hp=778867fe2104cb541edd73412730cb609f44a55e;hpb=699f87eff1401e323543f8e279d75e1027d43de1;p=situare diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 778867f..c146edd 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -49,7 +49,7 @@ SituareEngine::SituareEngine(QMainWindow *parent) m_userMoved(false), m_automaticUpdateIntervalTimer(0), m_lastUpdatedGPSPosition(QPointF()) -{ +{ qDebug() << __PRETTY_FUNCTION__; m_ui = new MainWindow; m_ui->updateItemVisibility(); @@ -209,7 +209,7 @@ void SituareEngine::enableAutomaticLocationUpdate(bool enabled, int updateInterv void SituareEngine::error(const int context, const int error) { - qDebug() << __PRETTY_FUNCTION__; + qDebug() << __PRETTY_FUNCTION__; switch(error) { @@ -456,7 +456,7 @@ void SituareEngine::setFirstStartZoomLevel(QPointF latLonCoordinate, qreal accur Q_UNUSED(latLonCoordinate); Q_UNUSED(accuracy); - if (m_autoCenteringEnabled) // autocentering is disabled when map is scrolled + 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(QPointF,qreal)), @@ -505,7 +505,7 @@ void SituareEngine::signalsFromGPS() void SituareEngine::signalsFromMainWindow() { - qDebug() << __PRETTY_FUNCTION__; + qDebug() << __PRETTY_FUNCTION__; connect(m_ui, SIGNAL(error(int, int)), this, SLOT(error(int, int))); @@ -524,7 +524,7 @@ void SituareEngine::signalsFromMainWindow() // signals from map view connect(m_ui, SIGNAL(mapViewScrolled(QPoint)), - m_mapEngine, SLOT(setLocation(QPoint))); + m_mapEngine, SLOT(setCenterPosition(QPoint))); connect(m_ui, SIGNAL(mapViewResized(QSize)), m_mapEngine, SLOT(viewResized(QSize))); @@ -557,18 +557,18 @@ void SituareEngine::signalsFromMainWindow() this, SLOT(requestUpdateLocation(QString,bool))); connect(m_ui, SIGNAL(enableAutomaticLocationUpdate(bool, int)), - this, SLOT(enableAutomaticLocationUpdate(bool, int))); + this, SLOT(enableAutomaticLocationUpdate(bool, int))); // signals from user info tab connect(m_ui, SIGNAL(refreshUserData()), this, SLOT(refreshUserData())); connect(m_ui, SIGNAL(findUser(QPointF)), - m_mapEngine, SLOT(setViewLocation(QPointF))); + m_mapEngine, SLOT(centerToCoordinates(QPointF))); // signals from friend list tab connect(m_ui, SIGNAL(findFriend(QPointF)), - m_mapEngine, SLOT(setViewLocation(QPointF))); + m_mapEngine, SLOT(centerToCoordinates(QPointF))); } void SituareEngine::signalsFromMapEngine()