Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

lib/QMapControl/src/emptymapadapter.cpp

@@ -29,6 +29,7 @@ namespace qmapcontrol
     EmptyMapAdapter::EmptyMapAdapter(int tileSize, int minZoom, int maxZoom)
 	:MapAdapter("", "", 256, minZoom, maxZoom)
     {
+        Q_UNUSED(tileSize);
         PI = acos(-1.0);
 
 	numberOfTiles = tilesonzoomlevel(minZoom);
@@ -67,6 +68,9 @@ namespace qmapcontrol
 
     QString EmptyMapAdapter::query(int x, int y, int z) const
     {
+        Q_UNUSED(x);
+        Q_UNUSED(y);
+        Q_UNUSED(z);
 	return "";
     }
 

src/Core.cc

@@ -183,7 +183,7 @@ void Core::startUASManager()
 #endif
     pluginsDir.cd("plugins");
 
-    UASManager* m = UASManager::instance();
+    UASManager::instance();
 
     // Load plugins
 
@@ -197,7 +197,7 @@ void Core::startUASManager()
         {
             //populateMenus(plugin);
             pluginFileNames += fileName;
-            printf(QString("Loaded plugin from " + fileName + "\n").toStdString().c_str());
+            //printf(QString("Loaded plugin from " + fileName + "\n").toStdString().c_str());
         }
     }
 }

src/ui/HUD.cc

@@ -1170,6 +1170,8 @@ void HUD::drawChangeRateStrip(float xRef, float yRef, float height, float minRat
 
 void HUD::drawSystemIndicator(float xRef, float yRef, int maxNum, float maxWidth, float maxHeight, QPainter* painter)
 {
+    Q_UNUSED(maxWidth);
+    Q_UNUSED(maxHeight);
     if (values.size() > 0)
     {
         QString selectedKey = values.begin().key();
@@ -1298,6 +1300,8 @@ void HUD::drawLine(float refX1, float refY1, float refX2, float refY2, float wid
 
 void HUD::drawEllipse(float refX, float refY, float radiusX, float radiusY, float startDeg, float endDeg, float lineWidth, const QColor& color, QPainter* painter)
 {
+    Q_UNUSED(startDeg);
+    Q_UNUSED(endDeg);
     QPen pen(painter->pen().style());
     pen.setWidth(refLineWidthToPen(lineWidth));
     pen.setColor(color);

src/ui/MapWidget.cc

@@ -193,6 +193,7 @@ void MapWidget::updateGlobalPosition(UASInterface* uas, double lat, double lon,
 
 void MapWidget::updatePosition(float time, double lat, double lon)
 {
+    Q_UNUSED(time);
     //gpsposition->setText(QString::number(time) + " / " + QString::number(lat) + " / " + QString::number(lon));
     if (followgps->isChecked())
     {