From aba6a8f23c898ee0184e987d8fbe9e53ffc12e4a Mon Sep 17 00:00:00 2001
From: svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Sun, 19 Aug 2007 15:58:04 +0000
Subject: cleaned up includes

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5827 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
---
 src/mainmenuitemsprovider.cpp | 2 ++
 src/mainmenuitemsprovider.h   | 9 ++++-----
 src/menuconfiguration.h       | 2 +-
 src/menunode.h                | 2 +-
 src/menuorg.cpp               | 1 +
 src/menuorg.h                 | 6 ++----
 src/pluginmenuitem.h          | 2 --
 src/systemmenuitem.h          | 1 -
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index 5895dd0..4250fb3 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -26,6 +26,8 @@
 #include "pluginmenuitem.h"
 #include <vdr/plugin.h>
 
+using namespace MenuOrgPatch;
+
 MainMenuItemsProvider::MainMenuItemsProvider(MenuNode* rootMenu)
 {
      _currentMenu = _rootMenu = rootMenu;
diff --git a/src/mainmenuitemsprovider.h b/src/mainmenuitemsprovider.h
index 951f600..e6e1837 100644
--- a/src/mainmenuitemsprovider.h
+++ b/src/mainmenuitemsprovider.h
@@ -24,21 +24,20 @@
 #define ___MAINMENUITEMSPROVIDER_H
 
 #include <vdr/menuorgpatch.h>
-#include "menunode.h"
 
-using namespace MenuOrgPatch;
+class MenuNode;
 
-class MainMenuItemsProvider: public IMainMenuItemsProvider
+class MainMenuItemsProvider: public MenuOrgPatch::IMainMenuItemsProvider
 {
     private:
         MenuNode* _rootMenu;
         MenuNode* _currentMenu;
-        MainMenuItemsList _currentMainMenuItems;
+        MenuOrgPatch::MainMenuItemsList _currentMainMenuItems;
 
     public:
         MainMenuItemsProvider(MenuNode* rootMenu);
         ~MainMenuItemsProvider();
-        virtual MainMenuItemsList* MainMenuItems();
+        virtual MenuOrgPatch::MainMenuItemsList* MainMenuItems();
         virtual void EnterRootMenu();
         virtual void EnterSubMenu(cOsdItem* item);
         virtual bool LeaveSubMenu();
diff --git a/src/menuconfiguration.h b/src/menuconfiguration.h
index b992ac2..933ea0f 100644
--- a/src/menuconfiguration.h
+++ b/src/menuconfiguration.h
@@ -25,9 +25,9 @@
 
 #include <string>
 #include <vdr/osdbase.h>
-#include "menunode.h"
 
 namespace xmlpp { class Element; }
+class MenuNode;
 
 class MenuConfiguration
 {
diff --git a/src/menunode.h b/src/menunode.h
index 160e75c..d8e9eef 100644
--- a/src/menunode.h
+++ b/src/menunode.h
@@ -24,8 +24,8 @@
 #define ___MENUNODE_H
 
 #include <vector>
-#include <vdr/menuorgpatch.h>
 
+namespace MenuOrgPatch { class IMainMenuItem; }
 class MenuNode;
 
 typedef std::vector<MenuNode*> MenuNodeList;
diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 3cdea25..257aeb0 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -31,6 +31,7 @@
 #include "version.h"
 #include "menuorg.h"
 #include "menuconfiguration.h"
+#include "mainmenuitemsprovider.h"
 #include "i18n.h"
 
 using namespace std;
diff --git a/src/menuorg.h b/src/menuorg.h
index 250fb28..85b3ca1 100644
--- a/src/menuorg.h
+++ b/src/menuorg.h
@@ -24,17 +24,15 @@
 #define ___MENUORGPLUGIN_H
 
 #include <vdr/plugin.h>
-#include "mainmenuitemsprovider.h"
 #include <string>
 
-using namespace std;
-using namespace MenuOrgPatch;
+class MainMenuItemsProvider;
 
 class MenuOrgPlugin : public cPlugin
 {
     private:
         MainMenuItemsProvider* _subMenuProvider;
-        string configFile;
+        std::string configFile;
 
     public:
         MenuOrgPlugin(void);
diff --git a/src/pluginmenuitem.h b/src/pluginmenuitem.h
index 11085b7..87f38d4 100644
--- a/src/pluginmenuitem.h
+++ b/src/pluginmenuitem.h
@@ -24,8 +24,6 @@
 #define ___PLUGINMENUITEM_H
 
 #include "menunode.h"
-#include <vdr/osdbase.h>
-#include <vdr/menuorgpatch.h>
 
 class PluginMenuItem: public MenuNode
 {
diff --git a/src/systemmenuitem.h b/src/systemmenuitem.h
index d7970c6..19ded04 100644
--- a/src/systemmenuitem.h
+++ b/src/systemmenuitem.h
@@ -25,7 +25,6 @@
 
 #include "menunode.h"
 #include <vdr/osdbase.h>
-#include <vdr/menuorgpatch.h>
 #include <string>
 
 class SystemMenuItem: public MenuNode
-- 
cgit v1.2.3