Âmorerenamings

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

8 files changed, 30 insertions, 30 deletions

diff --git a/sources.mk b/sources.mk
index cdbcdd1..817a8d0 100644
--- a/sources.mk
+++ b/sources.mk
@@ -1,11 +1,11 @@
 SRCS = \
-  src/custommainmenuitem.cpp \
   src/mainmenuitemsprovider.cpp \
   src/menuconfiguration.cpp \
   src/menunode.cpp \
   src/menuorg.cpp \
+  src/osditemdefinition.cpp \
   src/plugincreator.cpp \
-  src/pluginmainmenuitem.cpp \
+  src/pluginitemdefinition.cpp \
   src/pluginmenunode.cpp \
   src/submenunode.cpp \
   src/systemmenunode.cpp \
diff --git a/src/custommainmenuitem.cpp b/src/osditemdefinition.cpp
index fb93a49..f28334b 100644
--- a/src/custommainmenuitem.cpp
+++ b/src/osditemdefinition.cpp
@@ -20,34 +20,34 @@
  *
  */
 
-#include "custommainmenuitem.h"
+#include "osditemdefinition.h"
 
-CustomMainMenuItem::CustomMainMenuItem(cOsdItem* osdItem)
+OsdItemDefinition::OsdItemDefinition(cOsdItem* osdItem)
 {
     _osdItem = osdItem;
 }
 
-bool CustomMainMenuItem::IsCustomOsdItem()
+bool OsdItemDefinition::IsCustomOsdItem()
 {
     return true;
 }
 
-bool CustomMainMenuItem::IsPluginItem()
+bool OsdItemDefinition::IsPluginItem()
 {
     return false;
 }
 
-cOsdItem* CustomMainMenuItem::CustomOsdItem()
+cOsdItem* OsdItemDefinition::CustomOsdItem()
 {
     return _osdItem; 
 }
 
-const char* CustomMainMenuItem::PluginMenuEntry()
+const char* OsdItemDefinition::PluginMenuEntry()
 {
     return NULL;
 }
 
-int CustomMainMenuItem::PluginIndex()
+int OsdItemDefinition::PluginIndex()
 {
     return 0;
 }
diff --git a/src/custommainmenuitem.h b/src/osditemdefinition.h
index 7e6cd41..0c4bad7 100644
--- a/src/custommainmenuitem.h
+++ b/src/osditemdefinition.h
@@ -20,18 +20,18 @@
  *
  */
 
-#ifndef ___CUSTOMMAINMENUITEM_H
-#define ___CUSTOMMAINMENUITEM_H
+#ifndef ___OSDITEMDEFINITION_H
+#define ___OSDITEMDEFINITION_H
 
 #include <vdr/mainmenuitemsprovider.h>
 
-class CustomMainMenuItem: public IMenuItemDefinition
+class OsdItemDefinition: public IMenuItemDefinition
 {
     private:
         cOsdItem* _osdItem;
 
     public:
-        CustomMainMenuItem(cOsdItem* osdItem);
+        OsdItemDefinition(cOsdItem* osdItem);
         virtual bool IsCustomOsdItem();
         virtual bool IsPluginItem();
         virtual cOsdItem* CustomOsdItem();
diff --git a/src/pluginmainmenuitem.cpp b/src/pluginitemdefinition.cpp
index 8101aa1..f74a04d 100644
--- a/src/pluginmainmenuitem.cpp
+++ b/src/pluginitemdefinition.cpp
@@ -20,35 +20,35 @@
  *
  */
 
-#include "pluginmainmenuitem.h"
+#include "pluginitemdefinition.h"
 
-PluginMainMenuItem::PluginMainMenuItem(const char* mainMenuEntry, int pluginIndex)
+PluginItemDefinition::PluginItemDefinition(const char* mainMenuEntry, int pluginIndex)
 {
     _mainMenuEntry = mainMenuEntry;
     _pluginIndex = pluginIndex; 
 }
 
-bool PluginMainMenuItem::IsCustomOsdItem()
+bool PluginItemDefinition::IsCustomOsdItem()
 {
     return false;
 }
 
-bool PluginMainMenuItem::IsPluginItem()
+bool PluginItemDefinition::IsPluginItem()
 {
     return true;
 }
 
-cOsdItem* PluginMainMenuItem::CustomOsdItem()
+cOsdItem* PluginItemDefinition::CustomOsdItem()
 {
     return NULL;
 }
 
-const char* PluginMainMenuItem::PluginMenuEntry()
+const char* PluginItemDefinition::PluginMenuEntry()
 {
     return _mainMenuEntry;
 }
 
-int PluginMainMenuItem::PluginIndex()
+int PluginItemDefinition::PluginIndex()
 {
     return _pluginIndex;
 }
diff --git a/src/pluginmainmenuitem.h b/src/pluginitemdefinition.h
index df1427f..75ad0a3 100644
--- a/src/pluginmainmenuitem.h
+++ b/src/pluginitemdefinition.h
@@ -20,19 +20,19 @@
  *
  */
 
-#ifndef ___PLUGINMAINMENUITEM_H
-#define ___PLUGINMAINMENUITEM_H
+#ifndef ___PLUGINITEMDEFINITION_H
+#define ___PLUGINITEMDEFINITION_H
 
 #include <vdr/mainmenuitemsprovider.h>
 
-class PluginMainMenuItem: public IMenuItemDefinition
+class PluginItemDefinition: public IMenuItemDefinition
 {
     private:
         const char* _mainMenuEntry;
         int _pluginIndex;
 
     public:
-        PluginMainMenuItem(const char* mainMenuEntry, int pluginIndex);
+        PluginItemDefinition(const char* mainMenuEntry, int pluginIndex);
         virtual bool IsCustomOsdItem();
         virtual bool IsPluginItem();
         virtual cOsdItem* CustomOsdItem();
diff --git a/src/pluginmenunode.cpp b/src/pluginmenunode.cpp
index 1d966c9..3e8bc5b 100644
--- a/src/pluginmenunode.cpp
+++ b/src/pluginmenunode.cpp
@@ -22,7 +22,7 @@
 
 #include "pluginmenunode.h"
 #include <vdr/mainmenuitemsprovider.h>
-#include "pluginmainmenuitem.h"
+#include "pluginitemdefinition.h"
 
 PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex)
 {
@@ -32,5 +32,5 @@ PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex)
 
 IMenuItemDefinition* PluginMenuNode::CreateMenuItemDefinition()
 {
-    return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex);
+    return new PluginItemDefinition(_pluginMainMenuEntry, _pluginIndex);
 }
diff --git a/src/submenunode.cpp b/src/submenunode.cpp
index 18f493a..6894f53 100644
--- a/src/submenunode.cpp
+++ b/src/submenunode.cpp
@@ -22,7 +22,7 @@
 
 #include "submenunode.h"
 #include <vdr/osdbase.h>
-#include "custommainmenuitem.h"
+#include "osditemdefinition.h"
 
 SubMenuNode::SubMenuNode(std::string text)
 {
@@ -31,5 +31,5 @@ SubMenuNode::SubMenuNode(std::string text)
 
 IMenuItemDefinition* SubMenuNode::CreateMenuItemDefinition()
 {
-    return new CustomMainMenuItem(new cOsdItem(tr(_text.c_str()), osUser1));
+    return new OsdItemDefinition(new cOsdItem(tr(_text.c_str()), osUser1));
 }
diff --git a/src/systemmenunode.cpp b/src/systemmenunode.cpp
index 2b9f2dd..4242bac 100644
--- a/src/systemmenunode.cpp
+++ b/src/systemmenunode.cpp
@@ -22,7 +22,7 @@
 
 #include "systemmenunode.h"
 #include <vdr/mainmenuitemsprovider.h>
-#include "custommainmenuitem.h"
+#include "osditemdefinition.h"
 
 SystemMenuNode::SystemMenuNode(std::string text, eOSState state)
 {
@@ -32,5 +32,5 @@ SystemMenuNode::SystemMenuNode(std::string text, eOSState state)
 
 IMenuItemDefinition* SystemMenuNode::CreateMenuItemDefinition()
 {
-    return new CustomMainMenuItem(new cOsdItem(_text.c_str(), _state));
+    return new OsdItemDefinition(new cOsdItem(_text.c_str(), _state));
 }