Changeset 8669 for code/branches/unity_build

Timestamp:

May 29, 2011, 10:56:57 PM (14 years ago)

Author:

rgrieder

Message:

Moved a few methods from header to source.

Location:

code/branches/unity_build/src/libraries/core

Files:

• GUIManager.cc (modified) (1 diff)
• GUIManager.h (modified) (3 diffs)
• command/Shell.cc (modified) (3 diffs)
• command/Shell.h (modified) (2 diffs)

code/branches/unity_build/src/libraries/core/GUIManager.cc

@@ -646 +646 @@
     }
 
+    /** Helper method to get the developer's mode without having to export Core.h.
+    @see Core::inDevMode
+    */
+    /*static*/ bool GUIManager::inDevMode()
+    {
+         return Core::getInstance().inDevMode();
+    }
+
     /**
         @brief Callback of window event listener, called if the window is resized. Sets the display size of CEGUI.

code/branches/unity_build/src/libraries/core/GUIManager.h

@@ -39 +39 @@
 
 #include <map>
-#include <set>
 #include <string>
 #include <CEGUIForwardRefs.h>
@@ -50 +49 @@
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
-#include "Core.h"
 #include "OrxonoxClass.h"
 #include "WindowEventListener.h"
@@ -104 +102 @@
         void setBackgroundImage(const std::string& image);
 
-        /**
-        @brief Helper method to get the developer's mode without having to export Core.h.
-        @see Core::inDevMode
-        */
-        static bool inDevMode(void) { return Core::getInstance().inDevMode(); } // tolua_export
+        static bool inDevMode(void); // tolua_export
 
         //! Creates a new InputState to be used with a GUI Sheet

code/branches/unity_build/src/libraries/core/command/Shell.cc

@@ -34 +34 @@
 #include "Shell.h"
 
+#include "util/Math.h"
 #include "util/OutputHandler.h"
 #include "util/StringUtils.h"
@@ -41 +42 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/PathConfig.h"
+#include "core/input/InputBuffer.h"
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"
@@ -237 +239 @@
     }
 
+    /// Returns the current position of the cursor in the input buffer.
+    unsigned int Shell::getCursorPosition() const
+    {
+        return this->inputBuffer_->getCursorPosition();
+    }
+
+    /// Returns the current content of the input buffer (the text which was entered by the user)
+    const std::string& Shell::getInput() const
+    {
+        return this->inputBuffer_->get();
+    }
+
     /**
         @brief Sends output to the internal output buffer.

code/branches/unity_build/src/libraries/core/command/Shell.h

@@ -51 +51 @@
 #include "core/Core.h"
 #include "core/OrxonoxClass.h"
-#include "core/input/InputBuffer.h"
 
 namespace orxonox
@@ -120 +119 @@
 
             void setCursorPosition(unsigned int cursor);
-            /// Returns the current position of the cursor in the input buffer.
-            inline unsigned int getCursorPosition() const
-                { return this->inputBuffer_->getCursorPosition(); }
-
-            /// Returns the current content of the input buffer (the text which was entered by the user)
-            inline const std::string& getInput() const
-                { return this->inputBuffer_->get(); }
+            unsigned int getCursorPosition() const;
+
+            const std::string& getInput() const;
 
             typedef std::list<std::pair<std::string, LineType> > LineList;