diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mainmenuitemsprovider.cpp | 2 | ||||
-rw-r--r-- | src/menuconfiguration.cpp | 8 | ||||
-rw-r--r-- | src/menuconfiguration.h | 2 | ||||
-rw-r--r-- | src/pluginmenunode.cpp (renamed from src/pluginmenuitem.cpp) | 6 | ||||
-rw-r--r-- | src/pluginmenunode.h (renamed from src/pluginmenuitem.h) | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp index b091c59..a5b5f5c 100644 --- a/src/mainmenuitemsprovider.cpp +++ b/src/mainmenuitemsprovider.cpp @@ -23,7 +23,7 @@ #include "mainmenuitemsprovider.h" #include "submenuitem.h" #include "systemmenunode.h" -#include "pluginmenuitem.h" +#include "pluginmenunode.h" #include <vdr/plugin.h> MainMenuItemsProvider::MainMenuItemsProvider(MenuNode* rootMenu) diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp index 87fb1f1..81a81b1 100644 --- a/src/menuconfiguration.cpp +++ b/src/menuconfiguration.cpp @@ -26,7 +26,7 @@ #include <vdr/plugin.h> #include "systemmenunode.h" #include "submenuitem.h" -#include "pluginmenuitem.h" +#include "pluginmenunode.h" using namespace xmlpp; using namespace std; @@ -99,7 +99,7 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode) } else if (type == "plugin") { - AddPluginMenuItem(name, menuNode); + AddPluginMenuNode(name, menuNode); } } } @@ -116,14 +116,14 @@ void MenuConfiguration::AddSystemMenuNode(string name, MenuNode* menu) menu->AddChild(new SystemMenuNode(name, MenuTextToVdrState(name))); } -void MenuConfiguration::AddPluginMenuItem(string pluginName, MenuNode* menu) +void MenuConfiguration::AddPluginMenuNode(string pluginName, MenuNode* menu) { const char* pluginMainMenuEntry; int pluginIndex; if (FindPluginByName(pluginName, &pluginMainMenuEntry, pluginIndex)) { - menu->AddChild(new PluginMenuItem(pluginMainMenuEntry, pluginIndex)); + menu->AddChild(new PluginMenuNode(pluginMainMenuEntry, pluginIndex)); } } diff --git a/src/menuconfiguration.h b/src/menuconfiguration.h index fbf462a..fafbfa9 100644 --- a/src/menuconfiguration.h +++ b/src/menuconfiguration.h @@ -43,7 +43,7 @@ class MenuConfiguration bool FindPluginByName(std::string name, const char** mainMenuEntry, int& pluginIndex); MenuNode* AddSubMenuItem(std::string name, MenuNode* menu); void AddSystemMenuNode(std::string name, MenuNode* menu); - void AddPluginMenuItem(std::string pluginName, MenuNode* menu); + void AddPluginMenuNode(std::string pluginName, MenuNode* menu); }; #endif diff --git a/src/pluginmenuitem.cpp b/src/pluginmenunode.cpp index 1149c38..1d966c9 100644 --- a/src/pluginmenuitem.cpp +++ b/src/pluginmenunode.cpp @@ -20,17 +20,17 @@ * */ -#include "pluginmenuitem.h" +#include "pluginmenunode.h" #include <vdr/mainmenuitemsprovider.h> #include "pluginmainmenuitem.h" -PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex) +PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex) { _pluginMainMenuEntry = pluginMainMenuEntry; _pluginIndex = pluginIndex; } -IMenuItemDefinition* PluginMenuItem::CreateMenuItemDefinition() +IMenuItemDefinition* PluginMenuNode::CreateMenuItemDefinition() { return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex); } diff --git a/src/pluginmenuitem.h b/src/pluginmenunode.h index 05bb298..cf55e66 100644 --- a/src/pluginmenuitem.h +++ b/src/pluginmenunode.h @@ -20,19 +20,19 @@ * */ -#ifndef ___PLUGINMENUITEM_H -#define ___PLUGINMENUITEM_H +#ifndef ___PLUGINMENUNODE_H +#define ___PLUGINMENUNODE_H #include "menunode.h" -class PluginMenuItem: public MenuNode +class PluginMenuNode: public MenuNode { private: const char* _pluginMainMenuEntry; int _pluginIndex; public: - PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex); + PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex); IMenuItemDefinition* CreateMenuItemDefinition(); }; |