git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@781 ebee16cc-31ac-478f-84a7-5cbb03baadba

ground/src/plugins/opmap/OPMapGadget.pluginspec

@@ -1,8 +1,8 @@
-<plugin name="Map2Gadget" version="1.0.0" compatVersion="1.0.0">
+<plugin name="OPMapGadget" version="1.0.0" compatVersion="1.0.0">
     <vendor>The OpenPilot Project</vendor>
     <copyright>(C) 2010 OpenPilot Project</copyright>
     <license>The GNU Public License (GPL) Version 3</license>
-    <description>A new map gadget!</description>
+    <description>OPMap gadget!</description>
     <url>http://www.openpilot.org</url>
     <dependencyList>
         <dependency name="Core" version="1.0.0"/>

ground/src/plugins/opmap/opmap.pro

@@ -1,11 +1,11 @@
 TEMPLATE = lib
-TARGET = Map2Gadget
+TARGET = OPMapGadget
 include(../../openpilotgcsplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../libs/opmapcontrol/opmapcontrol.pri)
 include(../../plugins/uavobjects/uavobjects.pri)
-HEADERS += map2plugin.h
-SOURCES += map2plugin.cpp
-OTHER_FILES += Map2Gadget.pluginspec
-FORMS += map2gadgetoptionspage.ui
-RESOURCES += map2.qrc
+HEADERS += opmapplugin.h
+SOURCES += opmapplugin.cpp
+OTHER_FILES += OPMapGadget.pluginspec
+FORMS += opmapgadgetoptionspage.ui
+RESOURCES += opmap.qrc

ground/src/plugins/opmap/opmapgadgetoptionspage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MapGadgetOptionsPage</class>
- <widget class="QWidget" name="MapGadgetOptionsPage">
+ <class>Map2GadgetOptionsPage</class>
+ <widget class="QWidget" name="Map2GadgetOptionsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

ground/src/plugins/opmap/opmapplugin.cpp

@@ -1,11 +1,11 @@
 /**
  ******************************************************************************
  *
- * @file       map2plugin.cpp
+ * @file       opmapplugin.cpp
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @brief
  * @see        The GNU Public License (GPL) Version 3
- * @defgroup   map2
+ * @defgroup   opmap
  * @{
  *
  *****************************************************************************/
@@ -24,40 +24,40 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "map2plugin.h"
-//#include "map2gadgetfactory.h"
+#include "opmapplugin.h"
+//#include "opmapgadgetfactory.h"
 #include <QtPlugin>
 #include <QStringList>
 #include <extensionsystem/pluginmanager.h>
 
-Map2Plugin::Map2Plugin()
+OPMapPlugin::OPMapPlugin()
 {
    // Do nothing
 }
 
-Map2Plugin::~Map2Plugin()
+OPMapPlugin::~OPMapPlugin()
 {
    // Do nothing
 }
 
-bool Map2Plugin::initialize(const QStringList& args, QString *errMsg)
+bool OPMapPlugin::initialize(const QStringList& args, QString *errMsg)
 {
    Q_UNUSED(args);
    Q_UNUSED(errMsg);
 
-//   mf = new Map2GadgetFactory(this);
+//   mf = new OPMapGadgetFactory(this);
 //   addAutoReleasedObject(mf);
 
    return true;
 }
 
-void Map2Plugin::extensionsInitialized()
+void OPMapPlugin::extensionsInitialized()
 {
    // Do nothing
 }
 
-void Map2Plugin::shutdown()
+void OPMapPlugin::shutdown()
 {
    // Do nothing
 }
-Q_EXPORT_PLUGIN(Map2Plugin)
+Q_EXPORT_PLUGIN(OPMapPlugin)

ground/src/plugins/opmap/opmapplugin.h

@@ -1,11 +1,11 @@
 /**
  ******************************************************************************
  *
- * @file       map2plugin.h
+ * @file       opmapplugin.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @brief
  * @see        The GNU Public License (GPL) Version 3
- * @defgroup   map2
+ * @defgroup   opmap
  * @{
  *
  *****************************************************************************/
@@ -25,23 +25,23 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef MAP2_PLUGIN_H_
-#define MAP2_PLUGIN_H_
+#ifndef OPMAP_PLUGIN_H_
+#define OPMAP_PLUGIN_H_
 
 #include <extensionsystem/iplugin.h>
 
-//class Map2GadgetFactory;
+//class OPMapGadgetFactory;
 
-class Map2Plugin : public ExtensionSystem::IPlugin
+class OPMapPlugin : public ExtensionSystem::IPlugin
 {
 public:
-    Map2Plugin();
-    ~Map2Plugin();
+    OPMapPlugin();
+    ~OPMapPlugin();
 
    void extensionsInitialized();
    bool initialize(const QStringList & arguments, QString * errorString);
    void shutdown();
 private:
-//   Map2GadgetFactory *mf;
+//   OPMapGadgetFactory *mf;
 };
-#endif /* MAP2_PLUGIN_H_ */
+#endif /* OPMAP_PLUGIN_H_ */

ground/src/plugins/plugins.pro

@@ -50,11 +50,11 @@ plugin_map.depends = plugin_coreplugin
 plugin_map.depends = plugin_uavobjects
 SUBDIRS += plugin_map
 
-# Map2 UAVGadget
-plugin_map2.subdir = map2
-plugin_map2.depends = plugin_coreplugin
-plugin_map2.depends = plugin_uavobjects
-SUBDIRS += plugin_map2
+# OPMap UAVGadget
+plugin_opmap.subdir = opmap
+plugin_opmap.depends = plugin_coreplugin
+plugin_opmap.depends = plugin_uavobjects
+SUBDIRS += plugin_opmap
 
 # Scope UAVGadget
 plugin_scope.subdir = scope