From b6492fc96fed80bfa745fffa46a6965a7ab3e292 Mon Sep 17 00:00:00 2001
From: pip <pip>
Date: Wed, 16 Jun 2010 07:40:53 +0000
Subject: [PATCH] Removing Ambiguity between current map plug-in and the newer
 upcoming map plug-in

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@780 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/map/mapgadgetwidget.cpp | 8 ++++----
 ground/src/plugins/map/mapgadgetwidget.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ground/src/plugins/map/mapgadgetwidget.cpp b/ground/src/plugins/map/mapgadgetwidget.cpp
index cc46fe3fb..6be82a8e8 100644
--- a/ground/src/plugins/map/mapgadgetwidget.cpp
+++ b/ground/src/plugins/map/mapgadgetwidget.cpp
@@ -57,7 +57,7 @@ MapGadgetWidget::MapGadgetWidget(QWidget *parent) : QWidget(parent)
     UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
     m_positionActual = PositionActual::GetInstance(objManager);
 
-    m_mc = new MapControl(QSize(size, size));
+    m_mc = new qmapcontrol::MapControl(QSize(size, size));
 
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
@@ -102,15 +102,15 @@ MapGadgetWidget::MapGadgetWidget(QWidget *parent) : QWidget(parent)
 
     heading = data.Heading;
 
-    addCompass(QPointF(100, 100), 200);
+//    addCompass(QPointF(100, 100), 200);
 
     // create and add the GCS icon
-    gcsPoint = new ImagePoint(data.Longitude, data.Latitude, &gcs_pixmap, "GSC", Point::Middle);
+    gcsPoint = new ImagePoint(data.Longitude, data.Latitude, &gcs_pixmap, "GSC", qmapcontrol::Point::Middle);
     m_positionLayer->addGeometry(gcsPoint);
     connect(gcsPoint, SIGNAL(geometryClicked(Geometry*, QPoint)), this, SLOT(gcs_uav_ClickEvent(Geometry*, QPoint)));
 
     // create and add the UAV icon
-    uavPoint = new ImagePoint(data.Longitude, data.Latitude, &uav_pixmap, "UAV", Point::Middle);
+    uavPoint = new ImagePoint(data.Longitude, data.Latitude, &uav_pixmap, "UAV", qmapcontrol::Point::Middle);
     m_positionLayer->addGeometry(uavPoint);
     connect(uavPoint, SIGNAL(geometryClicked(Geometry*, QPoint)), this, SLOT(gcs_uav_ClickEvent(Geometry*, QPoint)));
 
diff --git a/ground/src/plugins/map/mapgadgetwidget.h b/ground/src/plugins/map/mapgadgetwidget.h
index a156e3ae6..20ccf5e5b 100644
--- a/ground/src/plugins/map/mapgadgetwidget.h
+++ b/ground/src/plugins/map/mapgadgetwidget.h
@@ -70,7 +70,7 @@ private:
 
     double heading;	// compass/uav heading
 
-   MapControl *m_mc;
+   qmapcontrol::MapControl *m_mc;
 
    MapAdapter *m_osmAdapter;
    MapAdapter *m_googleAdapter;