From 959e9101b2c247e3b6073cd36a9c6385d87e86cb Mon Sep 17 00:00:00 2001
From: pip <pip>
Date: Tue, 1 Feb 2011 23:08:05 +0000
Subject: [PATCH] moved #include from .h back into .cpp

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2682 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 .../openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp   | 2 +-
 ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h  | 6 ++----
 ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp
index ec18288e1..fa60d10f0 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp
@@ -25,7 +25,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 #include "opmapgadgetfactory.h"
-//#include "opmapgadgetwidget.h"
+#include "opmapgadgetwidget.h"
 #include "opmapgadget.h"
 #include "opmapgadgetconfiguration.h"
 #include "opmapgadgetoptionspage.h"
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h
index 7f3804a72..4caf96e84 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h
@@ -30,8 +30,6 @@
 
 #include <coreplugin/iuavgadgetfactory.h>
 
-#include "opmapgadgetwidget.h"
-
 namespace Core {
 	class IUAVGadget;
 	class IUAVGadgetFactory;
@@ -42,6 +40,7 @@ using namespace Core;
 class OPMapGadgetFactory : public Core::IUAVGadgetFactory
 {
     Q_OBJECT
+
 public:
     OPMapGadgetFactory(QObject *parent = 0);
     ~OPMapGadgetFactory();
@@ -49,7 +48,6 @@ public:
     Core::IUAVGadget *createGadget(QWidget *parent);
     IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings);
     IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config);
-
 };
 
-#endif // OPMAP_GADGETFACTORY_H_
+#endif
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
index 40e71b60c..522c64d1c 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -318,8 +318,8 @@ OPMapGadgetWidget::~OPMapGadgetWidget()
 	if (m_map)
 	{
 		disconnect(m_map, 0, 0, 0);
-		m_map->SetShowHome(false);
-		m_map->SetShowUAV(false);
+		m_map->SetShowHome(false);	// doing this appears to stop the map lib crashing on exit
+		m_map->SetShowUAV(false);	//   "          "
 	}