mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
Modified UAVTalk and UAVObjects plugins to load correctly into GCS.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@285 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
f4be482433
commit
8330fd811f
@ -19,14 +19,14 @@ plugin_welcome.subdir = welcome
|
||||
plugin_welcome.depends = plugin_coreplugin
|
||||
|
||||
# UAVObjects plug-in
|
||||
#SUBDIRS += plugin_uavobjects
|
||||
#plugin_uavobjects.subdir = uavobjects
|
||||
#plugin_uavobjects.depends = plugin_coreplugin
|
||||
SUBDIRS += plugin_uavobjects
|
||||
plugin_uavobjects.subdir = uavobjects
|
||||
plugin_uavobjects.depends = plugin_coreplugin
|
||||
|
||||
# UAVTalk plug-in
|
||||
#SUBDIRS += plugin_uavtalk
|
||||
#plugin_uavtalk.subdir = uavtalk
|
||||
#plugin_uavtalk.depends = plugin_uavobjects
|
||||
#plugin_uavtalk.depends += plugin_coreplugin
|
||||
SUBDIRS += plugin_uavtalk
|
||||
plugin_uavtalk.subdir = uavtalk
|
||||
plugin_uavtalk.depends = plugin_uavobjects
|
||||
plugin_uavtalk.depends += plugin_coreplugin
|
||||
|
||||
|
||||
|
@ -25,38 +25,40 @@
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include "uavobjectsplugin.h"
|
||||
#include "uavobjectsinit.h"
|
||||
|
||||
UAVObjectsPlugin::UAVObjectsPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
UAVObjectsPlugin::~UAVObjectsPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void UAVObjectsPlugin::extensionsInitialized()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
bool UAVObjectsPlugin::initialize(const QStringList & arguments, QString * errorString)
|
||||
{
|
||||
// Create object manager and expose object
|
||||
UAVObjectManager* objMngr = new UAVObjectManager();
|
||||
addObject(objMngr);
|
||||
// Initialize UAVObjects
|
||||
UAVObjectsInitialize(objMngr);
|
||||
// Done
|
||||
Q_UNUSED(arguments);
|
||||
Q_UNUSED(errorString);
|
||||
return true;
|
||||
}
|
||||
|
||||
void UAVObjectsPlugin::shutdown()
|
||||
{
|
||||
|
||||
}
|
||||
#include "uavobjectsplugin.h"
|
||||
#include "uavobjectsinit.h"
|
||||
|
||||
UAVObjectsPlugin::UAVObjectsPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
UAVObjectsPlugin::~UAVObjectsPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void UAVObjectsPlugin::extensionsInitialized()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
bool UAVObjectsPlugin::initialize(const QStringList & arguments, QString * errorString)
|
||||
{
|
||||
// Create object manager and expose object
|
||||
UAVObjectManager* objMngr = new UAVObjectManager();
|
||||
addObject(objMngr);
|
||||
// Initialize UAVObjects
|
||||
UAVObjectsInitialize(objMngr);
|
||||
// Done
|
||||
Q_UNUSED(arguments);
|
||||
Q_UNUSED(errorString);
|
||||
return true;
|
||||
}
|
||||
|
||||
void UAVObjectsPlugin::shutdown()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(UAVObjectsPlugin)
|
||||
|
@ -25,22 +25,25 @@
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#ifndef UAVOBJECTSPLUGIN_H
|
||||
#define UAVOBJECTSPLUGIN_H
|
||||
|
||||
#include <extensionsystem/iplugin.h>
|
||||
#include <QtPlugin>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
class UAVObjectsPlugin: public ExtensionSystem::IPlugin
|
||||
{
|
||||
public:
|
||||
UAVObjectsPlugin();
|
||||
~UAVObjectsPlugin();
|
||||
|
||||
void extensionsInitialized();
|
||||
bool initialize(const QStringList & arguments, QString * errorString);
|
||||
void shutdown();
|
||||
};
|
||||
|
||||
#endif // UAVOBJECTSPLUGIN_H
|
||||
#ifndef UAVOBJECTSPLUGIN_H
|
||||
#define UAVOBJECTSPLUGIN_H
|
||||
|
||||
#include <extensionsystem/iplugin.h>
|
||||
#include <QtPlugin>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
class UAVObjectsPlugin:
|
||||
public ExtensionSystem::IPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
UAVObjectsPlugin();
|
||||
~UAVObjectsPlugin();
|
||||
|
||||
void extensionsInitialized();
|
||||
bool initialize(const QStringList & arguments, QString * errorString);
|
||||
void shutdown();
|
||||
};
|
||||
|
||||
#endif // UAVOBJECTSPLUGIN_H
|
||||
|
@ -25,8 +25,35 @@
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include "uavtalkplugin.h"
|
||||
|
||||
UAVTalkPlugin::UAVTalkPlugin()
|
||||
{
|
||||
}
|
||||
|
||||
#include "uavtalkplugin.h"
|
||||
|
||||
UAVTalkPlugin::UAVTalkPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
UAVTalkPlugin::~UAVTalkPlugin()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void UAVTalkPlugin::extensionsInitialized()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
bool UAVTalkPlugin::initialize(const QStringList & arguments, QString * errorString)
|
||||
{
|
||||
Q_UNUSED(arguments);
|
||||
Q_UNUSED(errorString);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void UAVTalkPlugin::shutdown()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(UAVTalkPlugin)
|
||||
|
@ -25,13 +25,25 @@
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#ifndef UAVTALKPLUGIN_H
|
||||
#define UAVTALKPLUGIN_H
|
||||
|
||||
class UAVTalkPlugin
|
||||
{
|
||||
public:
|
||||
UAVTalkPlugin();
|
||||
};
|
||||
|
||||
#endif // UAVTALKPLUGIN_H
|
||||
#ifndef UAVTALKPLUGIN_H
|
||||
#define UAVTALKPLUGIN_H
|
||||
|
||||
|
||||
#include <extensionsystem/iplugin.h>
|
||||
#include <QtPlugin>
|
||||
|
||||
class UAVTalkPlugin:
|
||||
public ExtensionSystem::IPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
UAVTalkPlugin();
|
||||
~UAVTalkPlugin();
|
||||
|
||||
void extensionsInitialized();
|
||||
bool initialize(const QStringList & arguments, QString * errorString);
|
||||
void shutdown();
|
||||
};
|
||||
|
||||
#endif // UAVTALKPLUGIN_H
|
||||
|
Loading…
Reference in New Issue
Block a user