Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8669


Ignore:
Timestamp:
May 29, 2011, 10:56:57 PM (13 years ago)
Author:
rgrieder
Message:

Moved a few methods from header to source.

Location:
code/branches/unity_build/src/libraries/core
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/unity_build/src/libraries/core/GUIManager.cc

    r8439 r8669  
    646646    }
    647647
     648    /** Helper method to get the developer's mode without having to export Core.h.
     649    @see Core::inDevMode
     650    */
     651    /*static*/ bool GUIManager::inDevMode()
     652    {
     653         return Core::getInstance().inDevMode();
     654    }
     655
    648656    /**
    649657        @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

    r8423 r8669  
    3939
    4040#include <map>
    41 #include <set>
    4241#include <string>
    4342#include <CEGUIForwardRefs.h>
     
    5049#include "util/Singleton.h"
    5150#include "input/InputHandler.h"
    52 #include "Core.h"
    5351#include "OrxonoxClass.h"
    5452#include "WindowEventListener.h"
     
    104102        void setBackgroundImage(const std::string& image);
    105103
    106         /**
    107         @brief Helper method to get the developer's mode without having to export Core.h.
    108         @see Core::inDevMode
    109         */
    110         static bool inDevMode(void) { return Core::getInstance().inDevMode(); } // tolua_export
     104        static bool inDevMode(void); // tolua_export
    111105
    112106        //! Creates a new InputState to be used with a GUI Sheet
  • code/branches/unity_build/src/libraries/core/command/Shell.cc

    r8524 r8669  
    3434#include "Shell.h"
    3535
     36#include "util/Math.h"
    3637#include "util/OutputHandler.h"
    3738#include "util/StringUtils.h"
     
    4142#include "core/ConfigValueIncludes.h"
    4243#include "core/PathConfig.h"
     44#include "core/input/InputBuffer.h"
    4345#include "CommandExecutor.h"
    4446#include "ConsoleCommand.h"
     
    237239    }
    238240
     241    /// Returns the current position of the cursor in the input buffer.
     242    unsigned int Shell::getCursorPosition() const
     243    {
     244        return this->inputBuffer_->getCursorPosition();
     245    }
     246
     247    /// Returns the current content of the input buffer (the text which was entered by the user)
     248    const std::string& Shell::getInput() const
     249    {
     250        return this->inputBuffer_->get();
     251    }
     252
    239253    /**
    240254        @brief Sends output to the internal output buffer.
  • code/branches/unity_build/src/libraries/core/command/Shell.h

    r8524 r8669  
    5151#include "core/Core.h"
    5252#include "core/OrxonoxClass.h"
    53 #include "core/input/InputBuffer.h"
    5453
    5554namespace orxonox
     
    120119
    121120            void setCursorPosition(unsigned int cursor);
    122             /// Returns the current position of the cursor in the input buffer.
    123             inline unsigned int getCursorPosition() const
    124                 { return this->inputBuffer_->getCursorPosition(); }
    125 
    126             /// Returns the current content of the input buffer (the text which was entered by the user)
    127             inline const std::string& getInput() const
    128                 { return this->inputBuffer_->get(); }
     121            unsigned int getCursorPosition() const;
     122
     123            const std::string& getInput() const;
    129124
    130125            typedef std::list<std::pair<std::string, LineType> > LineList;
Note: See TracChangeset for help on using the changeset viewer.