poi-yelp: change to libqtappfw navigation interfacehalibut_8.0.4halibut/8.0.48.0.4

Switch from DBus interface to rewritten agl-service-nagivation
binding via the libqtappfw wrapper interface.

Bug-AGL: SPEC-2880
Change-Id: I4244de4db250af438dda6b6173940f6a49fe34f2
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/MainApp.h b/MainApp.h
index 66defee..7d0b9de 100644
--- a/MainApp.h
+++ b/MainApp.h
@@ -12,16 +12,15 @@
 #include "InfoPanel.h"
 #include "Keyboard.h"
 
-#include <libnavicore.hpp>
+#include <navigation.h>
 
-class MainApp: public QMainWindow, public naviapi::NavicoreListener
+class MainApp: public QMainWindow
 {
     Q_OBJECT
 
     public:
-        explicit MainApp();
+        explicit MainApp(Navigation *navigation);
         ~MainApp();
-        bool CheckNaviApi(int argc, char *argv[]);
         int AuthenticatePOI(const QString & CredentialsFile);
         int StartMonitoringUserInput();
         void setInfoScreen(bool val) { isInfoScreen = val; }
@@ -39,7 +38,7 @@ class MainApp: public QMainWindow, public naviapi::NavicoreListener
         int FillResultList(std::vector<Business> & list, int focusIndex = 0);
         void SetWayPoints(uint32_t myRoute);
 
-    naviapi::Navicore naviapi;
+        Navigation *naviapi;
         QNetworkAccessManager networkManager;
         QPushButton searchBtn;
         QLineEdit lineEdit;
@@ -68,7 +67,7 @@ class MainApp: public QMainWindow, public naviapi::NavicoreListener
 
     public:
         void getAllSessions_reply(const std::map< uint32_t, std::string >& allSessions);
-    void getPosition_reply(std::map< int32_t, naviapi::variant > position);
+    //void getPosition_reply(std::map< int32_t, naviapi::variant > position);
     void getAllRoutes_reply(std::vector< uint32_t > allRoutes);
     void createRoute_reply(uint32_t routeHandle);
 
@@ -84,8 +83,6 @@ class MainApp: public QMainWindow, public naviapi::NavicoreListener
         void cancelClicked();
 
         void positionGot();
-        void allRoutesGot();
-        void routeCreated();
 
     signals:
         void allSessionsGotSignal();