mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-19 09:54:15 +01:00
moved #include from .h back into .cpp
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2682 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
9170155f5f
commit
959e9101b2
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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); // " "
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user