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

Merge branch 'next' into corvuscorax/onboardlogging

Browse Source
This commit is contained in:
Corvus Corax 2013-11-16 18:22:01 +01:00
commit f25926d4bc
39 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
View File

@ -33,7 +33,6 @@
namespace Core {
namespace Internal {
class MainWindow;
class CorePlugin : public ExtensionSystem::IPlugin {
@ -54,7 +53,6 @@ public slots:
private:
MainWindow *m_mainWindow;
};
} // namespace Internal
} // namespace Core

4
ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
View File

@ -293,9 +293,7 @@ loggingThread(NULL),
logConnection(new LoggingConnection(this)),
mf(NULL),
cmd(NULL)
{
}
{}
LoggingPlugin::~LoggingPlugin()
{

3
ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
View File

@ -32,11 +32,9 @@
#include <extensionsystem/iplugin.h>
namespace Welcome {
class WelcomeMode;
namespace Internal {
class WelcomePlugin
: public ExtensionSystem::IPlugin {
Q_OBJECT
@ -53,7 +51,6 @@ public:
private:
WelcomeMode *m_welcomeMode;
};
} // namespace Welcome
} // namespace Internal