Changes: gps controller uses labels for fake gps

[ptas] / zouba / src / main.cpp

diff --git a/zouba/src/main.cpp b/zouba/src/main.cpp
index 47402c8..ffe72e3 100644 (file)
--- a/zouba/src/main.cpp
+++ b/zouba/src/main.cpp
@@ -5,8 +5,8 @@
 #include "location.h"
 #include "gpscontroller.h"
 #include "ytv.h"
-#include "messagehandler.h"
 #include "messagetable.h"
+#include "messagehandler.h"
 
 #include <QDebug>
 #include <QObject>
@@ -15,14 +15,14 @@
 
 int main(int argc, char *argv[] )
 {
-  qInstallMsgHandler( messageHandler );
+  //qInstallMsgHandler( messageHandler );
   QApplication app(argc, argv);
 
   QMainWindow *mainWindow = new QMainWindow;
-  Ui ui;
-  ui.setupUi(mainWindow);
+  Ui *ui = new Ui;;
+  ui->setupUi(mainWindow);
 
-  UiController  *uiController  = new UiController( &ui );
+  UiController  *uiController  = new UiController( ui );
   Route         *route         = new Route();
   GpsController *gpsController = new GpsController();
 
@@ -46,6 +46,16 @@ int main(int argc, char *argv[] )
       gpsController, SLOT( getGps() )
     );
 
+  QObject::connect(
+      ui, SIGNAL( fakeGpsPressed( const QString & ) ),
+      gpsController, SLOT( useFakeGps( const QString & ) )
+    );
+
+  QObject::connect(
+      ui, SIGNAL( liveGpsPressed() ),
+      gpsController, SLOT( useLiveGps() )
+    );
+
   mainWindow->show();
 
   return app.exec();