Merge branch 'crosshair2'

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 35d23b3..8f45110 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -66,9 +66,9 @@ MainWindow::MainWindow(QWidget *parent)
             m_mapViewScreen, SIGNAL(friendsLocationsReady(QList<User*>&)));
 
        connect(this, SIGNAL(autoCentering(bool)),
-            m_mapViewScreen, SLOT(enableAutoCentering(bool)));
+            m_mapViewScreen, SIGNAL(enableAutoCentering(bool)));
     connect(this, SIGNAL(positionReceived(QPointF, qreal)),
-            m_mapViewScreen, SLOT(positionReceived(QPointF, qreal)));
+            m_mapViewScreen, SIGNAL(positionReceived(QPointF, qreal)));
     connect(m_mapViewScreen, SIGNAL(mapLocationChanged()),
             this, SLOT(mapLocationChanged()));
 
@@ -126,8 +126,10 @@ void MainWindow::createMenus()
     m_autoCenteringAct->setCheckable(true);
     m_autoCenteringAct->setChecked(true);
     connect(m_autoCenteringAct, SIGNAL(toggled(bool)),
-        this, SLOT(autoCenteringToggled(bool)));    
-       
+        this, SLOT(autoCenteringToggled(bool))); 
+    connect(this, SIGNAL(enableGPS(bool)),
+            m_mapViewScreen, SIGNAL(gpsEnabled(bool)));
+
     m_viewMenu = menuBar()->addMenu(tr("Main"));
 
     m_viewMenu->addAction(m_toSettingsAct);