rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

moved #include from .h back into .cpp

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2682 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-02-01 23:08:05 +00:00 committed by pip
parent 9170155f5f
commit 959e9101b2
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.cpp
View File

@ -25,7 +25,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "opmapgadgetfactory.h" #include "opmapgadgetfactory.h"
//#include "opmapgadgetwidget.h" #include "opmapgadgetwidget.h"
#include "opmapgadget.h" #include "opmapgadget.h"
#include "opmapgadgetconfiguration.h" #include "opmapgadgetconfiguration.h"
#include "opmapgadgetoptionspage.h" #include "opmapgadgetoptionspage.h"

6
ground/openpilotgcs/src/plugins/opmap/opmapgadgetfactory.h
View File

@ -30,8 +30,6 @@
#include <coreplugin/iuavgadgetfactory.h> #include <coreplugin/iuavgadgetfactory.h>
#include "opmapgadgetwidget.h"
namespace Core { namespace Core {
class IUAVGadget; class IUAVGadget;
class IUAVGadgetFactory; class IUAVGadgetFactory;
@ -42,6 +40,7 @@ using namespace Core;
class OPMapGadgetFactory : public Core::IUAVGadgetFactory class OPMapGadgetFactory : public Core::IUAVGadgetFactory
{ {
Q_OBJECT Q_OBJECT
public: public:
OPMapGadgetFactory(QObject *parent = 0); OPMapGadgetFactory(QObject *parent = 0);
~OPMapGadgetFactory(); ~OPMapGadgetFactory();
@ -49,7 +48,6 @@ public:
Core::IUAVGadget *createGadget(QWidget *parent); Core::IUAVGadget *createGadget(QWidget *parent);
IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings); IUAVGadgetConfiguration *createConfiguration(QSettings* qSettings);
IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config); IOptionsPage *createOptionsPage(IUAVGadgetConfiguration *config);
}; };
#endif // OPMAP_GADGETFACTORY_H_ #endif

4
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -318,8 +318,8 @@ OPMapGadgetWidget::~OPMapGadgetWidget()
if (m_map) if (m_map)
{ {
disconnect(m_map, 0, 0, 0); disconnect(m_map, 0, 0, 0);
m_map->SetShowHome(false); m_map->SetShowHome(false); // doing this appears to stop the map lib crashing on exit
m_map->SetShowUAV(false); m_map->SetShowUAV(false); // " "
} }