fix:various: fix android compiler warnings

3 files changed, 145 insertions, 131 deletions

diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index 221c23fa4..66524e407 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -21,6 +21,9 @@
 #include "gui_internal_menu.h"
 #include "gui_internal_keyboard.h"
 #include "gui_internal_search.h"
+#ifdef HAVE_API_ANDROID
+#include "util.h"
+#endif
 
 static void gui_internal_search_country(struct gui_priv *this, struct widget *widget, void *data) {
     gui_internal_prune_menu_count(this, 1, 0);
diff --git a/navit/gui/qml/navitProxy.h b/navit/gui/qml/navitProxy.h
index d3f8a0e86..0abc88cce 100644
--- a/navit/gui/qml/navitProxy.h
+++ b/navit/gui/qml/navitProxy.h
@@ -7,139 +7,149 @@ class NGQProxyNavit : public NGQProxy {
     Q_OBJECT;
 
 public:
-	NGQProxyNavit(struct gui_priv* object, QObject* parent) : NGQProxy(object,parent) { };
+    NGQProxyNavit(struct gui_priv* object, QObject* parent) : NGQProxy(object,parent) { };
 
 public slots:
-	void quit() {
-		struct attr navit;
-		navit.type=attr_navit;
-		navit.u.navit=this->object->nav;
-		navit_destroy(navit.u.navit);
-		event_main_loop_quit();
-	}
-	void setObjectByName(const QString& attr_name,const QString& attr_value) {
-		if (attr_name=="layout") {
-			navit_set_layout_by_name(this->object->nav,attr_value.toStdString().c_str());
-		}
-		if (attr_name=="vehicle") {
-			navit_set_vehicle_by_name(this->object->nav,attr_value.toStdString().c_str());
-		}
-		return;
-	}
-	QString getAttrList(const QString &attr_name) {
-		struct attr attr;
-		struct attr_iter *iter;
-		int counter=0;
-		QString currentValue;
-		QDomDocument retDoc;
-		QDomElement entries;
-
-		entries=retDoc.createElement("attributes");
-		retDoc.appendChild(entries);
-
-		//Find current value
-		getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL) ;
-		if (attr.type==attr_layout) {
-			currentValue=attr.u.layout->name;
-		}
-
-		//Fill da list
-		iter=getIterFunc();
-		if (iter == NULL) {
-			return QString();
-		}
-
-		while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) {
-			QStandardItem* curItem=new QStandardItem();
-			//Listed attributes are usualy have very complex structure
-			if (attr.type==attr_layout) {
-				curItem->setData(QVariant(counter),NGQStandardItemModel::ItemId);
-				curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemName);
-				curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemValue);
-				if (currentValue==attr.u.layout->name) {
-					this->_itemId=counter;
-				}
-			}
-			if (attr.type==attr_vehicle) {
-				QStandardItem* curItem=new QStandardItem();
-				QDomElement entry=retDoc.createElement("vehicle");
-				entries.appendChild(entry);
-
-				this->object->currVehicle=attr.u.vehicle;
-				curItem->setData(QVariant(this->object->vehicleProxy->getAttr("name")),NGQStandardItemModel::ItemName);
-				entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter)));
-				entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"), QString(this->object->vehicleProxy->getAttr("name"))));
-
-				//Detecting current vehicle
-				struct attr vehicle_attr;
-				navit_get_attr(this->object->nav, attr_vehicle, &vehicle_attr, NULL);
-				if (vehicle_attr.u.vehicle==attr.u.vehicle) {
-					this->_itemId=counter;
-				}
-			}
-			counter++;
-		}
-
-		dropIterFunc(iter);
-
-		dbg(lvl_debug,QString::number(_itemId).toStdString().c_str());
-
-		return retDoc.toString();
-	}
-	QString getDestination() {
-		struct attr attr;
-		struct coord c;
-
-		if (getAttrFunc(attr_destination, &attr, NULL) ) {
-			c.x=attr.u.pcoord->x;
-			c.y=attr.u.pcoord->y;
-			__setNewPoint(this->object,&c,Destination);
-			return this->object->currentPoint->pointName();
-		}
-		return QString();
-	}
-	void setDestination() {
-		navit_set_destination(this->object->nav,this->object->currentPoint->pc(),this->object->currentPoint->coordString().toStdString().c_str(),1);
-	}
-	void stopNavigation() {
-		navit_set_destination(this->object->nav,NULL,NULL,0);
-	}
-	QString getPosition() {
-		struct attr attr;
-		struct pcoord pc;
-		struct coord c;
-		struct transformation *trans;
-
-		trans=navit_get_trans(this->object->nav);
-
-		getAttrFunc(attr_vehicle, &attr, NULL);
-		this->object->currVehicle=attr.u.vehicle;
-
-		if (vehicle_get_attr(this->object->currVehicle, attr_position_coord_geo, &attr, NULL)) {
-		   pc.pro=transform_get_projection(trans);
-		   transform_from_geo(pc.pro, attr.u.coord_geo, &c);
-		   __setNewPoint(this->object,&c,Position);
-		   return this->object->currentPoint->pointName();
-		}
-		return QString();
-	}
-	void setPosition() {
-		navit_set_position(this->object->nav,this->object->currentPoint->pc());
-	}
-	void setCenter() {
-		navit_set_center(this->object->nav,this->object->currentPoint->pc(),1);
-	}
-	void command(QString command) {
-		struct attr navit;
-		navit.type=attr_navit;
-		navit.u.navit=this->object->nav;
-		command_evaluate(&navit,command.toLocal8Bit().constData());
-	}
+    void quit() {
+        struct attr navit;
+        navit.type=attr_navit;
+        navit.u.navit=this->object->nav;
+        navit_destroy(navit.u.navit);
+        event_main_loop_quit();
+    }
+    void setObjectByName(const QString& attr_name,const QString& attr_value) {
+        if (attr_name=="layout") {
+            navit_set_layout_by_name(this->object->nav,attr_value.toStdString().c_str());
+        }
+        if (attr_name=="vehicle") {
+            navit_set_vehicle_by_name(this->object->nav,attr_value.toStdString().c_str());
+        }
+        return;
+    }
+    QString getAttrList(const QString &attr_name) {
+        struct attr attr;
+        struct attr_iter *iter;
+        int counter=0;
+        QString currentValue;
+        QDomDocument retDoc;
+        QDomElement entries;
+
+        entries=retDoc.createElement("attributes");
+        retDoc.appendChild(entries);
+
+        //Find current value
+        getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL) ;
+        if (attr.type==attr_layout) {
+            currentValue=attr.u.layout->name;
+        }
+
+        //Fill da list
+        iter=getIterFunc();
+        if (iter == NULL) {
+            return QString();
+        }
+
+        while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) {
+            QStandardItem* curItem=new QStandardItem();
+            //Listed attributes are usualy have very complex structure
+            if (attr.type==attr_layout) {
+                curItem->setData(QVariant(counter),NGQStandardItemModel::ItemId);
+                curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemName);
+                curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemValue);
+                if (currentValue==attr.u.layout->name) {
+                    this->_itemId=counter;
+                }
+            }
+            if (attr.type==attr_vehicle) {
+                QStandardItem* curItem=new QStandardItem();
+                QDomElement entry=retDoc.createElement("vehicle");
+                entries.appendChild(entry);
+
+                this->object->currVehicle=attr.u.vehicle;
+                curItem->setData(QVariant(this->object->vehicleProxy->getAttr("name")),NGQStandardItemModel::ItemName);
+                entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter)));
+                entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"),
+                                  QString(this->object->vehicleProxy->getAttr("name"))));
+
+                //Detecting current vehicle
+                struct attr vehicle_attr;
+                navit_get_attr(this->object->nav, attr_vehicle, &vehicle_attr, NULL);
+                if (vehicle_attr.u.vehicle==attr.u.vehicle) {
+                    this->_itemId=counter;
+                }
+            }
+            counter++;
+        }
+
+        dropIterFunc(iter);
+
+        dbg(lvl_debug,QString::number(_itemId).toStdString().c_str());
+
+        return retDoc.toString();
+    }
+    QString getDestination() {
+        struct attr attr;
+        struct coord c;
+
+        if (getAttrFunc(attr_destination, &attr, NULL) ) {
+            c.x=attr.u.pcoord->x;
+            c.y=attr.u.pcoord->y;
+            __setNewPoint(this->object,&c,Destination);
+            return this->object->currentPoint->pointName();
+        }
+        return QString();
+    }
+    void setDestination() {
+        navit_set_destination(this->object->nav,this->object->currentPoint->pc(),
+                              this->object->currentPoint->coordString().toStdString().c_str(),1);
+    }
+    void stopNavigation() {
+        navit_set_destination(this->object->nav,NULL,NULL,0);
+    }
+    QString getPosition() {
+        struct attr attr;
+        struct pcoord pc;
+        struct coord c;
+        struct transformation *trans;
+
+        trans=navit_get_trans(this->object->nav);
+
+        getAttrFunc(attr_vehicle, &attr, NULL);
+        this->object->currVehicle=attr.u.vehicle;
+
+        if (vehicle_get_attr(this->object->currVehicle, attr_position_coord_geo, &attr, NULL)) {
+            pc.pro=transform_get_projection(trans);
+            transform_from_geo(pc.pro, attr.u.coord_geo, &c);
+            __setNewPoint(this->object,&c,Position);
+            return this->object->currentPoint->pointName();
+        }
+        return QString();
+    }
+    void setPosition() {
+        navit_set_position(this->object->nav,this->object->currentPoint->pc());
+    }
+    void setCenter() {
+        navit_set_center(this->object->nav,this->object->currentPoint->pc(),1);
+    }
+    void command(QString command) {
+        struct attr navit;
+        navit.type=attr_navit;
+        navit.u.navit=this->object->nav;
+        command_evaluate(&navit,command.toLocal8Bit().constData());
+    }
 protected:
-	int getAttrFunc(enum attr_type type, struct attr* attr, struct attr_iter* iter) { return navit_get_attr(this->object->nav, type, attr, iter); }
-	int setAttrFunc(struct attr* attr) {return navit_set_attr(this->object->nav,attr); }
-	struct attr_iter* getIterFunc() { return navit_attr_iter_new(); };
-	void dropIterFunc(struct attr_iter* iter) { navit_attr_iter_destroy(iter); };
+    int getAttrFunc(enum attr_type type, struct attr* attr, struct attr_iter* iter) {
+        return navit_get_attr(this->object->nav, type, attr, iter);
+    }
+    int setAttrFunc(struct attr* attr) {
+        return navit_set_attr(this->object->nav,attr);
+    }
+    struct attr_iter* getIterFunc() {
+        return navit_attr_iter_new(NULL);
+    };
+    void dropIterFunc(struct attr_iter* iter) {
+        navit_attr_iter_destroy(iter);
+    };
 
 private:
 
diff --git a/navit/traffic/traff_android/traffic_traff_android.c b/navit/traffic/traff_android/traffic_traff_android.c
index 1612b3a5f..266f51a0c 100644
--- a/navit/traffic/traff_android/traffic_traff_android.c
+++ b/navit/traffic/traff_android/traffic_traff_android.c
@@ -42,6 +42,7 @@
 #include "plugin.h"
 #include "callback.h"
 #include "debug.h"
+#include "navit.h"
 
 /**
  * @brief Stores information about the plugin instance.
@@ -86,7 +87,7 @@ static void traffic_traff_android_on_feed_received(struct traffic_priv * this_,
 
     dbg(lvl_debug, "enter");
     attr = g_new0(struct attr, 1);
-    a_iter = navit_attr_iter_new();
+    a_iter = navit_attr_iter_new(NULL);
     if (navit_get_attr(this_->nav, attr_traffic, attr, a_iter))
         traffic = (struct traffic *) attr->u.navit_object;
     navit_attr_iter_destroy(a_iter);