- fixed forward declaration and scope of cMenuSetup

2 files changed, 9 insertions, 5 deletions

diff --git a/setup.cpp b/setup.cpp
index 7b48cd9..50b396c 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -107,8 +107,6 @@ Setup& LiveSetup()
 	return instance;
 }
 
-} // namespace vdrlive
-
 cMenuSetupLive::cMenuSetupLive():
 		cMenuSetupPage()
 {
@@ -142,4 +140,6 @@ void cMenuSetupLive::Store(void)
 	SetupStore("AdminPassword",  m_adminPassword);
 }
 
+} // namespace vdrlive
+
 
diff --git a/setup.h b/setup.h
index a41baa1..02e934c 100644
--- a/setup.h
+++ b/setup.h
@@ -7,12 +7,17 @@
 #include "live.h"
 #include <vdr/menuitems.h>
 
+
 namespace vdrlive {
 
+// forward declaration, see below
+class cMenuSetupLive;
+
 class Setup
 {
 	friend Setup& LiveSetup();
-	friend class cMenuSetupLive;
+	friend class cMenuSetupLive; // friend declaration is not forward 
+								 // declaration, although gcc 3.3 claims so
 
 public:
 	typedef std::list< std::string > IpList;
@@ -60,8 +65,6 @@ private:
 
 Setup& LiveSetup();
 
-} // namespace vdrlive
-
 class cMenuSetupLive : public cMenuSetupPage {
 
 protected:
@@ -80,5 +83,6 @@ private:
 	char m_adminPassword[20];
 };
 
+} // namespace vdrlive
 
 #endif // VDR_LIVE_SETUP_H