Added menu option to show/hide messages table.

[ptas] / zouba / main.cpp

diff --git a/zouba/main.cpp b/zouba/main.cpp
index 761cfcb..47402c8 100644 (file)
--- a/zouba/main.cpp
+++ b/zouba/main.cpp
@@ -4,8 +4,9 @@
 #include "uicontroller.h"
 #include "location.h"
 #include "gpscontroller.h"
-
 #include "ytv.h"
+#include "messagehandler.h"
+#include "messagetable.h"
 
 #include <QDebug>
 #include <QObject>
@@ -14,7 +15,9 @@
 
 int main(int argc, char *argv[] )
 {
+  qInstallMsgHandler( messageHandler );
   QApplication app(argc, argv);
+
   QMainWindow *mainWindow = new QMainWindow;
   Ui ui;
   ui.setupUi(mainWindow);
@@ -22,31 +25,28 @@ int main(int argc, char *argv[] )
   UiController  *uiController  = new UiController( &ui );
   Route         *route         = new Route();
   GpsController *gpsController = new GpsController();
-  Location      *to            = new Location();
 
   QObject::connect(
-      route, SIGNAL( routeReady( RouteData ) ),
-      uiController, SLOT( displayRoute( RouteData ) )
+      route, SIGNAL( routeReady( QList<RouteData> ) ),
+      uiController, SLOT( displayRoute( QList<RouteData> ) )
       );
 
   QObject::connect(
-      gpsController, SIGNAL( locationChanged( Location ) ),
-      route, SLOT( setFromLocation( Location ) )
+      gpsController, SIGNAL( locationChanged( Location* ) ),
+      route, SLOT( setFromLocation( Location* ) )
       );
 
   QObject::connect(
-      to, SIGNAL( becomeValid() ),
-      route, SLOT( setToLocation() )
-      );
+      uiController, SIGNAL( destinationChanged( Location* ) ),
+      route, SLOT( setToLocation( Location* ) )
+    );
 
   QObject::connect(
-      uiController, SIGNAL( homePressed() ),
-      gpsController, SLOT( startGps() )
+      uiController, SIGNAL( buttonClicked() ),
+      gpsController, SLOT( getGps() )
     );
 
   mainWindow->show();
 
-  to->resolveAddress( work );
-
   return app.exec();
 }