Merge branch 'master' of git://github.com/pixhawk/qgroundcontrol into radio

src/ui/MapWidget.cc

@@ -198,6 +198,7 @@ MapWidget::MapWidget(QWidget *parent) :
     connect(createPath, SIGNAL(clicked(bool)),
             this, SLOT(createPathButtonClicked(bool)));
 
+
     connect(geomLayer, SIGNAL(geometryClicked(Geometry*,QPoint)),
             this, SLOT(captureGeometryClick(Geometry*, QPoint)));
 
@@ -372,7 +373,7 @@ void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordina
   }
 }
 
-void MapWidget::captureGeometryClick(qmapcontrol::Geometry* geom, QPoint point){
+void MapWidget::captureGeometryClick(Geometry* geom, QPoint point){
   Q_UNUSED(geom);
   Q_UNUSED(point);
 
@@ -381,7 +382,7 @@ void MapWidget::captureGeometryClick(qmapcontrol::Geometry* geom, QPoint point){
 
 }
 
-void MapWidget::captureGeometryDrag(qmapcontrol::Geometry* geom, QPointF coordinate){
+void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate){
   Q_UNUSED(coordinate);
 
   // Refresh the screen
@@ -409,7 +410,7 @@ void MapWidget::captureGeometryDrag(qmapcontrol::Geometry* geom, QPointF coordin
 
 }
 
-void MapWidget::captureGeometryEndDrag(qmapcontrol::Geometry* geom, QPointF coordinate)
+void MapWidget::captureGeometryEndDrag(Geometry* geom, QPointF coordinate)
 {
 
     mc->setMouseMode(qmapcontrol::MapControl::Panning);

src/ui/MapWidget.h

@@ -44,6 +44,8 @@ namespace Ui {
     class MapWidget;
 }
 
+    using namespace qmapcontrol;
+
 /**
  * @brief 2D Moving map
  *
@@ -105,10 +107,10 @@ protected:
   protected slots:
     void captureMapClick (const QMouseEvent* event, const QPointF coordinate);
     void createPathButtonClicked(bool checked);
-    void captureGeometryClick(qmapcontrol::Geometry*, QPoint);
+    void captureGeometryClick(Geometry*, QPoint);
     void mapproviderSelected(QAction* action);
-    void captureGeometryDrag(qmapcontrol::Geometry* geom, QPointF coordinate);
-    void captureGeometryEndDrag(qmapcontrol::Geometry* geom, QPointF coordinate);
+    void captureGeometryDrag(Geometry* geom, QPointF coordinate);
+    void captureGeometryEndDrag(Geometry* geom, QPointF coordinate);
 
 
 

src/ui/map3D/Q3DWidget.h

@@ -165,7 +165,7 @@ protected:
     float r2d(float angle);
     float d2r(float angle);
 
-    void Q3DWidget::wireSphere(double radius, int slices, int stacks);
+    void wireSphere(double radius, int slices, int stacks);
     void solidSphere(double radius, int slices, int stacks);
     void wireCone(double base, double height, int slices, int stacks);
     void solidCone(double base, double height, int slices, int stacks);

src/ui/map3D/QMap3DWidget.cc

@@ -54,9 +54,6 @@ QMap3DWidget::QMap3DWidget(QWidget* parent)
     initialize(10, 10, 1000, 900, 15.0f);
     setCameraParams(0.05f, 0.5f, 0.01f, 0.5f, 30.0f, 0.01f, 400.0f);
 
-    int32_t argc = 0;
-    //glutInit(&argc, NULL);
-
     setDisplayFunc(display, this);
     setMouseFunc(mouse, this);
     addTimerFunc(100, timer, this);