From ef221a2c41aba09957eff923a3fe0a4b76c70d2b Mon Sep 17 00:00:00 2001
From: lm <mail@qgroundcontrol.org>
Date: Thu, 31 Mar 2011 21:50:08 +0200
Subject: [PATCH] Fixed opmapcontrol build issues

---
 src/ui/MainWindow.cc   | 9 ---------
 src/ui/QGCMapWidget.cc | 2 +-
 src/ui/QGCMapWidget.h  | 4 +++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index f49d36c4d..8d0368c9b 100644
--- a/src/ui/MainWindow.cc
+++ b/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()
diff --git a/src/ui/QGCMapWidget.cc b/src/ui/QGCMapWidget.cc
index 847de7108..5fff281ca 100644
--- a/src/ui/QGCMapWidget.cc
+++ b/src/ui/QGCMapWidget.cc
@@ -1,6 +1,6 @@
 #include "QGCMapWidget.h"
 
 QGCMapWidget::QGCMapWidget(QWidget *parent) :
-    OPMapWidget(parent)
+    mapcontrol::OPMapWidget(parent)
 {
 }
diff --git a/src/ui/QGCMapWidget.h b/src/ui/QGCMapWidget.h
index ee485c29d..799646e84 100644
--- a/src/ui/QGCMapWidget.h
+++ b/src/ui/QGCMapWidget.h
@@ -1,7 +1,9 @@
 #ifndef QGCMAPWIDGET_H
 #define QGCMAPWIDGET_H
 
-class QGCMapWidget : public OPMapWidget
+#include "opmapcontrol.h"
+
+class QGCMapWidget : public mapcontrol::OPMapWidget
 {
     Q_OBJECT
 public:
-- 
2.22.0