align with latest version of navit

5 files changed, 11 insertions, 7 deletions

diff --git a/src/navigation/README.md b/src/navigation/README.md
index f2474b2..38d4a64 100644
--- a/src/navigation/README.md
+++ b/src/navigation/README.md
@@ -19,7 +19,7 @@ The code is regularly aligned with the latest versions of the third parties soft
 
 ## Prerequisites
 Under Ubuntu, some packets are needed to be installed:
-sudo apt-get install xsltproc libdbus-cpp-dev libdbus-c++-dev libglib2.0-dev gtk+-2.0 libglibmm-2.4-dev libxml++2.6-dev libgtk-3-dev libdbus-1-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev inkscape qt5-qmake qtbase5-dev-tools qtbase5-dev qttools5-dev-tools qtdeclarative5-dev 
+sudo apt-get install xsltproc libdbus-c++-dev libglib2.0-dev gtk+-2.0 libglibmm-2.4-dev libxml++2.6-dev libgtk-3-dev libdbus-1-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev inkscape qt5-qmake qtbase5-dev-tools qtbase5-dev qttools5-dev-tools qtdeclarative5-dev cmake sqlite3 libsqlite3-dev
 
 ## How to build
 ### From scratch
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 627f157..53c1452 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -1219,7 +1219,8 @@ MapViewerControlObj::SetMapViewTheme(uint32_t sessionHandle, uint16_t mapViewThe
         LOG_DEBUG_MSG(gCtx,"Invalid mapViewTheme");
 		throw DBus::ErrorInvalidArgs("Invalid mapViewTheme");
 	}
-	iter=navit_attr_iter_new();
+    void * unused;
+    iter=navit_attr_iter_new(unused);
 	while (navit_get_attr(m_navit.u.navit, attr_layout, &layout, iter)) {
 		if (!layout_get_attr(layout.u.layout, attr_name, &name, NULL)) {
 			navit_attr_iter_destroy(iter);
@@ -1735,8 +1736,8 @@ MapViewerControlObj::MapViewerControlObj(MapViewerControl *mapviewercontrol, uin
 	mapset.u.mapset=mapset_dup(mapset.u.mapset);
 	m_mapset=mapset.u.mapset;
 	navit_add_attr(m_navit.u.navit, &mapset);
-
-	struct attr_iter *iter=navit_attr_iter_new();
+    void * unused;
+    struct attr_iter *iter=navit_attr_iter_new(unused);
 	struct attr layout;
 	while (navit_get_attr(navit_template.u.navit, attr_layout, &layout, iter)) {
 		navit_add_attr(m_navit.u.navit, &layout);
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 3f4c698..87816db 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -181,7 +181,8 @@ get_vehicle(const char *source_prefix)
 		if (navit_get_attr(navit, attr_vehicle, &vehicle, NULL))
 			ret=vehicle.u.vehicle;
 	} else {
-		struct attr_iter *iter=navit_attr_iter_new();
+        void * unused;
+        struct attr_iter *iter=navit_attr_iter_new(unused);
 		while (navit_get_attr(navit, attr_vehicle, &vehicle, iter)) {
 			struct attr source;
 			if (vehicle.u.vehicle && vehicle_get_attr(vehicle.u.vehicle, attr_source, &source, NULL) && 
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index a3ea303..e8b3cf3 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -82,7 +82,8 @@ get_vehicle(const char *source_prefix)
 		if (navit_get_attr(navit, attr_vehicle, &vehicle, NULL))
 			ret=vehicle.u.vehicle;
 	} else {
-		struct attr_iter *iter=navit_attr_iter_new();
+        void * unused;
+        struct attr_iter *iter=navit_attr_iter_new(unused);
 		while (navit_get_attr(navit, attr_vehicle, &vehicle, iter)) {
 			struct attr source;
 			if (vehicle.u.vehicle && vehicle_get_attr(vehicle.u.vehicle, attr_source, &source, NULL) && 
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index 8ef71be..eadd9fa 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -879,7 +879,8 @@ RoutingObj::SetRoutePreferences(uint32_t sessionHandle, const std::string& count
 	}
 	vehicleprofile_set_attr(m_vehicleprofile.u.vehicleprofile, &flags_forward_mask);
 	vehicleprofile_set_attr(m_vehicleprofile.u.vehicleprofile, &flags_reverse_mask);
-	struct attr_iter *iter=vehicleprofile_attr_iter_new();
+    void * unused;
+    struct attr_iter *iter=vehicleprofile_attr_iter_new(unused);
 	while (vehicleprofile_get_attr(m_vehicleprofile.u.vehicleprofile, attr_roadprofile, &roadprofile, iter)) {
 		if (roadprofile_get_attr(roadprofile.u.roadprofile, attr_item_types, &item_types, NULL)) {
 			int *par=NULL;