some renamings

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

1 files changed, 5 insertions, 7 deletions

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;