rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Re-commiting files due to commit clashes by 2 people at same time.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2684 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-02-01 23:22:16 +00:00 committed by pip
parent c1555d9dfe
commit 5756d17926
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetfactory.cpp
View File

@ -24,14 +24,15 @@
*/ */
#include "pipxtremegadgetfactory.h" #include "pipxtremegadgetfactory.h"
//#include "pipxtremegadgetwidget.h" #include "pipxtremegadgetwidget.h"
#include "pipxtremegadget.h" #include "pipxtremegadget.h"
#include "pipxtremegadgetconfiguration.h" #include "pipxtremegadgetconfiguration.h"
#include "pipxtremegadgetoptionspage.h" #include "pipxtremegadgetoptionspage.h"
#include <coreplugin/iuavgadget.h> #include <coreplugin/iuavgadget.h>
PipXtremeGadgetFactory::PipXtremeGadgetFactory(QObject *parent) : PipXtremeGadgetFactory::PipXtremeGadgetFactory(QObject *parent) :
IUAVGadgetFactory(QString("PipXtreme"), tr("PipXtreme Gadget"), parent) IUAVGadgetFactory(QString("PipXtreme"), tr("PipXtreme Gadget"), parent),
gadgetWidget(NULL)
{ {
} }
@ -41,7 +42,7 @@ PipXtremeGadgetFactory::~PipXtremeGadgetFactory()
Core::IUAVGadget* PipXtremeGadgetFactory::createGadget(QWidget *parent) Core::IUAVGadget* PipXtremeGadgetFactory::createGadget(QWidget *parent)
{ {
PipXtremeGadgetWidget *gadgetWidget = new PipXtremeGadgetWidget(parent); PipXtremeGadgetWidget *gadgetWidget = new PipXtremeGadgetWidget(parent);
return new PipXtremeGadget(QString("PipXtreme"), gadgetWidget, parent); return new PipXtremeGadget(QString("PipXtreme"), gadgetWidget, parent);
} }

4
ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetfactory.h
View File

@ -28,8 +28,6 @@
#include <coreplugin/iuavgadgetfactory.h> #include <coreplugin/iuavgadgetfactory.h>
#include "pipxtremegadgetwidget.h"
namespace Core { namespace Core {
class IUAVGadget; class IUAVGadget;
class IUAVGadgetFactory; class IUAVGadgetFactory;
@ -40,6 +38,7 @@ using namespace Core;
class PipXtremeGadgetFactory : public Core::IUAVGadgetFactory class PipXtremeGadgetFactory : public Core::IUAVGadgetFactory
{ {
Q_OBJECT Q_OBJECT
public: public:
PipXtremeGadgetFactory(QObject *parent = 0); PipXtremeGadgetFactory(QObject *parent = 0);
~PipXtremeGadgetFactory(); ~PipXtremeGadgetFactory();
@ -47,7 +46,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 #endif