From 33f53d29adf5bebfdfba867b9bed0810a2448fe9 Mon Sep 17 00:00:00 2001 From: svntobi Date: Sun, 19 Aug 2007 19:41:04 +0000 Subject: PluginMenuItem -> PluginMenuNode git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5830 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/mainmenuitemsprovider.cpp | 2 +- src/menuconfiguration.cpp | 8 ++++---- src/menuconfiguration.h | 2 +- src/pluginmenuitem.cpp | 36 ------------------------------------ src/pluginmenuitem.h | 39 --------------------------------------- src/pluginmenunode.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/pluginmenunode.h | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 src/pluginmenuitem.cpp delete mode 100644 src/pluginmenuitem.h create mode 100644 src/pluginmenunode.cpp create mode 100644 src/pluginmenunode.h (limited to 'src') 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 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 #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/pluginmenuitem.cpp deleted file mode 100644 index 1149c38..0000000 --- a/src/pluginmenuitem.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#include "pluginmenuitem.h" -#include -#include "pluginmainmenuitem.h" - -PluginMenuItem::PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex) -{ - _pluginMainMenuEntry = pluginMainMenuEntry; - _pluginIndex = pluginIndex; -} - -IMenuItemDefinition* PluginMenuItem::CreateMenuItemDefinition() -{ - return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex); -} diff --git a/src/pluginmenuitem.h b/src/pluginmenuitem.h deleted file mode 100644 index 05bb298..0000000 --- a/src/pluginmenuitem.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#ifndef ___PLUGINMENUITEM_H -#define ___PLUGINMENUITEM_H - -#include "menunode.h" - -class PluginMenuItem: public MenuNode -{ - private: - const char* _pluginMainMenuEntry; - int _pluginIndex; - - public: - PluginMenuItem(const char* pluginMainMenuEntry, int pluginIndex); - IMenuItemDefinition* CreateMenuItemDefinition(); -}; - -#endif diff --git a/src/pluginmenunode.cpp b/src/pluginmenunode.cpp new file mode 100644 index 0000000..1d966c9 --- /dev/null +++ b/src/pluginmenunode.cpp @@ -0,0 +1,36 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#include "pluginmenunode.h" +#include +#include "pluginmainmenuitem.h" + +PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex) +{ + _pluginMainMenuEntry = pluginMainMenuEntry; + _pluginIndex = pluginIndex; +} + +IMenuItemDefinition* PluginMenuNode::CreateMenuItemDefinition() +{ + return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex); +} diff --git a/src/pluginmenunode.h b/src/pluginmenunode.h new file mode 100644 index 0000000..cf55e66 --- /dev/null +++ b/src/pluginmenunode.h @@ -0,0 +1,39 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#ifndef ___PLUGINMENUNODE_H +#define ___PLUGINMENUNODE_H + +#include "menunode.h" + +class PluginMenuNode: public MenuNode +{ + private: + const char* _pluginMainMenuEntry; + int _pluginIndex; + + public: + PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex); + IMenuItemDefinition* CreateMenuItemDefinition(); +}; + +#endif -- cgit v1.2.3