Fixed opmapcontrol build issues

src/ui/MainWindow.cc

@@ -1027,20 +1027,11 @@ void MainWindow::connectCommonWidgets()
                 infoDockWidget->widget(), SLOT(updateSendLoss(int, float)));
     }
 
-    if (mapWidget && waypointsDockWidget->widget())
-    {
-
-        //
-        connect(waypointsDockWidget->widget(), SIGNAL(changePointList()), mapWidget, SLOT(clearWaypoints()));
-    }
-
     //TODO temporaly debug
     if (slugsHilSimWidget && slugsHilSimWidget->widget()){
         connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)),
                 slugsHilSimWidget->widget(), SLOT(activeUasSet(UASInterface*)));
     }
-
-
 }
 
 void MainWindow::createCustomWidget()

src/ui/QGCMapWidget.cc

 #include "QGCMapWidget.h"
 
 QGCMapWidget::QGCMapWidget(QWidget *parent) :
-    OPMapWidget(parent)
+    mapcontrol::OPMapWidget(parent)
 {
 }

src/ui/QGCMapWidget.h

 #ifndef QGCMAPWIDGET_H
 #define QGCMAPWIDGET_H
 
-class QGCMapWidget : public OPMapWidget
+#include "opmapcontrol.h"
+
+class QGCMapWidget : public mapcontrol::OPMapWidget
 {
     Q_OBJECT
 public: