SystemMenuItem -> SystemMenuNode

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

8 files changed, 24 insertions, 24 deletions

diff --git a/sources.mk b/sources.mk
index ec9d291..a8b7e76 100644
--- a/sources.mk
+++ b/sources.mk
@@ -8,5 +8,5 @@ SRCS = \
   src/pluginmainmenuitem.cpp \
   src/pluginmenuitem.cpp \
   src/submenuitem.cpp \
-  src/systemmenuitem.cpp \
+  src/systemmenunode.cpp \
   src/i18n.cpp
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index fe14ddb..b091c59 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -22,7 +22,7 @@
 
 #include "mainmenuitemsprovider.h"
 #include "submenuitem.h"
-#include "systemmenuitem.h"
+#include "systemmenunode.h"
 #include "pluginmenuitem.h"
 #include <vdr/plugin.h>
 
diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index 0c0d7b4..87fb1f1 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -24,7 +24,7 @@
 #include <libxml++/libxml++.h>
 #include <exception>
 #include <vdr/plugin.h>
-#include "systemmenuitem.h"
+#include "systemmenunode.h"
 #include "submenuitem.h"
 #include "pluginmenuitem.h"
 
@@ -95,7 +95,7 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode)
                 }
                 else if (type == "system")
                 {
-                    AddSystemMenuItem(name, menuNode);
+                    AddSystemMenuNode(name, menuNode);
                 }
                 else if (type == "plugin")
                 {
@@ -111,9 +111,9 @@ MenuNode* MenuConfiguration::AddSubMenuItem(string name, MenuNode* menu)
     return menu->AddChild(new SubMenuItem(name));
 }
 
-void MenuConfiguration::AddSystemMenuItem(string name, MenuNode* menu)
+void MenuConfiguration::AddSystemMenuNode(string name, MenuNode* menu)
 {
-    menu->AddChild(new SystemMenuItem(name, MenuTextToVdrState(name)));
+    menu->AddChild(new SystemMenuNode(name, MenuTextToVdrState(name)));
 }
 
 void MenuConfiguration::AddPluginMenuItem(string pluginName, MenuNode* menu)
diff --git a/src/menuconfiguration.h b/src/menuconfiguration.h
index 933ea0f..fbf462a 100644
--- a/src/menuconfiguration.h
+++ b/src/menuconfiguration.h
@@ -42,7 +42,7 @@ class MenuConfiguration
         eOSState MenuTextToVdrState(std::string menuText);
         bool FindPluginByName(std::string name, const char** mainMenuEntry, int& pluginIndex);
         MenuNode* AddSubMenuItem(std::string name, MenuNode* menu);
-        void AddSystemMenuItem(std::string name, MenuNode* menu);
+        void AddSystemMenuNode(std::string name, MenuNode* menu);
         void AddPluginMenuItem(std::string pluginName, MenuNode* menu);
 };
 
diff --git a/src/submenuitem.cpp b/src/submenuitem.cpp
index 0785018..86b84da 100644
--- a/src/submenuitem.cpp
+++ b/src/submenuitem.cpp
@@ -23,6 +23,6 @@
 #include "submenuitem.h"
 
 SubMenuItem::SubMenuItem(std::string itemText)
-  :SystemMenuItem(itemText, osUser1)
+  :SystemMenuNode(itemText, osUser1)
 {
 }
diff --git a/src/submenuitem.h b/src/submenuitem.h
index 2101dc6..1c056d5 100644
--- a/src/submenuitem.h
+++ b/src/submenuitem.h
@@ -23,10 +23,10 @@
 #ifndef ___SUBMENUITEM_H
 #define ___SUBMENUITEM_H
 
-#include "systemmenuitem.h"
+#include "systemmenunode.h"
 #include <string>
 
-class SubMenuItem: public SystemMenuItem
+class SubMenuItem: public SystemMenuNode
 {
     public:
         SubMenuItem(std::string itemText);
diff --git a/src/systemmenuitem.cpp b/src/systemmenunode.cpp
index 30257ee..3edc922 100644
--- a/src/systemmenuitem.cpp
+++ b/src/systemmenunode.cpp
@@ -20,20 +20,20 @@
  *
  */
 
-#include "systemmenuitem.h"
+#include "systemmenunode.h"
 #include <vdr/mainmenuitemsprovider.h>
 #include "custommainmenuitem.h"
 
-SystemMenuItem::SystemMenuItem(std::string itemText, eOSState itemState)
+SystemMenuNode::SystemMenuNode(std::string text, eOSState state)
 {
-    _itemText = itemText;
-    _itemState = itemState;
+    _text = text;
+    _state = state;
 }
 
-IMenuItemDefinition* SystemMenuItem::CreateMenuItemDefinition()
+IMenuItemDefinition* SystemMenuNode::CreateMenuItemDefinition()
 {
-    if(_itemState != osUser1)
-        return new CustomMainMenuItem(new cOsdItem(tr(_itemText.c_str()), _itemState));
+    if(_state != osUser1)
+        return new CustomMainMenuItem(new cOsdItem(tr(_text.c_str()), _state));
     else
-        return new CustomMainMenuItem(new cOsdItem(_itemText.c_str(), _itemState));
+        return new CustomMainMenuItem(new cOsdItem(_text.c_str(), _state));
 }
diff --git a/src/systemmenuitem.h b/src/systemmenunode.h
index 4c7c1f7..45a611b 100644
--- a/src/systemmenuitem.h
+++ b/src/systemmenunode.h
@@ -20,21 +20,21 @@
  *
  */
 
-#ifndef ___SYSTEMMENUITEM_H
-#define ___SYSTEMMENUITEM_H
+#ifndef ___SYSTEMMENUNODE_H
+#define ___SYSTEMMENUNODE_H
 
 #include "menunode.h"
 #include <vdr/osdbase.h>
 #include <string>
 
-class SystemMenuItem: public MenuNode
+class SystemMenuNode: public MenuNode
 {
     private:
-        std::string _itemText;
-        eOSState _itemState;
+        std::string _text;
+        eOSState _state;
 
     public:
-        SystemMenuItem(std::string itemText, eOSState itemState);
+        SystemMenuNode(std::string text, eOSState state);
         IMenuItemDefinition* CreateMenuItemDefinition();
 };