Some code cleanup, that might have fixed JoergH's build problem on the way

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5282 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/guiengine/screen.hpp

@@ -69,14 +69,6 @@ namespace GUIEngine
         
     };
     
-    /**
-     * \ingroup guiengine
-     * \brief Loads a GUI screen from its XML file.
-     * Builds a hierarchy of Widget objects whose contents are a direct transcription of the XML file,
-     * with little analysis or layout performed on them.
-     */
-    void parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to);
-    
     /**
      * \brief Represents a single GUI screen.
      * Mainly responsible of its children widgets; Screen lays them
@@ -109,6 +101,14 @@ namespace GUIEngine
         
         bool m_throttle_FPS;
 
+        /**
+         * \ingroup guiengine
+         * \brief Loads a GUI screen from its XML file.
+         * Builds a hierarchy of Widget objects whose contents are a direct transcription of the XML file,
+         * with little analysis or layout performed on them.
+         */
+        static void parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to);
+        
     public:
         
         
@@ -226,6 +226,8 @@ namespace GUIEngine
         virtual void eventCallback(Widget* widget, const std::string& name, const int playerID) = 0;
         
         virtual void onUpdate(float dt, irr::video::IVideoDriver*) { };
+        
+        
     };
     
 }

src/guiengine/screen_loader.cpp

@@ -34,7 +34,7 @@ using namespace io;
 using namespace gui;
 using namespace GUIEngine;
 
-void GUIEngine::parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to)
+void Screen::parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to)
 {
     // parse XML file
     while(xml && xml->read())

src/guiengine/widget.hpp

@@ -112,8 +112,6 @@ namespace GUIEngine
     class Widget : public SkinWidgetContainer
     {
     protected:        
-        friend void GUIEngine::parseScreenFileDiv(irr::io::IrrXMLReader* xml, ptr_vector<Widget>& append_to);
-        
         unsigned int m_magic_number;
 
         friend class EventHandler;