Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 29, 2008, 7:36:33 PM (17 years ago)
Author:
nicolasc
Message:

just a test - don't morge this

Location:
code/branches/gcc43/src/core
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gcc43/src/core/BaseObject.h

    r1558 r1634  
    5656
    5757            /** @brief Returns if the object was initialized (passed the object registration). @return True was the object is initialized */
    58             inline bool isInitialized() const { return this->bInitialized_; }
     58            bool isInitialized() const { return this->bInitialized_; }
    5959
    6060            /** @brief Sets the name of the object. @param name The name */
    61             inline void setName(const std::string& name) { this->name_ = name; this->changedName(); }
     61            void setName(const std::string& name) { this->name_ = name; this->changedName(); }
    6262            /** @brief Returns the name of the object. @return The name */
    63             inline const std::string& getName() const { return this->name_; }
     63            const std::string& getName() const { return this->name_; }
    6464            /** @brief This function gets called if the name of the object changes. */
    6565            virtual void changedName() {}
    6666
    6767            /** @brief Sets the state of the objects activity. @param bActive True = active */
    68             inline void setActivity(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
     68            void setActivity(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
    6969            /** @brief Returns the state of the objects activity. @return The state of the activity */
    70             inline bool isActive() const { return this->bActive_; }
     70            bool isActive() const { return this->bActive_; }
    7171            /** @brief This function gets called if the activity of the object changes. */
    7272            virtual void changedActivity() {}
    7373
    7474            /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
    75             inline void setVisibility(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
     75            void setVisibility(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
    7676            /** @brief Returns the state of the objects visibility. @return The state of the visibility */
    77             inline bool isVisible() const { return this->bVisible_; }
     77            bool isVisible() const { return this->bVisible_; }
    7878            /** @brief This function gets called if the visibility of the object changes. */
    7979            virtual void changedVisibility() {}
    8080
    8181            /** @brief Sets a pointer to the level that loaded this object. @param level The pointer to the level */
    82             inline void setLevel(const Level* level) { this->level_ = level; }
     82            void setLevel(const Level* level) { this->level_ = level; }
    8383            /** @brief Returns a pointer to the level that loaded this object. @return The level */
    84             inline const Level* getLevel() const { return this->level_; }
     84            const Level* getLevel() const { return this->level_; }
    8585            const std::string& getLevelfile() const;
    8686
    87             virtual inline void setNamespace(Namespace* ns) { this->namespace_ = ns; }
    88             inline Namespace* getNamespace() const { return this->namespace_; }
     87            virtual void setNamespace(Namespace* ns) { this->namespace_ = ns; }
     88            Namespace* getNamespace() const { return this->namespace_; }
    8989
    9090            /** @brief Sets the indentation of the debug output in the Loader. @param indentation The indentation */
    91             inline void setLoaderIndentation(const std::string& indentation) { this->loaderIndentation_ = indentation; }
     91            void setLoaderIndentation(const std::string& indentation) { this->loaderIndentation_ = indentation; }
    9292            /** @brief Returns the indentation of the debug output in the Loader. @return The indentation */
    93             inline const std::string& getLoaderIndentation() const { return this->loaderIndentation_; }
     93            const std::string& getLoaderIndentation() const { return this->loaderIndentation_; }
    9494
    9595        private:

  • code/branches/gcc43/src/core/CommandEvaluation.h

    r1505 r1634  
    6969            bool isValid() const;
    7070
    71             inline ConsoleCommand* getConsoleCommand() const
     71            ConsoleCommand* getConsoleCommand() const
    7272                { return this->function_; }
    73             inline const std::string& getOriginalCommand() const
     73            const std::string& getOriginalCommand() const
    7474                { return this->originalCommand_; }
    75             inline const std::string& getCommand() const
     75            const std::string& getCommand() const
    7676                { return this->command_; }
    7777
    78             inline void setAdditionalParameter(const std::string& param)
     78            void setAdditionalParameter(const std::string& param)
    7979                { this->additionalParameter_ = param; this->bEvaluatedParams_ = false; }
    80             inline std::string getAdditionalParameter() const
     80            std::string getAdditionalParameter() const
    8181                { return (this->additionalParameter_ != "") ? (" " + this->additionalParameter_) : ""; }
    8282

  • code/branches/gcc43/src/core/ConfigFileManager.h

    r1505 r1634  
    8282    {
    8383        public:
    84             inline ConfigFileEntryValue(const std::string& name, const std::string& value = "", bool bString = false, const std::string& additionalComment = "") : name_(name), value_(value), bString_(bString), additionalComment_(additionalComment) {}
    85             inline virtual ~ConfigFileEntryValue() {}
    86 
    87             inline virtual const std::string& getName() const
     84            ConfigFileEntryValue(const std::string& name, const std::string& value = "", bool bString = false, const std::string& additionalComment = "") : name_(name), value_(value), bString_(bString), additionalComment_(additionalComment) {}
     85            virtual ~ConfigFileEntryValue() {}
     86
     87            virtual const std::string& getName() const
    8888                { return this->name_; }
    8989
    90             inline virtual void setComment(const std::string& comment)
     90            virtual void setComment(const std::string& comment)
    9191                { this->additionalComment_ = comment; }
    9292
    … …  
    9494            virtual std::string getValue() const;
    9595
    96             inline bool isString() const
     96            bool isString() const
    9797                { return this->bString_; }
    98             inline void setString(bool bString)
     98            void setString(bool bString)
    9999                { this->bString_ = bString; }
    100100
    … …  
    115115    {
    116116        public:
    117             inline ConfigFileEntryVectorValue(const std::string& name, unsigned int index, const std::string& value = "", bool bString = false, const std::string& additionalComment = "") : ConfigFileEntryValue(name, value, bString, additionalComment), index_(index) {}
    118             inline virtual ~ConfigFileEntryVectorValue() {}
    119 
    120             inline virtual unsigned int getIndex() const
     117            ConfigFileEntryVectorValue(const std::string& name, unsigned int index, const std::string& value = "", bool bString = false, const std::string& additionalComment = "") : ConfigFileEntryValue(name, value, bString, additionalComment), index_(index) {}
     118            virtual ~ConfigFileEntryVectorValue() {}
     119
     120            virtual unsigned int getIndex() const
    121121                { return this->index_; }
    122122
    … …  
    134134    {
    135135        public:
    136             inline ConfigFileEntryComment(const std::string& comment) : comment_(comment) {}
    137             inline virtual ~ConfigFileEntryComment() {}
    138 
    139             inline virtual const std::string& getName() const
     136            ConfigFileEntryComment(const std::string& comment) : comment_(comment) {}
     137            virtual ~ConfigFileEntryComment() {}
     138
     139            virtual const std::string& getName() const
    140140                { return this->comment_; }
    141141
    142             inline virtual void setComment(const std::string& comment)
     142            virtual void setComment(const std::string& comment)
    143143                { this->comment_ = comment; }
    144144
    145             inline virtual void setValue(const std::string& value)
     145            virtual void setValue(const std::string& value)
    146146                {}
    147             inline virtual std::string getValue() const
     147            virtual std::string getValue() const
    148148                { return this->comment_; }
    149149
    150             inline void setString(bool bString) {}
    151 
    152             inline virtual std::string getFileEntry() const
     150            void setString(bool bString) {}
     151
     152            virtual std::string getFileEntry() const
    153153                { return this->comment_; }
    154154
    … …  
    166166
    167167        public:
    168             inline ConfigFileSection(const std::string& name, const std::string& additionalComment = "") : name_(name), additionalComment_(additionalComment), bUpdated_(false) {}
     168            ConfigFileSection(const std::string& name, const std::string& additionalComment = "") : name_(name), additionalComment_(additionalComment), bUpdated_(false) {}
    169169            ~ConfigFileSection();
    170170
    171             inline const std::string& getName() const
     171            const std::string& getName() const
    172172                { return this->name_; }
    173173
    174             inline void setComment(const std::string& comment)
     174            void setComment(const std::string& comment)
    175175                { this->additionalComment_ = comment; }
    176176
    177             inline void setValue(const std::string& name, const std::string& value, bool bString)
     177            void setValue(const std::string& name, const std::string& value, bool bString)
    178178                { this->getEntry(name, value, bString)->setValue(value); }
    179             inline std::string getValue(const std::string& name, const std::string& fallback, bool bString)
     179            std::string getValue(const std::string& name, const std::string& fallback, bool bString)
    180180                { return this->getEntry(name, fallback, bString)->getValue(); }
    181181
    182             inline void setValue(const std::string& name, unsigned int index, const std::string& value, bool bString)
     182            void setValue(const std::string& name, unsigned int index, const std::string& value, bool bString)
    183183                { this->getEntry(name, index, value, bString)->setValue(value); }
    184             inline std::string getValue(const std::string& name, unsigned int index, const std::string& fallback, bool bString)
     184            std::string getValue(const std::string& name, unsigned int index, const std::string& fallback, bool bString)
    185185                { return this->getEntry(name, index, fallback, bString)->getValue(); }
    186186
    … …  
    201201            std::list<ConfigFileEntry*>::iterator getEntryIterator(const std::string& name, unsigned int index, const std::string& fallback, bool bString);
    202202
    203             inline ConfigFileEntry* getEntry(const std::string& name, const std::string& fallback, bool bString)
     203            ConfigFileEntry* getEntry(const std::string& name, const std::string& fallback, bool bString)
    204204                { return (*this->getEntryIterator(name, fallback, bString)); }
    205             inline ConfigFileEntry* getEntry(const std::string& name, unsigned int index, const std::string& fallback, bool bString)
     205            ConfigFileEntry* getEntry(const std::string& name, unsigned int index, const std::string& fallback, bool bString)
    206206                { return (*this->getEntryIterator(name, index, fallback, bString)); }
    207207
    … …  
    219219    {
    220220        public:
    221             inline ConfigFile(const std::string& filename) : filename_(filename), bUpdated_(false) {}
     221            ConfigFile(const std::string& filename) : filename_(filename), bUpdated_(false) {}
    222222            ~ConfigFile();
    223223
    … …  
    227227            void clean(bool bCleanComments = false);
    228228
    229             inline void setValue(const std::string& section, const std::string& name, const std::string& value, bool bString)
     229            void setValue(const std::string& section, const std::string& name, const std::string& value, bool bString)
    230230                { this->getSection(section)->setValue(name, value, bString); this->save(); }
    231             inline std::string getValue(const std::string& section, const std::string& name, const std::string& fallback, bool bString)
     231            std::string getValue(const std::string& section, const std::string& name, const std::string& fallback, bool bString)
    232232                { std::string output = this->getSection(section)->getValue(name, fallback, bString); this->saveIfUpdated(); return output; }
    233233
    234             inline void setValue(const std::string& section, const std::string& name, unsigned int index, const std::string& value, bool bString)
     234            void setValue(const std::string& section, const std::string& name, unsigned int index, const std::string& value, bool bString)
    235235                { this->getSection(section)->setValue(name, index, value, bString); this->save(); }
    236             inline std::string getValue(const std::string& section, const std::string& name, unsigned int index, const std::string& fallback, bool bString)
     236            std::string getValue(const std::string& section, const std::string& name, unsigned int index, const std::string& fallback, bool bString)
    237237                { std::string output = this->getSection(section)->getValue(name, index, fallback, bString); this->saveIfUpdated(); return output; }
    238238
    239             inline void deleteVectorEntries(const std::string& section, const std::string& name, unsigned int startindex = 0)
     239            void deleteVectorEntries(const std::string& section, const std::string& name, unsigned int startindex = 0)
    240240                { this->getSection(section)->deleteVectorEntries(name, startindex); }
    241             inline unsigned int getVectorSize(const std::string& section, const std::string& name)
     241            unsigned int getVectorSize(const std::string& section, const std::string& name)
    242242                { return this->getSection(section)->getVectorSize(name); }
    243243
    … …  
    271271            void clean(ConfigFileType type, bool bCleanComments = false);
    272272
    273             inline void setValue(ConfigFileType type, const std::string& section, const std::string& name, const std::string& value, bool bString)
     273            void setValue(ConfigFileType type, const std::string& section, const std::string& name, const std::string& value, bool bString)
    274274                { this->getFile(type)->setValue(section, name, value, bString); }
    275             inline std::string getValue(ConfigFileType type, const std::string& section, const std::string& name, const std::string& fallback, bool bString)
     275            std::string getValue(ConfigFileType type, const std::string& section, const std::string& name, const std::string& fallback, bool bString)
    276276                { return this->getFile(type)->getValue(section, name, fallback, bString); }
    277277
    278             inline void setValue(ConfigFileType type, const std::string& section, const std::string& name, unsigned int index, const std::string& value, bool bString)
     278            void setValue(ConfigFileType type, const std::string& section, const std::string& name, unsigned int index, const std::string& value, bool bString)
    279279                { this->getFile(type)->setValue(section, name, index, value, bString); }
    280             inline std::string getValue(ConfigFileType type, const std::string& section, const std::string& name, unsigned int index, const std::string& fallback, bool bString)
     280            std::string getValue(ConfigFileType type, const std::string& section, const std::string& name, unsigned int index, const std::string& fallback, bool bString)
    281281                { return this->getFile(type)->getValue(section, name, index, fallback, bString); }
    282282
    283             inline void deleteVectorEntries(ConfigFileType type, const std::string& section, const std::string& name, unsigned int startindex = 0)
     283            void deleteVectorEntries(ConfigFileType type, const std::string& section, const std::string& name, unsigned int startindex = 0)
    284284                { this->getFile(type)->deleteVectorEntries(section, name, startindex); }
    285             inline unsigned int getVectorSize(ConfigFileType type, const std::string& section, const std::string& name)
     285            unsigned int getVectorSize(ConfigFileType type, const std::string& section, const std::string& name)
    286286                { return this->getFile(type)->getVectorSize(section, name); }
    287287

  • code/branches/gcc43/src/core/ConfigValueContainer.h

    r1505 r1634  
    7979            /** @brief Returns the configured value. @param value This is only needed to determine the right type. @return The value */
    8080            template <typename T>
    81             inline ConfigValueContainer& getValue(T* value)
     81            ConfigValueContainer& getValue(T* value)
    8282                { this->value_.getValue(value); return *this; }
    8383            template <typename T>
    84             inline ConfigValueContainer& getValue(std::vector<T>* value)
     84            ConfigValueContainer& getValue(std::vector<T>* value)
    8585            {
    8686                value->clear();
    … …  
    9191
    9292            template <typename T>
    93             inline void setVectorType(const std::vector<T>& value)
     93            void setVectorType(const std::vector<T>& value)
    9494            {
    9595                this->value_ = T();
    … …  
    9797            }
    9898
    99             inline const std::string& getName() const
     99            const std::string& getName() const
    100100                { return this->varname_; }
    101             inline bool isVector() const
     101            bool isVector() const
    102102                { return this->bIsVector_; }
    103             inline unsigned int getVectorSize() const
     103            unsigned int getVectorSize() const
    104104                { return this->valueVector_.size(); }
    105105
    … …  
    119119
    120120            /** @brief Converts the config-value to a string. @return The string */
    121             inline std::string toString() const
     121            std::string toString() const
    122122                { return this->value_.toString(); }
    123123            /** @brief Returns the typename of the assigned config-value. @return The typename */
    124             inline std::string getTypename() const
     124            std::string getTypename() const
    125125                { return this->value_.getTypename(); }
    126126

  • code/branches/gcc43/src/core/Identifier.h

    r1581 r1634  
    100100        public:
    101101            /** @brief Sets the Factory. @param factory The factory to assign */
    102             inline void addFactory(BaseFactory* factory) { this->factory_ = factory; }
     102            void addFactory(BaseFactory* factory) { this->factory_ = factory; }
    103103
    104104            BaseObject* fabricate();
    … …  
    115115
    116116            /** @brief Returns the name of the class the Identifier belongs to. @return The name */
    117             inline const std::string& getName() const { return this->name_; }
     117            const std::string& getName() const { return this->name_; }
    118118
    119119
    120120            /** @brief Returns the parents of the class the Identifier belongs to. @return The list of all parents */
    121             inline const std::set<const Identifier*>& getParents() const { return this->parents_; }
     121            const std::set<const Identifier*>& getParents() const { return this->parents_; }
    122122            /** @brief Returns the begin-iterator of the parents-list. @return The begin-iterator */
    123             inline std::set<const Identifier*>::const_iterator getParentsBegin() const { return this->parents_.begin(); }
     123            std::set<const Identifier*>::const_iterator getParentsBegin() const { return this->parents_.begin(); }
    124124            /** @brief Returns the end-iterator of the parents-list. @return The end-iterator */
    125             inline std::set<const Identifier*>::const_iterator getParentsEnd() const { return this->parents_.end(); }
     125            std::set<const Identifier*>::const_iterator getParentsEnd() const { return this->parents_.end(); }
    126126
    127127            /** @brief Returns the children of the class the Identifier belongs to. @return The list of all children */
    128             inline const std::set<const Identifier*>& getChildren() const { return (*this->children_); }
     128            const std::set<const Identifier*>& getChildren() const { return (*this->children_); }
    129129            /** @brief Returns the begin-iterator of the children-list. @return The begin-iterator */
    130             inline std::set<const Identifier*>::const_iterator getChildrenBegin() const { return this->children_->begin(); }
     130            std::set<const Identifier*>::const_iterator getChildrenBegin() const { return this->children_->begin(); }
    131131            /** @brief Returns the end-iterator of the children-list. @return The end-iterator */
    132             inline std::set<const Identifier*>::const_iterator getChildrenEnd() const { return this->children_->end(); }
     132            std::set<const Identifier*>::const_iterator getChildrenEnd() const { return this->children_->end(); }
    133133
    134134            /** @brief Returns the direct parents of the class the Identifier belongs to. @return The list of all direct parents */
    135             inline const std::set<const Identifier*>& getDirectParents() const { return this->directParents_; }
     135            const std::set<const Identifier*>& getDirectParents() const { return this->directParents_; }
    136136            /** @brief Returns the begin-iterator of the direct-parents-list. @return The begin-iterator */
    137             inline std::set<const Identifier*>::const_iterator getDirectParentsBegin() const { return this->directParents_.begin(); }
     137            std::set<const Identifier*>::const_iterator getDirectParentsBegin() const { return this->directParents_.begin(); }
    138138            /** @brief Returns the end-iterator of the direct-parents-list. @return The end-iterator */
    139             inline std::set<const Identifier*>::const_iterator getDirectParentsEnd() const { return this->directParents_.end(); }
     139            std::set<const Identifier*>::const_iterator getDirectParentsEnd() const { return this->directParents_.end(); }
    140140
    141141            /** @brief Returns the direct children the class the Identifier belongs to. @return The list of all direct children */
    142             inline const std::set<const Identifier*>& getDirectChildren() const { return (*this->directChildren_); }
     142            const std::set<const Identifier*>& getDirectChildren() const { return (*this->directChildren_); }
    143143            /** @brief Returns the begin-iterator of the direct-children-list. @return The begin-iterator */
    144             inline std::set<const Identifier*>::const_iterator getDirectChildrenBegin() const { return this->directChildren_->begin(); }
     144            std::set<const Identifier*>::const_iterator getDirectChildrenBegin() const { return this->directChildren_->begin(); }
    145145            /** @brief Returns the end-iterator of the direct-children-list. @return The end-iterator */
    146             inline std::set<const Identifier*>::const_iterator getDirectChildrenEnd() const { return this->directChildren_->end(); }
     146            std::set<const Identifier*>::const_iterator getDirectChildrenEnd() const { return this->directChildren_->end(); }
    147147
    148148
    149149            /** @brief Returns the map that stores all Identifiers. @return The map */
    150             static inline const std::map<std::string, Identifier*>& getIdentifierMap() { return Identifier::getIdentifierMapIntern(); }
     150            static const std::map<std::string, Identifier*>& getIdentifierMap() { return Identifier::getIdentifierMapIntern(); }
    151151            /** @brief Returns a const_iterator to the beginning of the map that stores all Identifiers. @return The const_iterator */
    152             static inline std::map<std::string, Identifier*>::const_iterator getIdentifierMapBegin() { return Identifier::getIdentifierMap().begin(); }
     152            static std::map<std::string, Identifier*>::const_iterator getIdentifierMapBegin() { return Identifier::getIdentifierMap().begin(); }
    153153            /** @brief Returns a const_iterator to the end of the map that stores all Identifiers. @return The const_iterator */
    154             static inline std::map<std::string, Identifier*>::const_iterator getIdentifierMapEnd() { return Identifier::getIdentifierMap().end(); }
     154            static std::map<std::string, Identifier*>::const_iterator getIdentifierMapEnd() { return Identifier::getIdentifierMap().end(); }
    155155
    156156            /** @brief Returns the map that stores all Identifiers with their names in lowercase. @return The map */
    157             static inline const std::map<std::string, Identifier*>& getLowercaseIdentifierMap() { return Identifier::getLowercaseIdentifierMapIntern(); }
     157            static const std::map<std::string, Identifier*>& getLowercaseIdentifierMap() { return Identifier::getLowercaseIdentifierMapIntern(); }
    158158            /** @brief Returns a const_iterator to the beginning of the map that stores all Identifiers with their names in lowercase. @return The const_iterator */
    159             static inline std::map<std::string, Identifier*>::const_iterator getLowercaseIdentifierMapBegin() { return Identifier::getLowercaseIdentifierMap().begin(); }
     159            static std::map<std::string, Identifier*>::const_iterator getLowercaseIdentifierMapBegin() { return Identifier::getLowercaseIdentifierMap().begin(); }
    160160            /** @brief Returns a const_iterator to the end of the map that stores all Identifiers with their names in lowercase. @return The const_iterator */
    161             static inline std::map<std::string, Identifier*>::const_iterator getLowercaseIdentifierMapEnd() { return Identifier::getLowercaseIdentifierMap().end(); }
     161            static std::map<std::string, Identifier*>::const_iterator getLowercaseIdentifierMapEnd() { return Identifier::getLowercaseIdentifierMap().end(); }
    162162
    163163
    164164            /** @brief Returns the map that stores all config values. @return The const_iterator */
    165             inline const std::map<std::string, ConfigValueContainer*>& getConfigValueMap() const { return this->configValues_; }
     165            const std::map<std::string, ConfigValueContainer*>& getConfigValueMap() const { return this->configValues_; }
    166166            /** @brief Returns a const_iterator to the beginning of the map that stores all config values. @return The const_iterator */
    167             inline std::map<std::string, ConfigValueContainer*>::const_iterator getConfigValueMapBegin() const { return this->configValues_.begin(); }
     167            std::map<std::string, ConfigValueContainer*>::const_iterator getConfigValueMapBegin() const { return this->configValues_.begin(); }
    168168            /** @brief Returns a const_iterator to the end of the map that stores all config values. @return The const_iterator */
    169             inline std::map<std::string, ConfigValueContainer*>::const_iterator getConfigValueMapEnd() const { return this->configValues_.end(); }
     169            std::map<std::string, ConfigValueContainer*>::const_iterator getConfigValueMapEnd() const { return this->configValues_.end(); }
    170170
    171171            /** @brief Returns the map that stores all config values with their names in lowercase. @return The const_iterator */
    172             inline const std::map<std::string, ConfigValueContainer*>& getLowercaseConfigValueMap() const { return this->configValues_LC_; }
     172            const std::map<std::string, ConfigValueContainer*>& getLowercaseConfigValueMap() const { return this->configValues_LC_; }
    173173            /** @brief Returns a const_iterator to the beginning of the map that stores all config values with their names in lowercase. @return The const_iterator */
    174             inline std::map<std::string, ConfigValueContainer*>::const_iterator getLowercaseConfigValueMapBegin() const { return this->configValues_LC_.begin(); }
     174            std::map<std::string, ConfigValueContainer*>::const_iterator getLowercaseConfigValueMapBegin() const { return this->configValues_LC_.begin(); }
    175175            /** @brief Returns a const_iterator to the end of the map that stores all config values with their names in lowercase. @return The const_iterator */
    176             inline std::map<std::string, ConfigValueContainer*>::const_iterator getLowercaseConfigValueMapEnd() const { return this->configValues_LC_.end(); }
     176            std::map<std::string, ConfigValueContainer*>::const_iterator getLowercaseConfigValueMapEnd() const { return this->configValues_LC_.end(); }
    177177
    178178
    179179            /** @brief Returns the map that stores all console commands. @return The const_iterator */
    180             inline const std::map<std::string, ConsoleCommand*>& getConsoleCommandMap() const { return this->consoleCommands_; }
     180            const std::map<std::string, ConsoleCommand*>& getConsoleCommandMap() const { return this->consoleCommands_; }
    181181            /** @brief Returns a const_iterator to the beginning of the map that stores all console commands. @return The const_iterator */
    182             inline std::map<std::string, ConsoleCommand*>::const_iterator getConsoleCommandMapBegin() const { return this->consoleCommands_.begin(); }
     182            std::map<std::string, ConsoleCommand*>::const_iterator getConsoleCommandMapBegin() const { return this->consoleCommands_.begin(); }
    183183            /** @brief Returns a const_iterator to the end of the map that stores all console commands. @return The const_iterator */
    184             inline std::map<std::string, ConsoleCommand*>::const_iterator getConsoleCommandMapEnd() const { return this->consoleCommands_.end(); }
     184            std::map<std::string, ConsoleCommand*>::const_iterator getConsoleCommandMapEnd() const { return this->consoleCommands_.end(); }
    185185
    186186            /** @brief Returns the map that stores all console commands with their names in lowercase. @return The const_iterator */
    187             inline const std::map<std::string, ConsoleCommand*>& getLowercaseConsoleCommandMap() const { return this->consoleCommands_LC_; }
     187            const std::map<std::string, ConsoleCommand*>& getLowercaseConsoleCommandMap() const { return this->consoleCommands_LC_; }
    188188            /** @brief Returns a const_iterator to the beginning of the map that stores all console commands with their names in lowercase. @return The const_iterator */
    189             inline std::map<std::string, ConsoleCommand*>::const_iterator getLowercaseConsoleCommandMapBegin() const { return this->consoleCommands_LC_.begin(); }
     189            std::map<std::string, ConsoleCommand*>::const_iterator getLowercaseConsoleCommandMapBegin() const { return this->consoleCommands_LC_.begin(); }
    190190            /** @brief Returns a const_iterator to the end of the map that stores all console commands with their names in lowercase. @return The const_iterator */
    191             inline std::map<std::string, ConsoleCommand*>::const_iterator getLowercaseConsoleCommandMapEnd() const { return this->consoleCommands_LC_.end(); }
     191            std::map<std::string, ConsoleCommand*>::const_iterator getLowercaseConsoleCommandMapEnd() const { return this->consoleCommands_LC_.end(); }
    192192
    193193
    194194            /** @brief Returns true if this class has at least one config value. @return True if this class has at least one config value */
    195             inline bool hasConfigValues() const { return this->bHasConfigValues_; }
     195            bool hasConfigValues() const { return this->bHasConfigValues_; }
    196196            /** @brief Returns true if this class has at least one console command. @return True if this class has at least one console command */
    197             inline bool hasConsoleCommands() const { return this->bHasConsoleCommands_; }
     197            bool hasConsoleCommands() const { return this->bHasConsoleCommands_; }
    198198
    199199            /** @brief Returns true, if a branch of the class-hierarchy is being created, causing all new objects to store their parents. @return The status of the class-hierarchy creation */
    200             inline static bool isCreatingHierarchy() { return (hierarchyCreatingCounter_s > 0); }
     200            static bool isCreatingHierarchy() { return (hierarchyCreatingCounter_s > 0); }
    201201
    202202            /** @brief Returns the network ID to identify a class through the network. @return the network ID */
    203             inline const unsigned int getNetworkID() const { return this->classID_; }
     203            const unsigned int getNetworkID() const { return this->classID_; }
    204204
    205205            /** @brief Sets the network ID to a new value. @param id The new value */
    … …  
    233233
    234234            /** @brief Returns the children of the class the Identifier belongs to. @return The list of all children */
    235             inline std::set<const Identifier*>& getChildrenIntern() const { return (*this->children_); }
     235            std::set<const Identifier*>& getChildrenIntern() const { return (*this->children_); }
    236236            /** @brief Returns the direct children of the class the Identifier belongs to. @return The list of all direct children */
    237             inline std::set<const Identifier*>& getDirectChildrenIntern() const { return (*this->directChildren_); }
     237            std::set<const Identifier*>& getDirectChildrenIntern() const { return (*this->directChildren_); }
    238238
    239239            /**
    240240                @brief Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.
    241241            */
    242             inline static void startCreatingHierarchy()
     242            static void startCreatingHierarchy()
    243243            {
    244244                hierarchyCreatingCounter_s++;
    … …  
    249249                @brief Decreases the hierarchyCreatingCounter_s variable, causing the objects to stop storing their parents.
    250250            */
    251             inline static void stopCreatingHierarchy()
     251            static void stopCreatingHierarchy()
    252252            {
    253253                hierarchyCreatingCounter_s--;
    … …  
    302302            void setName(const std::string& name);
    303303            /** @brief Returns the list of all existing objects of this class. @return The list */
    304             inline ObjectList<T>* getObjects() const { return this->objects_; }
     304            ObjectList<T>* getObjects() const { return this->objects_; }
    305305            /** @brief Returns a list of all existing objects of this class. @return The list */
    306             inline ObjectList<BaseObject>* getObjectList() const { return (ObjectList<BaseObject>*)this->objects_; }
     306            ObjectList<BaseObject>* getObjectList() const { return (ObjectList<BaseObject>*)this->objects_; }
    307307
    308308            void updateConfigValues() const;
    … …  
    586586
    587587            /** @brief Returns the assigned identifier. @return The identifier */
    588             inline const Identifier* getIdentifier() const
     588            const Identifier* getIdentifier() const
    589589                { return this->identifier_; }
    590590
    591591            /** @brief Returns true, if the assigned identifier is at least of the given type. @param identifier The identifier to compare with */
    592             inline bool isA(const Identifier* identifier) const
     592            bool isA(const Identifier* identifier) const
    593593                { return this->identifier_->isA(identifier); }
    594594
    595595            /** @brief Returns true, if the assigned identifier is exactly of the given type. @param identifier The identifier to compare with */
    596             inline bool isExactlyA(const Identifier* identifier) const
     596            bool isExactlyA(const Identifier* identifier) const
    597597                { return this->identifier_->isExactlyA(identifier); }
    598598
    599599            /** @brief Returns true, if the assigned identifier is a child of the given identifier. @param identifier The identifier to compare with */
    600             inline bool isChildOf(const Identifier* identifier) const
     600            bool isChildOf(const Identifier* identifier) const
    601601                { return this->identifier_->isChildOf(identifier); }
    602602
    603603            /** @brief Returns true, if the assigned identifier is a direct child of the given identifier. @param identifier The identifier to compare with */
    604             inline bool isDirectChildOf(const Identifier* identifier) const
     604            bool isDirectChildOf(const Identifier* identifier) const
    605605                { return this->identifier_->isDirectChildOf(identifier); }
    606606
    607607            /** @brief Returns true, if the assigned identifier is a parent of the given identifier. @param identifier The identifier to compare with */
    608             inline bool isParentOf(const Identifier* identifier) const
     608            bool isParentOf(const Identifier* identifier) const
    609609                { return this->identifier_->isParentOf(identifier); }
    610610
    611611            /** @brief Returns true, if the assigned identifier is a direct parent of the given identifier. @param identifier The identifier to compare with */
    612             inline bool isDirectParentOf(const Identifier* identifier) const
     612            bool isDirectParentOf(const Identifier* identifier) const
    613613                { return this->identifier_->isDirectParentOf(identifier); }
    614614

  • code/branches/gcc43/src/core/Language.h

    r1535 r1634  
    7575              @return The translated entry
    7676            */
    77             inline const std::string& getLocalisation()
     77            const std::string& getLocalisation()
    7878                { return this->localisedEntry_; }
    7979
    … …  
    8282              @return The default entry
    8383            */
    84             inline const std::string& getDefault()
     84            const std::string& getDefault()
    8585                { return this->fallbackEntry_; }
    8686
    … …  
    8989                @param label The label
    9090            */
    91             inline void setLabel(const LanguageEntryLabel& label)
     91            void setLabel(const LanguageEntryLabel& label)
    9292                { this->label_ = label; }
    9393
    … …  
    9696                @return The label
    9797            */
    98             inline const LanguageEntryLabel& getLabel() const
     98            const LanguageEntryLabel& getLabel() const
    9999                { return this->label_; }
    100100

  • code/branches/gcc43/src/core/ObjectList.h

    r1543 r1634  
    9494
    9595            /** @brief Returns the first element in the list. @return The first element */
    96             inline static Iterator<T> start()
     96            static Iterator<T> start()
    9797                { return Iterator<T>(ClassIdentifier<T>::getIdentifier()->getObjects()->first_); }
    9898
    9999            /** @brief Returns the first element in the list. @return The first element */
    100             inline static Iterator<T> begin()
     100            static Iterator<T> begin()
    101101                { return Iterator<T>(ClassIdentifier<T>::getIdentifier()->getObjects()->first_); }
    102102
    103103            /** @brief Returns the last element in the list. @return The last element */
    104             inline static Iterator<T> end()
     104            static Iterator<T> end()
    105105                { return Iterator<T>(ClassIdentifier<T>::getIdentifier()->getObjects()->last_); }
    106106
    107             inline void registerIterator(Iterator<T>* iterator)
     107            void registerIterator(Iterator<T>* iterator)
    108108                { this->iterators_.insert(this->iterators_.end(), (void*)iterator); }
    109             inline void unregisterIterator(Iterator<T>* iterator)
     109            void unregisterIterator(Iterator<T>* iterator)
    110110                { this->iterators_.erase((void*)iterator); }
    111111            void notifyIterators(ObjectListElement<T>* element);

  • code/branches/gcc43/src/core/OrxonoxClass.h

    r1505 r1634  
    6060
    6161            /** @brief Returns the Identifier of the object. @return The Identifier */
    62             inline Identifier* getIdentifier() const { return this->identifier_; }
     62            Identifier* getIdentifier() const { return this->identifier_; }
    6363
    6464            /** @brief Sets the Identifier of the object. Used by the RegisterObject-macro. */
    65             inline void setIdentifier(Identifier* identifier) { this->identifier_ = identifier; }
     65            void setIdentifier(Identifier* identifier) { this->identifier_ = identifier; }
    6666
    6767            /** @brief Returns the list of all parents of the object. @return The list */
    68             inline std::set<const Identifier*>* getParents() const { return this->parents_; }
     68            std::set<const Identifier*>* getParents() const { return this->parents_; }
    6969
    7070            /** @brief Creates the parents-list. */
    71             inline void createParents() { this->parents_ = new std::set<const Identifier*>(); }
     71            void createParents() { this->parents_ = new std::set<const Identifier*>(); }
    7272
    7373            /** @brief Returns the MetaObjectList of the object, containing a link to all ObjectLists and ObjectListElements the object is registered in. @return The list */
    74             inline MetaObjectList& getMetaList() { return (*this->metaList_); }
     74            MetaObjectList& getMetaList() { return (*this->metaList_); }
    7575
    7676

  • code/branches/gcc43/src/core/OutputBuffer.h

    r1505 r1634  
    5656
    5757            template <class T>
    58             inline OutputBuffer& operator<<(T object)
     58            OutputBuffer& operator<<(T object)
    5959            {
    6060                this->stream_ << object;
    … …  
    6868
    6969            template <class T>
    70             inline void add(T object)
     70            void add(T object)
    7171            {
    7272                this->stream_ << object;
    … …  
    7575
    7676            template <class T>
    77             inline void addLine(T object)
     77            void addLine(T object)
    7878            {
    7979                this->stream_ << object << std::endl;
    … …  
    8181            }
    8282
    83             inline void newline()
     83            void newline()
    8484            {
    8585                this->stream_ << std::endl;
    … …  
    8787            }
    8888
    89             inline void flush()
     89            void flush()
    9090            {
    9191                this->stream_.flush();

  • code/branches/gcc43/src/core/OutputHandler.h

    r1505 r1634  
    6363
    6464            /** @brief Puts some text on the outstream. @param text The text */
    65             static inline std::string log(const std::string& text)
     65            static std::string log(const std::string& text)
    6666                { OutputHandler::getOutStream().setOutputLevel(0); OutputHandler::getOutStream().output(text + "\n"); return text; }
    6767
    6868            /** @brief Puts an error on the outstream. @param text The text */
    69             static inline std::string error(const std::string& text)
     69            static std::string error(const std::string& text)
    7070                { OutputHandler::getOutStream().setOutputLevel(1); OutputHandler::getOutStream().output(text + "\n"); return text; }
    7171
    7272            /** @brief Puts a warning on the outstream. @param text The text */
    73             static inline std::string warning(const std::string& text)
     73            static std::string warning(const std::string& text)
    7474                { OutputHandler::getOutStream().setOutputLevel(2); OutputHandler::getOutStream().output(text + "\n"); return text; }
    7575
    7676            /** @brief Puts an info on the outstream. @param text The text */
    77             static inline std::string info(const std::string& text)
     77            static std::string info(const std::string& text)
    7878                { OutputHandler::getOutStream().setOutputLevel(3); OutputHandler::getOutStream().output(text + "\n"); return text; }
    7979
    8080            /** @brief Puts some debug output on the outstream. @param text The text */
    81             static inline std::string debug(const std::string& text)
     81            static std::string debug(const std::string& text)
    8282                { OutputHandler::getOutStream().setOutputLevel(4); OutputHandler::getOutStream().output(text + "\n"); return text; }
    8383
    8484            /** @brief Returns a reference to the logfile. @return The logfile */
    85             inline std::ofstream& getLogfile()
     85            std::ofstream& getLogfile()
    8686                { return this->logfile_; }
    8787
    8888            /** @brief Sets the level of the incoming output. @param level The level of the incoming output @return The OutputHandler itself */
    89             inline OutputHandler& setOutputLevel(int level)
     89            OutputHandler& setOutputLevel(int level)
    9090                { this->outputLevel_ = level; return *this; }
    9191
    9292            /** @brief Returns the level of the incoming output. @return The level */
    93             inline int getOutputLevel() const
     93            int getOutputLevel() const
    9494                { return this->outputLevel_; }
    9595
    … …  
    102102
    103103            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    104             inline OutputHandler& operator<<(unsigned char val)   { return this->output(val); }
     104            OutputHandler& operator<<(unsigned char val)   { return this->output(val); }
    105105            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    106             inline OutputHandler& operator<<(short val)           { return this->output(val); }
     106            OutputHandler& operator<<(short val)           { return this->output(val); }
    107107            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    108             inline OutputHandler& operator<<(unsigned short val)  { return this->output(val); }
     108            OutputHandler& operator<<(unsigned short val)  { return this->output(val); }
    109109            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    110             inline OutputHandler& operator<<(int val)             { return this->output(val); }
     110            OutputHandler& operator<<(int val)             { return this->output(val); }
    111111            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    112             inline OutputHandler& operator<<(unsigned int val)    { return this->output(val); }
     112            OutputHandler& operator<<(unsigned int val)    { return this->output(val); }
    113113            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    114             inline OutputHandler& operator<<(long val)            { return this->output(val); }
     114            OutputHandler& operator<<(long val)            { return this->output(val); }
    115115            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    116             inline OutputHandler& operator<<(unsigned long val)   { return this->output(val); }
     116            OutputHandler& operator<<(unsigned long val)   { return this->output(val); }
    117117            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    118             inline OutputHandler& operator<<(float val)           { return this->output(val); }
     118            OutputHandler& operator<<(float val)           { return this->output(val); }
    119119            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    120             inline OutputHandler& operator<<(double val)          { return this->output(val); }
     120            OutputHandler& operator<<(double val)          { return this->output(val); }
    121121            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    122             inline OutputHandler& operator<<(long double val)     { return this->output(val); }
     122            OutputHandler& operator<<(long double val)     { return this->output(val); }
    123123            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    124             inline OutputHandler& operator<<(const void* val)     { return this->output(val); }
     124            OutputHandler& operator<<(const void* val)     { return this->output(val); }
    125125            /** @brief Overloaded << operator, redirects the output to the console and the logfile. @param val The value that should be shown in the console @return A reference to the OutputHandler itself */
    126             inline OutputHandler& operator<<(bool val)            { return this->output(val); }
     126            OutputHandler& operator<<(bool val)            { return this->output(val); }
    127127
    128128            OutputHandler& operator<<(std::streambuf* sb);

  • code/branches/gcc43/src/core/Script.h

    r1505 r1634  
    5656
    5757    public:
    58       inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
    59       inline ~Script() { Script::singletonRef = NULL; };
     58      static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
     59      ~Script() { Script::singletonRef = NULL; };
    6060
    6161    void loadFile(std::string filename, bool luaTags);
    … …  
    6969#endif
    7070
    71     inline lua_State* getLuaState() { return luaState_; };
    72     inline std::string getLuaOutput() { return output_; };
    73     //inline std::string* getFileString() { return &fileString_; };
     71    lua_State* getLuaState() { return luaState_; };
     72    std::string getLuaOutput() { return output_; };
     73    //std::string* getFileString() { return &fileString_; };
    7474
    7575    unsigned int getNextQuote(const std::string& text, unsigned int start);

  • code/branches/gcc43/src/core/Script_clean.h

    r1505 r1634  
    5151  { // tolua_export
    5252    public:
    53       inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
    54       inline ~Script() { Script::singletonRef = NULL; };
     53      static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
     54      ~Script() { Script::singletonRef = NULL; };
    5555
    5656    void loadFile(std::string filename, bool luaTags);
    … …  
    6161
    6262#if LUA_VERSION_NUM != 501
    63     inline static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
     63    static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
    6464#endif
    6565
    66     inline lua_State* getLuaState() { return luaState_; };
    67     inline std::string getLuaOutput() { return output_; };
    68     //inline std::string* getFileString() { return &fileString_; };
     66    lua_State* getLuaState() { return luaState_; };
     67    std::string getLuaOutput() { return output_; };
     68    //std::string* getFileString() { return &fileString_; };
    6969
    7070    unsigned int getNextQuote(const std::string& text, unsigned int start);

  • code/branches/gcc43/src/core/Shell.h

    r1535 r1634  
    7272
    7373            void setInputBuffer(InputBuffer* buffer);
    74             inline InputBuffer& getInputBuffer()
     74            InputBuffer& getInputBuffer()
    7575                { return (*this->inputBuffer_); }
    76             inline OutputBuffer& getOutputBuffer()
     76            OutputBuffer& getOutputBuffer()
    7777                { return this->outputBuffer_; }
    7878
    7979            void setCursorPosition(unsigned int cursor);
    80             inline unsigned int getCursorPosition() const
     80            unsigned int getCursorPosition() const
    8181                { return this->inputBuffer_->getCursorPosition(); }
    8282
    8383            void setInput(const std::string& input);
    8484
    85             inline void clearInput()
     85            void clearInput()
    8686                { this->setInput(""); }
    87             inline std::string getInput() const
     87            std::string getInput() const
    8888                { return this->inputBuffer_->get(); }
    8989
    … …  
    9494            void clearLines();
    9595
    96             inline unsigned int getNumLines() const
     96            unsigned int getNumLines() const
    9797                { return this->lines_.size(); }
    98             inline unsigned int getScrollPosition() const
     98            unsigned int getScrollPosition() const
    9999                { return this->scrollPosition_; }
    100100
    101             inline void addOutputLevel(bool bAddOutputLevel)
     101            void addOutputLevel(bool bAddOutputLevel)
    102102                { this->bAddOutputLevel_ = bAddOutputLevel; }
    103103

  • code/branches/gcc43/src/core/SignalHandler.h

    r1505 r1634  
    6666    SignalHandler();
    6767  public:
    68     inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; }
     68    static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; }
    6969    ~SignalHandler(){ SignalHandler::singletonRef = NULL; }
    7070
    … …  
    9696{
    9797 public:
    98    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
     98   static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
    9999   void doCatch( const std::string & appName, const std::string & fileName ) {};
    100100  void dontCatch() {};

  • code/branches/gcc43/src/core/XMLPort.h

    r1505 r1634  
    9696            virtual ~XMLPortParamContainer() {}
    9797
    98             inline const std::string& getName() const
     98            const std::string& getName() const
    9999                { return this->paramname_; }
    100100
    … …  
    243243            virtual ~XMLPortObjectContainer() {}
    244244
    245             inline const std::string& getName() const
     245            const std::string& getName() const
    246246                { return this->sectionname_; }
    247247

  • code/branches/gcc43/src/core/input/InputBuffer.h

    r1535 r1634  
    144144            void updated(const char& update, bool bSingleInput);
    145145
    146             inline std::string get() const
     146            std::string get() const
    147147                { return this->buffer_; }
    148             inline unsigned int getSize() const
     148            unsigned int getSize() const
    149149                { return this->buffer_.size(); }
    150150
    151             inline unsigned int getCursorPosition() const
     151            unsigned int getCursorPosition() const
    152152                { return this->cursor_; }
    153             inline void setCursorPosition(unsigned int cursor)
     153            void setCursorPosition(unsigned int cursor)
    154154                { if (cursor <= this->buffer_.size()) { this->cursor_ = cursor; } }
    155             inline void setCursorToEnd()
     155            void setCursorToEnd()
    156156                { this->cursor_ = this->buffer_.size(); }
    157             inline void setCursorToBegin()
     157            void setCursorToBegin()
    158158                { this->cursor_ = 0; }
    159             inline void increaseCursor()
     159            void increaseCursor()
    160160                { if (this->cursor_ < this->buffer_.size()) { ++this->cursor_; } }
    161             inline void decreaseCursor()
     161            void decreaseCursor()
    162162                { if (this->cursor_ > 0) { --this->cursor_; } }
    163163
Note: See TracChangeset for help on using the changeset viewer.