diff options
| -rw-r--r-- | sources.mk | 2 | ||||
| -rw-r--r-- | src/mainmenuitemsprovider.cpp | 2 | ||||
| -rw-r--r-- | src/submenuitem.cpp | 4 | ||||
| -rw-r--r-- | src/submenuitem.h | 6 | ||||
| -rw-r--r-- | src/systemmenuitem.cpp (renamed from src/vdrmenuitem.cpp) | 6 | ||||
| -rw-r--r-- | src/systemmenuitem.h (renamed from src/vdrmenuitem.h) | 8 | ||||
| -rw-r--r-- | src/xmlmenu.cpp | 4 |
7 files changed, 16 insertions, 16 deletions
@@ -7,6 +7,6 @@ SRCS = \ src/pluginmainmenuitem.cpp \ src/pluginmenuitem.cpp \ src/submenuitem.cpp \ - src/vdrmenuitem.cpp \ + src/systemmenuitem.cpp \ src/xmlmenu.cpp \ src/i18n.cpp diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp index e408712..5895dd0 100644 --- a/src/mainmenuitemsprovider.cpp +++ b/src/mainmenuitemsprovider.cpp @@ -22,7 +22,7 @@ #include "mainmenuitemsprovider.h" #include "submenuitem.h" -#include "vdrmenuitem.h" +#include "systemmenuitem.h" #include "pluginmenuitem.h" #include <vdr/plugin.h> diff --git a/src/submenuitem.cpp b/src/submenuitem.cpp index cd01591..0785018 100644 --- a/src/submenuitem.cpp +++ b/src/submenuitem.cpp @@ -16,13 +16,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id:$ + * $Id$ * */ #include "submenuitem.h" SubMenuItem::SubMenuItem(std::string itemText) - :VdrMenuItem(itemText, osUser1) + :SystemMenuItem(itemText, osUser1) { } diff --git a/src/submenuitem.h b/src/submenuitem.h index e380c74..2101dc6 100644 --- a/src/submenuitem.h +++ b/src/submenuitem.h @@ -16,17 +16,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id:$ + * $Id$ * */ #ifndef ___SUBMENUITEM_H #define ___SUBMENUITEM_H -#include "vdrmenuitem.h" +#include "systemmenuitem.h" #include <string> -class SubMenuItem: public VdrMenuItem +class SubMenuItem: public SystemMenuItem { public: SubMenuItem(std::string itemText); diff --git a/src/vdrmenuitem.cpp b/src/systemmenuitem.cpp index 758b73f..b62beef 100644 --- a/src/vdrmenuitem.cpp +++ b/src/systemmenuitem.cpp @@ -20,17 +20,17 @@ * */ -#include "vdrmenuitem.h" +#include "systemmenuitem.h" #include <vdr/menuorgpatch.h> #include "custommainmenuitem.h" -VdrMenuItem::VdrMenuItem(std::string itemText, eOSState itemState) +SystemMenuItem::SystemMenuItem(std::string itemText, eOSState itemState) { _itemText = itemText; _itemState = itemState; } -MenuOrgPatch::IMainMenuItem* VdrMenuItem::CreateMainMenuItem() +MenuOrgPatch::IMainMenuItem* SystemMenuItem::CreateMainMenuItem() { if(_itemState != osUser1) return new CustomMainMenuItem(new cOsdItem(tr(_itemText.c_str()), _itemState)); diff --git a/src/vdrmenuitem.h b/src/systemmenuitem.h index 8582e7c..d7970c6 100644 --- a/src/vdrmenuitem.h +++ b/src/systemmenuitem.h @@ -20,22 +20,22 @@ * */ -#ifndef ___VDRMENUITEM_H -#define ___VDRMENUITEM_H +#ifndef ___SYSTEMMENUITEM_H +#define ___SYSTEMMENUITEM_H #include "menunode.h" #include <vdr/osdbase.h> #include <vdr/menuorgpatch.h> #include <string> -class VdrMenuItem: public MenuNode +class SystemMenuItem: public MenuNode { private: std::string _itemText; eOSState _itemState; public: - VdrMenuItem(std::string itemText, eOSState itemState); + SystemMenuItem(std::string itemText, eOSState itemState); MenuOrgPatch::IMainMenuItem* CreateMainMenuItem(); }; diff --git a/src/xmlmenu.cpp b/src/xmlmenu.cpp index 04a8f8f..b050dbd 100644 --- a/src/xmlmenu.cpp +++ b/src/xmlmenu.cpp @@ -24,7 +24,7 @@ #include <libxml++/libxml++.h> #include <exception> #include <vdr/plugin.h> -#include "vdrmenuitem.h" +#include "systemmenuitem.h" #include "submenuitem.h" #include "pluginmenuitem.h" @@ -113,7 +113,7 @@ MenuNode* XmlMenu::AddSubMenuItem(string name, MenuNode* menu) void XmlMenu::AddSystemMenuItem(string name, MenuNode* menu) { - menu->AddChild(new VdrMenuItem(name, MenuTextToVdrState(name))); + menu->AddChild(new SystemMenuItem(name, MenuTextToVdrState(name))); } void XmlMenu::AddPluginMenuItem(string pluginName, MenuNode* menu) |