some renamings

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5828 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

13 files changed, 36 insertions, 39 deletions

diff --git a/src/custommainmenuitem.cpp b/src/custommainmenuitem.cpp
index 2afded8..fb93a49 100644
--- a/src/custommainmenuitem.cpp
+++ b/src/custommainmenuitem.cpp
@@ -27,17 +27,17 @@ CustomMainMenuItem::CustomMainMenuItem(cOsdItem* osdItem)
     _osdItem = osdItem;
 }
 
-bool CustomMainMenuItem::IsCustomMenuItem()
+bool CustomMainMenuItem::IsCustomOsdItem()
 {
     return true;
 }
 
-bool CustomMainMenuItem::IsPluginMenuItem()
+bool CustomMainMenuItem::IsPluginItem()
 {
     return false;
 }
 
-cOsdItem* CustomMainMenuItem::CustomMenuItem()
+cOsdItem* CustomMainMenuItem::CustomOsdItem()
 {
     return _osdItem; 
 }
diff --git a/src/custommainmenuitem.h b/src/custommainmenuitem.h
index 1d18c1e..7e6cd41 100644
--- a/src/custommainmenuitem.h
+++ b/src/custommainmenuitem.h
@@ -23,18 +23,18 @@
 #ifndef ___CUSTOMMAINMENUITEM_H
 #define ___CUSTOMMAINMENUITEM_H
 
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 
-class CustomMainMenuItem: public MenuOrgPatch::IMainMenuItem
+class CustomMainMenuItem: public IMenuItemDefinition
 {
     private:
         cOsdItem* _osdItem;
 
     public:
         CustomMainMenuItem(cOsdItem* osdItem);
-        virtual bool IsCustomMenuItem();
-        virtual bool IsPluginMenuItem();
-        virtual cOsdItem* CustomMenuItem();
+        virtual bool IsCustomOsdItem();
+        virtual bool IsPluginItem();
+        virtual cOsdItem* CustomOsdItem();
         virtual const char* PluginMenuEntry();
         virtual int PluginIndex();
 };
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index 4250fb3..fe14ddb 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -26,8 +26,6 @@
 #include "pluginmenuitem.h"
 #include <vdr/plugin.h>
 
-using namespace MenuOrgPatch;
-
 MainMenuItemsProvider::MainMenuItemsProvider(MenuNode* rootMenu)
 {
      _currentMenu = _rootMenu = rootMenu;
@@ -39,14 +37,14 @@ MainMenuItemsProvider::~MainMenuItemsProvider()
     delete _rootMenu;
 }
 
-MainMenuItemsList* MainMenuItemsProvider::MainMenuItems()
+MenuItemDefinitions* MainMenuItemsProvider::MainMenuItems()
 {
     ResetMainMenuItemsList();
 
     for (MenuNodeList::iterator i = _currentMenu->Childs().begin();
       i != _currentMenu->Childs().end(); i++)
     {
-        _currentMainMenuItems.push_back((*i)->CreateMainMenuItem());
+        _currentMainMenuItems.push_back((*i)->CreateMenuItemDefinition());
     }
 
     return &_currentMainMenuItems;
@@ -55,7 +53,7 @@ MainMenuItemsList* MainMenuItemsProvider::MainMenuItems()
 void MainMenuItemsProvider::ResetMainMenuItemsList()
 {
 
-    for( MainMenuItemsList::iterator i = _currentMainMenuItems.begin();
+    for( MenuItemDefinitions::iterator i = _currentMainMenuItems.begin();
       i != _currentMainMenuItems.end(); i++)
     {
        delete *i;
@@ -72,8 +70,8 @@ void MainMenuItemsProvider::EnterSubMenu(cOsdItem* item)
 {
     for(unsigned int itemIndex=0; itemIndex < _currentMainMenuItems.size(); itemIndex++)
     {
-        IMainMenuItem* menuItem = _currentMainMenuItems.at(itemIndex);
-        if (menuItem->IsCustomMenuItem() && (menuItem->CustomMenuItem() == item))
+        IMenuItemDefinition* menuItem = _currentMainMenuItems.at(itemIndex);
+        if (menuItem->IsCustomOsdItem() && (menuItem->CustomOsdItem() == item))
         {
             _currentMenu = _currentMenu->Childs().at(itemIndex);
             break;
diff --git a/src/mainmenuitemsprovider.h b/src/mainmenuitemsprovider.h
index e6e1837..0c6b254 100644
--- a/src/mainmenuitemsprovider.h
+++ b/src/mainmenuitemsprovider.h
@@ -23,21 +23,21 @@
 #ifndef ___MAINMENUITEMSPROVIDER_H
 #define ___MAINMENUITEMSPROVIDER_H
 
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 
 class MenuNode;
 
-class MainMenuItemsProvider: public MenuOrgPatch::IMainMenuItemsProvider
+class MainMenuItemsProvider: public IMainMenuItemsProvider
 {
     private:
         MenuNode* _rootMenu;
         MenuNode* _currentMenu;
-        MenuOrgPatch::MainMenuItemsList _currentMainMenuItems;
+        MenuItemDefinitions _currentMainMenuItems;
 
     public:
         MainMenuItemsProvider(MenuNode* rootMenu);
         ~MainMenuItemsProvider();
-        virtual MenuOrgPatch::MainMenuItemsList* MainMenuItems();
+        virtual MenuItemDefinitions* MainMenuItems();
         virtual void EnterRootMenu();
         virtual void EnterSubMenu(cOsdItem* item);
         virtual bool LeaveSubMenu();
diff --git a/src/menunode.cpp b/src/menunode.cpp
index e813c1c..0552484 100644
--- a/src/menunode.cpp
+++ b/src/menunode.cpp
@@ -58,7 +58,7 @@ void MenuNode::SetParent(MenuNode* parent)
     _parent = parent;
 }
 
-MenuOrgPatch::IMainMenuItem* MenuNode::CreateMainMenuItem()
+IMenuItemDefinition* MenuNode::CreateMenuItemDefinition()
 {
     return NULL;
 }
diff --git a/src/menunode.h b/src/menunode.h
index d8e9eef..59c2e33 100644
--- a/src/menunode.h
+++ b/src/menunode.h
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-namespace MenuOrgPatch { class IMainMenuItem; }
+class IMenuItemDefinition;
 class MenuNode;
 
 typedef std::vector<MenuNode*> MenuNodeList;
@@ -45,7 +45,7 @@ class MenuNode
         MenuNode* Parent();
         MenuNodeList& Childs();
         MenuNode* AddChild(MenuNode* child);
-        virtual MenuOrgPatch::IMainMenuItem* CreateMainMenuItem();
+        virtual IMenuItemDefinition* CreateMenuItemDefinition();
 };
 
 #endif
diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 257aeb0..0805bcd 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -23,7 +23,7 @@
 #include <vdr/plugin.h>
 #include <vdr/config.h>
 #include <vdr/tools.h>
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 #include <vector>
 #include <iostream>
 #include <string>
@@ -35,7 +35,6 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace MenuOrgPatch;
 
 MenuOrgPlugin::MenuOrgPlugin(void)
 {
@@ -142,7 +141,7 @@ bool MenuOrgPlugin::SetupParse(const char *Name, const char *Value)
 
 bool MenuOrgPlugin::Service(const char *Id, void *Data)
 {
-    if (strcmp(Id, "MenuOrgPatch-v0.1::MainMenuItemsProvider") == 0) 
+    if (strcmp(Id, MENU_ITEMS_PROVIDER_SERVICE_ID) == 0) 
     {
         if (_subMenuProvider)
         {
diff --git a/src/pluginmainmenuitem.cpp b/src/pluginmainmenuitem.cpp
index 6a47418..8101aa1 100644
--- a/src/pluginmainmenuitem.cpp
+++ b/src/pluginmainmenuitem.cpp
@@ -28,17 +28,17 @@ PluginMainMenuItem::PluginMainMenuItem(const char* mainMenuEntry, int pluginInde
     _pluginIndex = pluginIndex; 
 }
 
-bool PluginMainMenuItem::IsCustomMenuItem()
+bool PluginMainMenuItem::IsCustomOsdItem()
 {
     return false;
 }
 
-bool PluginMainMenuItem::IsPluginMenuItem()
+bool PluginMainMenuItem::IsPluginItem()
 {
     return true;
 }
 
-cOsdItem* PluginMainMenuItem::CustomMenuItem()
+cOsdItem* PluginMainMenuItem::CustomOsdItem()
 {
     return NULL;
 }
diff --git a/src/pluginmainmenuitem.h b/src/pluginmainmenuitem.h
index 287ba0c..df1427f 100644
--- a/src/pluginmainmenuitem.h
+++ b/src/pluginmainmenuitem.h
@@ -23,9 +23,9 @@
 #ifndef ___PLUGINMAINMENUITEM_H
 #define ___PLUGINMAINMENUITEM_H
 
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 
-class PluginMainMenuItem: public MenuOrgPatch::IMainMenuItem
+class PluginMainMenuItem: public IMenuItemDefinition
 {
     private:
         const char* _mainMenuEntry;
@@ -33,9 +33,9 @@ class PluginMainMenuItem: public MenuOrgPatch::IMainMenuItem
 
     public:
         PluginMainMenuItem(const char* mainMenuEntry, int pluginIndex);
-        virtual bool IsCustomMenuItem();
-        virtual bool IsPluginMenuItem();
-        virtual cOsdItem* CustomMenuItem();
+        virtual bool IsCustomOsdItem();
+        virtual bool IsPluginItem();
+        virtual cOsdItem* CustomOsdItem();
         virtual const char* PluginMenuEntry();
         virtual int PluginIndex();
 };
diff --git a/src/pluginmenuitem.cpp b/src/pluginmenuitem.cpp
index 36bbfa6..1149c38 100644
--- a/src/pluginmenuitem.cpp
+++ b/src/pluginmenuitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "pluginmenuitem.h"
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 #include "pluginmainmenuitem.h"
 
 PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex)
@@ -30,7 +30,7 @@ PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex)
     _pluginIndex = pluginIndex;
 }
 
-MenuOrgPatch::IMainMenuItem* PluginMenuItem::CreateMainMenuItem()
+IMenuItemDefinition* PluginMenuItem::CreateMenuItemDefinition()
 {
     return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex);
 }
diff --git a/src/pluginmenuitem.h b/src/pluginmenuitem.h
index 87f38d4..05bb298 100644
--- a/src/pluginmenuitem.h
+++ b/src/pluginmenuitem.h
@@ -33,7 +33,7 @@ class PluginMenuItem: public MenuNode
 
     public:
         PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex);
-        MenuOrgPatch::IMainMenuItem* CreateMainMenuItem();
+        IMenuItemDefinition* CreateMenuItemDefinition();
 };
 
 #endif
diff --git a/src/systemmenuitem.cpp b/src/systemmenuitem.cpp
index b62beef..30257ee 100644
--- a/src/systemmenuitem.cpp
+++ b/src/systemmenuitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "systemmenuitem.h"
-#include <vdr/menuorgpatch.h>
+#include <vdr/mainmenuitemsprovider.h>
 #include "custommainmenuitem.h"
 
 SystemMenuItem::SystemMenuItem(std::string itemText, eOSState itemState)
@@ -30,7 +30,7 @@ SystemMenuItem::SystemMenuItem(std::string itemText, eOSState itemState)
     _itemState = itemState;
 }
 
-MenuOrgPatch::IMainMenuItem* SystemMenuItem::CreateMainMenuItem()
+IMenuItemDefinition* SystemMenuItem::CreateMenuItemDefinition()
 {
     if(_itemState != osUser1)
         return new CustomMainMenuItem(new cOsdItem(tr(_itemText.c_str()), _itemState));
diff --git a/src/systemmenuitem.h b/src/systemmenuitem.h
index 19ded04..4c7c1f7 100644
--- a/src/systemmenuitem.h
+++ b/src/systemmenuitem.h
@@ -35,7 +35,7 @@ class SystemMenuItem: public MenuNode
 
     public:
         SystemMenuItem(std::string itemText, eOSState itemState);
-        MenuOrgPatch::IMainMenuItem* CreateMainMenuItem();
+        IMenuItemDefinition* CreateMenuItemDefinition();
 };
 
 #endif