Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3154 for code/branches/pch


Ignore:
Timestamp:
Jun 13, 2009, 4:30:37 PM (15 years ago)
Author:
rgrieder
Message:

Tried to reduce dependencies in the core. There wasn't much to achieve though…

Location:
code/branches/pch/src
Files:
74 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pch/src/core/ArgumentCompletionFunctions.cc

    r2759 r3154  
    2929#include "ArgumentCompletionFunctions.h"
    3030
    31 #include <iostream>
    3231#include <map>
    3332#include <boost/version.hpp>
    3433#include <boost/filesystem.hpp>
    3534
    36 #include "CoreIncludes.h"
     35#include "util/Convert.h"
     36#include "util/String.h"
    3737#include "Identifier.h"
    3838#include "ConfigValueContainer.h"
    3939#include "TclThreadManager.h"
    40 #include "util/Convert.h"
    41 #include "util/String.h"
    4240
    4341// Boost 1.36 has some issues with deprecated functions that have been omitted

  • code/branches/pch/src/core/ArgumentCompletionListElement.h

    r1784 r3154  
    3232#include "CorePrereqs.h"
    3333
     34#include <list>
    3435#include <string>
    35 #include <list>
    36 
    3736
    3837namespace orxonox

  • code/branches/pch/src/core/BaseObject.cc

    r2710 r3154  
    3636#include <tinyxml/tinyxml.h>
    3737
     38#include "util/String.h"
    3839#include "CoreIncludes.h"
     40#include "Event.h"
    3941#include "EventIncludes.h"
    4042#include "Functor.h"
    41 #include "XMLPort.h"
     43#include "Iterator.h"
     44#include "Template.h"
    4245#include "XMLFile.h"
    4346#include "XMLNameListener.h"
    44 #include "Template.h"
    45 #include "util/String.h"
    46 #include "util/mbool.h"
     47#include "XMLPort.h"
    4748
    4849namespace orxonox

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

    r3146 r3154  
    4444    }
    4545
     46
     47#include "CorePrereqs.h"
     48
    4649#include <map>
    4750#include <list>
    4851
    49 #include "CorePrereqs.h"
    50 
     52#include "util/mbool.h"
     53#include "OrxonoxClass.h"
    5154#include "Super.h"
    52 #include "OrxonoxClass.h"
    5355#include "XMLIncludes.h"
    54 #include "Event.h"
    55 #include "util/mbool.h"
    5656
    5757namespace orxonox

  • code/branches/pch/src/core/ClassFactory.h

    r3145 r3154  
    4141#include <string>
    4242
     43#include "util/Debug.h"
    4344#include "Factory.h"
    4445#include "Identifier.h"
    45 #include "util/Debug.h"
    4646
    4747namespace orxonox

  • code/branches/pch/src/core/ClassTreeMask.cc

    r2171 r3154  
    3434#include "ClassTreeMask.h"
    3535#include "Identifier.h"
    36 #include "BaseObject.h"
    3736
    3837namespace orxonox

  • code/branches/pch/src/core/ClassTreeMask.h

    r2171 r3154  
    7575#include <list>
    7676#include <stack>
    77 
     77#include "BaseObject.h"
    7878#include "Iterator.h"
    79 #include "BaseObject.h"
    8079
    8180namespace orxonox

  • code/branches/pch/src/core/CommandEvaluation.cc

    r2087 r3154  
    2828
    2929#include "CommandEvaluation.h"
     30
     31#include "util/Debug.h"
     32#include "util/String.h"
    3033#include "ConsoleCommand.h"
    3134#include "Identifier.h"
    32 #include "util/Debug.h"
    33 #include "util/String.h"
    3435
    3536namespace orxonox

  • code/branches/pch/src/core/CommandExecutor.cc

    r3035 r3154  
    2828
    2929#include "CommandExecutor.h"
     30
     31#include "util/Debug.h"
     32#include "util/String.h"
    3033#include "ConsoleCommand.h"
    31 #include "util/String.h"
    32 #include "util/Debug.h"
    3334#include "Identifier.h"
    3435#include "Language.h"

  • code/branches/pch/src/core/CommandExecutor.h

    r3146 r3154  
    3434#include <map>
    3535#include <set>
     36#include <string>
     37
     38#include "util/MultiType.h"
    3639#include "CommandEvaluation.h"
    3740

  • code/branches/pch/src/core/CommandLine.cc

    r3150 r3154  
    3131#include <boost/filesystem.hpp>
    3232
     33#include "util/Convert.h"
     34#include "util/Debug.h"
    3335#include "util/Exception.h"
    3436#include "util/String.h"

  • code/branches/pch/src/core/CommandLine.h

    r3149 r3154  
    3131
    3232#include "CorePrereqs.h"
     33
    3334#include <map>
    34 #include "util/Convert.h"
    35 #include "util/Debug.h"
    3635#include "util/OrxAssert.h"
    3736#include "util/MultiType.h"

  • code/branches/pch/src/core/ConfigFileManager.cc

    r3152 r3154  
    2929#include "ConfigFileManager.h"
    3030
    31 #include <cassert>
    3231#include <boost/filesystem.hpp>
    3332
    3433#include "util/Convert.h"
     34#include "util/Math.h"
    3535#include "util/String.h"
    3636#include "ConsoleCommand.h"

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

    r2662 r3154  
    3232#include "CorePrereqs.h"
    3333
    34 #include <iostream>
     34#include <cassert>
    3535#include <string>
    3636#include <list>
    3737#include <map>
    3838
    39 #include "util/Math.h"
    4039#include "util/OrxEnum.h"
    4140

  • code/branches/pch/src/core/ConfigValueContainer.cc

    r3152 r3154  
    3434#include "ConfigValueContainer.h"
    3535
    36 #include <fstream>
    37 
     36#include "util/Convert.h"
    3837#include "util/SubString.h"
    39 #include "util/Convert.h"
    4038#include "Language.h"
    41 #include "Identifier.h"
    42 
    43 
    4439
    4540namespace orxonox

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

    r2662 r3154  
    4949#include <vector>
    5050
    51 #include "util/Math.h"
    5251#include "util/MultiType.h"
    5352#include "ConfigFileManager.h"

  • code/branches/pch/src/core/ConsoleCommand.h

    r2662 r3154  
    3232#include "CorePrereqs.h"
    3333
     34#include "ArgumentCompletionFunctions.h"
     35#include "CommandExecutor.h"
    3436#include "Executor.h"
    3537#include "Identifier.h"
    36 #include "CommandExecutor.h"
    37 #include "ArgumentCompletionFunctions.h"
    3838
    3939

  • code/branches/pch/src/core/ConsoleCommandCompilation.cc

    r1747 r3154  
    2828
    2929#include "ConsoleCommandCompilation.h"
    30 #include "ConsoleCommand.h"
     30
     31#include <fstream>
     32#include <set>
     33#include <string>
     34
    3135#include "util/Debug.h"
    3236#include "util/ExprParser.h"
     37#include "ConsoleCommand.h"
    3338
    3439namespace orxonox

  • code/branches/pch/src/core/ConsoleCommandCompilation.h

    r1505 r3154  
    3232#include "CorePrereqs.h"
    3333
    34 #include <string>
    35 
    3634namespace orxonox
    3735{

  • code/branches/pch/src/core/CorePrereqs.h

    r2896 r3154  
    3636
    3737#include "OrxonoxConfig.h"
    38 
    39 #include <string>
    4038
    4139//-----------------------------------------------------------------------
    … …  
    190188}
    191189
     190// CppTcl
     191namespace Tcl
     192{
     193    class interpreter;
     194    class object;
     195}
     196
    192197#endif /* _CorePrereqs_H__ */

  • code/branches/pch/src/core/Event.cc

    r2087 r3154  
    2828
    2929#include "Event.h"
     30
    3031#include "BaseObject.h"
    3132#include "Executor.h"

  • code/branches/pch/src/core/Event.h

    r2087 r3154  
    3131
    3232#include "CorePrereqs.h"
     33#include <string>
    3334
    3435namespace orxonox

  • code/branches/pch/src/core/Executor.cc

    r1879 r3154  
    2929
    3030#include "Executor.h"
    31 #include "util/Math.h"
     31
    3232#include "util/Convert.h"
    3333#include "Language.h"

  • code/branches/pch/src/core/Executor.h

    r1889 r3154  
    3333#include "CorePrereqs.h"
    3434
     35#include "util/Debug.h"
     36#include "util/Math.h"
     37#include "util/String.h"
    3538#include "util/SubString.h"
    36 #include "util/String.h"
    37 #include "util/Math.h"
    3839#include "Functor.h"
    39 #include "util/Debug.h"
    4040
    4141

  • code/branches/pch/src/core/Factory.cc

    r2761 r3154  
    3333
    3434#include "Factory.h"
     35
     36#include "util/Debug.h"
    3537#include "Identifier.h"
    3638#include "BaseObject.h"
    37 #include "util/Debug.h"
    3839
    3940namespace orxonox

  • code/branches/pch/src/core/Functor.h

    r2710 r3154  
    3333#include "CorePrereqs.h"
    3434
     35#include "util/Debug.h"
    3536#include "util/MultiType.h"
    3637#include "util/String.h"
    37 #include "util/Debug.h"
    38 
    3938
    4039namespace orxonox

  • code/branches/pch/src/core/Game.cc

    r3124 r3154  
    3636
    3737#include <exception>
    38 #include <cassert>
    3938#include <boost/weak_ptr.hpp>
    4039

  • code/branches/pch/src/core/Game.h

    r3124 r3154  
    3737
    3838#include "CorePrereqs.h"
     39
    3940#include <cassert>
    4041#include <list>
    … …  
    4243#include <vector>
    4344#include <boost/shared_ptr.hpp>
     45
    4446#include "OrxonoxClass.h"
    4547

  • code/branches/pch/src/core/GameState.cc

    r3149 r3154  
    3434
    3535#include "GameState.h"
     36
    3637#include "util/Debug.h"
    3738#include "util/Exception.h"
    3839#include "util/OrxAssert.h"
    39 #include "Clock.h"
    4040
    4141namespace orxonox

  • code/branches/pch/src/core/GameState.h

    r3084 r3154  
    3838#include "CorePrereqs.h"
    3939
     40#include <map>
    4041#include <string>
    41 #include <map>
    42 #include "CorePrereqs.h"
    4342
    4443namespace orxonox

  • code/branches/pch/src/core/IRC.cc

    r1792 r3154  
    2929#include "IRC.h"
    3030
    31 #include <boost/thread/thread.hpp>
     31#include <cpptcl/cpptcl.h>
     32
     33#include "util/Convert.h"
    3234#include "ConsoleCommand.h"
     35#include "CoreIncludes.h"
    3336#include "TclThreadManager.h"
    34 #include "CoreIncludes.h"
    35 #include "util/Convert.h"
    36 
    3737
    3838namespace orxonox

  • code/branches/pch/src/core/IRC.h

    r2710 r3154  
    3131
    3232#include "CorePrereqs.h"
    33 
    34 #include <cpptcl/cpptcl.h>
    3533#include "OrxonoxClass.h"
    3634

  • code/branches/pch/src/core/Identifier.cc

    r3151 r3154  
    3636#include <ostream>
    3737
    38 #include "Factory.h"
     38#include "util/String.h"
    3939#include "ConfigValueContainer.h"
    4040#include "ConsoleCommand.h"
    41 #include "CommandExecutor.h"
     41#include "Factory.h"
    4242#include "XMLPort.h"
    4343

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

    r3151 r3154  
    5555#include "CorePrereqs.h"
    5656
     57#include <cassert>
     58#include <map>
    5759#include <set>
    58 #include <map>
    59 #include <vector>
    6060#include <string>
    61 #include <utility>
    6261#include <typeinfo>
    63 #include <cstdlib>
    64 #include <cassert>
    65 
     62
     63#include "util/Debug.h"
    6664#include "MetaObjectList.h"
    67 #include "Iterator.h"
     65#include "ObjectList.h"
     66#include "ObjectListBase.h"
    6867#include "Super.h"
    69 #include "Functor.h"
    70 #include "util/Debug.h"
    71 #include "util/String.h"
    7268
    7369namespace orxonox

  • code/branches/pch/src/core/Iterator.h

    r2896 r3154  
    4747#include "CorePrereqs.h"
    4848
     49#include "Identifier.h"
    4950#include "ObjectListBase.h"
    50 #include "ObjectListIterator.h"
    51 #include "OrxonoxClass.h"
    5251
    5352namespace orxonox
    … …  
    305304}
    306305
    307 // Include ObjectList.h so the user only has to include one file: Iterator.h
    308 #include "ObjectList.h"
    309 
    310306#endif /* _Iterator_H__ */

  • code/branches/pch/src/core/Language.cc

    r2759 r3154  
    3737#include <boost/filesystem.hpp>
    3838
     39#include "util/Debug.h"
    3940#include "Core.h"
    40 #include "util/Debug.h"
    4141
    4242namespace orxonox

  • code/branches/pch/src/core/Loader.cc

    r3008 r3154  
    3232#include <boost/filesystem.hpp>
    3333
    34 #include "XMLFile.h"
     34#include "util/Debug.h"
     35#include "util/Exception.h"
    3536#include "BaseObject.h"
    36 #include "Identifier.h"
     37#include "Core.h"
    3738#include "Iterator.h"
    3839#include "ObjectList.h"
    39 #include "CoreIncludes.h"
    4040#include "LuaBind.h"
    4141#include "Namespace.h"
    42 #include "util/Debug.h"
    43 #include "util/Exception.h"
    44 #include "Core.h"
     42#include "XMLFile.h"
    4543
    4644namespace orxonox

  • code/branches/pch/src/core/Loader.h

    r3008 r3154  
    3333
    3434#include <vector>
    35 
    3635#include "ClassTreeMask.h"
    3736

  • code/branches/pch/src/core/LuaBind.cc

    r3068 r3154  
    3131#include <fstream>
    3232#include <map>
    33 
    3433extern "C" {
    35 #include <lua.h>
    3634#include <lualib.h>
    3735}
    … …  
    3937#include <boost/filesystem.hpp>
    4038
     39#include "util/Debug.h"
    4140#include "util/String.h"
    42 #include "util/Debug.h"
    4341#include "ToluaBindCore.h"
    4442#include "Core.h"
    … …  
    7270  }
    7371
    74   void LuaBind::luaPrint(std::string str)
     72  void LuaBind::luaPrint(const std::string& str)
    7573  {
    7674    output_ += str;
    … …  
    8482      @param luaTags if true, the loaded file gets stripped off luaTags
    8583  */
    86   void LuaBind::loadFile(std::string filename, bool luaTags)
     84  void LuaBind::loadFile(const std::string& filename, bool luaTags)
    8785  {
    8886    boost::filesystem::path filepath(filename);
    … …  
    117115  }
    118116
    119   void LuaBind::loadString(std::string code)
     117  void LuaBind::loadString(const std::string& code)
    120118  {
    121119    luaSource_ = code;

  • code/branches/pch/src/core/LuaBind.h

    r3068 r3154  
    3838#include "CorePrereqs.h"
    3939
     40#include <cassert>
     41#include <string>
    4042extern "C" {
    4143#include <lua.h>
    4244}
    43 
    44 #include <cassert>
    45 #include <list>
    46 #include <string>
    4745
    4846// tolua_begin
    … …  
    6462      inline static LuaBind& getInstance() { assert(singletonRef_s); return *LuaBind::singletonRef_s; } // tolua_export
    6563
    66     void loadFile(std::string filename, bool luaTags);
    67     void loadString(std::string code);
     64    void loadFile(const std::string& filename, bool luaTags);
     65    void loadString(const std::string& code);
    6866    //void init(lua_State *state_);
    6967    //void xmlToLua();
    7068    void run();
    71     void luaPrint(std::string str); // tolua_export
     69    void luaPrint(const std::string& str); // tolua_export
    7270
    7371#if LUA_VERSION_NUM != 501
    … …  
    7674
    7775    inline lua_State* getLuaState() { return luaState_; };
    78     inline std::string getLuaOutput() { return output_; };
     76    inline const std::string& getLuaOutput() { return output_; };
    7977    //inline std::string* getFileString() { return &fileString_; };
    8078    inline void clearLuaOutput() { output_ = ""; }

  • code/branches/pch/src/core/MetaObjectList.cc

    r2171 r3154  
    3333
    3434#include "MetaObjectList.h"
     35
     36#include "util/Debug.h"
     37#include "Identifier.h"
    3538#include "ObjectListBase.h"
    36 #include "Identifier.h"
    37 #include "util/Debug.h"
    3839
    3940namespace orxonox

  • code/branches/pch/src/core/Namespace.cc

    r2087 r3154  
    2828
    2929#include "Namespace.h"
     30
     31#include <set>
     32
    3033#include "NamespaceNode.h"
    3134#include "CoreIncludes.h"

  • code/branches/pch/src/core/Namespace.h

    r2087 r3154  
    3232#include "CorePrereqs.h"
    3333
    34 #include <map>
    35 
     34#include <set>
     35#include <string>
    3636#include "XMLIncludes.h"
    3737#include "BaseObject.h"

  • code/branches/pch/src/core/ObjectListBase.cc

    r2784 r3154  
    3535*/
    3636
     37#include "ObjectListBase.h"
     38
    3739#include <set>
    38 
    39 #include "CorePrereqs.h"
    40 
    41 #include "ObjectListBase.h"
    4240#include "Identifier.h"
    4341#include "Iterator.h"
     42#include "ObjectListIterator.h"
    4443
    4544namespace orxonox

  • code/branches/pch/src/core/ObjectListBase.h

    r2896 r3154  
    3838#define _ObjectListBase_H__
    3939
     40#include "CorePrereqs.h"
     41
    4042#include <vector>
    41 
    42 #include "CorePrereqs.h"
     43#include "OrxonoxClass.h"
    4344
    4445namespace orxonox
    … …  
    139140
    140141        private:
    141             Identifier* identifier_;               //!< The Iterator owning this list
    142             ObjectListBaseElement* first_;         //!< The first element in the list
    143             ObjectListBaseElement* last_;          //!< The last element in the list
     142            Identifier* identifier_;                 //!< The Iterator owning this list
     143            ObjectListBaseElement* first_;           //!< The first element in the list
     144            ObjectListBaseElement* last_;            //!< The last element in the list
    144145            std::vector<void*> iterators_;           //!< A list of Iterators pointing on an element in this list
    145146            std::vector<void*> objectListIterators_; //!< A list of ObjectListIterators pointing on an element in this list

  • code/branches/pch/src/core/ObjectListIterator.h

    r2784 r3154  
    2828
    2929/**
    30     @file Iterator.h
     30    @file
    3131    @brief Definition and implementation of the Iterator class.
    3232
    … …  
    4747
    4848#include "CorePrereqs.h"
    49 #include "ObjectListBase.h"
     49#include "Identifier.h"
     50#include "ObjectList.h"
    5051
    5152namespace orxonox
    … …  
    230231}
    231232
    232 // Include ObjectList.h so the user only has to include one file: Iterator.h
    233 #include "ObjectList.h"
    234 
    235233#endif /* _ObjectListIterator_H__ */

  • code/branches/pch/src/core/OrxonoxClass.cc

    r2171 r3154  
    3333
    3434#include "OrxonoxClass.h"
     35
    3536#include "MetaObjectList.h"
    3637#include "Identifier.h"

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

    r2171 r3154  
    3939
    4040#include "CorePrereqs.h"
    41 
    4241#include <set>
    43 #include <string>
    4442
    4543namespace orxonox

  • code/branches/pch/src/core/Shell.cc

    r2662 r3154  
    2828
    2929#include "Shell.h"
     30
     31#include "util/OutputHandler.h"
    3032#include "CommandExecutor.h"
    3133#include "CoreIncludes.h"
    … …  
    3335#include "Core.h"
    3436#include "ConsoleCommand.h"
    35 #include "util/OutputHandler.h"
    3637
    3738#define SHELL_UPDATE_LISTENERS(function) \

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

    r1792 r3154  
    3232#include "CorePrereqs.h"
    3333
     34#include <cassert>
    3435#include <list>
     36#include <string>
    3537#include <vector>
    3638

  • code/branches/pch/src/core/Super.h

    r2662 r3154  
    6666#ifndef _Super_H__
    6767#define _Super_H__
    68 
    69 #include <iostream>
    7068
    7169#include "CorePrereqs.h"

  • code/branches/pch/src/core/TclBind.cc

    r2710 r3154  
    2929#include "TclBind.h"
    3030
    31 #include <iostream>
     31#include <exception>
    3232#include <string>
    33 #include "ConsoleCommand.h"
    34 #include "CommandExecutor.h"
    35 #include "TclThreadManager.h"
     33#include <cpptcl/cpptcl.h>
     34
    3635#include "util/Debug.h"
    3736#include "util/String.h"
     37#include "CommandExecutor.h"
     38#include "ConsoleCommand.h"
     39#include "TclThreadManager.h"
    3840
    3941namespace orxonox

  • code/branches/pch/src/core/TclBind.h

    r2710 r3154  
    3232#include "CorePrereqs.h"
    3333
    34 #include <cpptcl/cpptcl.h>
     34#include <cassert>
     35#include <string>
    3536
    3637namespace orxonox

  • code/branches/pch/src/core/TclThreadManager.cc

    r2896 r3154  
    2929#include "TclThreadManager.h"
    3030
    31 #include <iostream>
    32 #include <string>
    33 #include <boost/thread/thread.hpp>
    3431#include <boost/bind.hpp>
    3532#include <OgreTimer.h>
    36 
     33#include <cpptcl/cpptcl.h>
     34
     35#include "util/Convert.h"
     36#include "util/Debug.h"
    3737#include "Clock.h"
     38#include "CommandExecutor.h"
     39#include "ConsoleCommand.h"
    3840#include "CoreIncludes.h"
    39 #include "ConsoleCommand.h"
    40 #include "CommandExecutor.h"
    4141#include "TclBind.h"
    42 #include "util/Debug.h"
    43 #include "util/Convert.h"
    44 
    4542
    4643namespace orxonox

  • code/branches/pch/src/core/TclThreadManager.h

    r2896 r3154  
    3232#include "CorePrereqs.h"
    3333
    34 #include <queue>
     34#include <list>
    3535#include <map>
    36 #include <list>
    37 
     36#include <string>
     37#include <boost/thread/condition.hpp>
    3838#include <boost/thread/mutex.hpp>
    39 #include <boost/thread/condition.hpp>
    4039#include <boost/thread/thread.hpp>
    4140
    42 #include <cpptcl/cpptcl.h>
    4341#include "core/OrxonoxClass.h"
    4442

  • code/branches/pch/src/core/Template.cc

    r3068 r3154  
    2929#include "Template.h"
    3030
     31#include <tinyxml/tinyxml.h>
    3132#include <tinyxml/ticpp.h>
    3233
     34#include "util/Debug.h"
    3335#include "core/CoreIncludes.h"
    3436#include "core/XMLPort.h"
    35 #include "util/Debug.h"
    3637
    3738namespace orxonox
    … …  
    3940    CreateFactory(Template);
    4041
    41     Template::Template(BaseObject* creator) : BaseObject(creator), xmlelement_("")
     42    Template::Template(BaseObject* creator) : BaseObject(creator)
    4243    {
    4344        RegisterObject(Template);
    4445
     46        this->xmlelement_ = new TiXmlElement("");
    4547        this->bIsLink_ = false;
    4648        this->bLoadDefaults_ = true;
    … …  
    5254    {
    5355        Template::getTemplateMap().erase(this->getName());
     56        delete this->xmlelement_;
    5457    }
    5558
    … …  
    9093    }
    9194
     95    void Template::setXMLElement(const TiXmlElement& xmlelement)
     96    {
     97        *this->xmlelement_ = xmlelement;
     98    }
     99
    92100    const TiXmlElement& Template::getXMLElement() const
    93101    {
    … …  
    115123        }
    116124
    117         return this->xmlelement_;
     125        return *this->xmlelement_;
    118126    }
    119127

  • code/branches/pch/src/core/Template.h

    r3068 r3154  
    3030#define _Template_H__
    3131
    32 #include <map>
    33 
    3432#include "CorePrereqs.h"
    3533
    36 #include <tinyxml/tinyxml.h>
     34#include <map>
     35#include <string>
    3736#include "BaseObject.h"
    3837
    … …  
    5857                { return this->bLoadDefaults_; }
    5958
    60             inline void setXMLElement(const TiXmlElement& xmlelement)
    61                 { this->xmlelement_ = xmlelement; }
     59            void setXMLElement(const TiXmlElement& xmlelement);
    6260            const TiXmlElement& getXMLElement() const;
    6361
    … …  
    7573
    7674        private:
    77             TiXmlElement xmlelement_;
     75            TiXmlElement* xmlelement_;
    7876            std::string link_;
    7977            std::string baseclass_;

  • code/branches/pch/src/core/XMLFile.h

    r3068 r3154  
    3333
    3434#include <string>
    35 
    3635#include "ClassTreeMask.h"
    3736

  • code/branches/pch/src/core/XMLPort.cc

    r1789 r3154  
    2828
    2929#include "XMLPort.h"
    30 #include "Language.h"
     30
    3131#include "Loader.h"
    3232#include "Namespace.h"
    33 #include "CoreIncludes.h"
    3433
    3534namespace orxonox
    … …  
    4039    bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
    4140    {
    42         return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
     41        return ((!this->bApplyLoaderMask_) || identifier->isA(ClassIdentifier<Namespace>::getIdentifier()) || Loader::currentMask_s.isIncluded(identifier));
    4342    }
    4443}

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

    r3149 r3154  
    4444
    4545#include <cassert>
     46#include <string>
    4647#include <tinyxml/ticpp.h>
     48
    4749#include "util/Debug.h"
    4850#include "util/Exception.h"
     51#include "util/MultiType.h"
    4952#include "util/OrxAssert.h"
    50 #include "util/MultiType.h"
     53#include "Identifier.h"
     54#include "Executor.h"
     55#include "BaseObject.h"
    5156#include "XMLIncludes.h"
    52 #include "Executor.h"
    53 #include "CoreIncludes.h"
    54 #include "BaseObject.h"
    5557
    5658// ------------
    … …  
    177179*/
    178180#define XMLPortParamGeneric(containername, classname, objectclass, object, paramname, loadexecutor, saveexecutor, xmlelement, mode) \
    179     orxonox::XMLPortClassParamContainer<objectclass>* containername = (orxonox::XMLPortClassParamContainer<objectclass>*)(ClassIdentifier<classname>::getIdentifier()->getXMLPortParamContainer(paramname)); \
     181    orxonox::XMLPortClassParamContainer<objectclass>* containername = static_cast<orxonox::XMLPortClassParamContainer<objectclass>*>(ClassIdentifier<classname>::getIdentifier()->getXMLPortParamContainer(paramname)); \
    180182    if (!containername) \
    181183    { \
    … …  
    546548                            for (ticpp::Iterator<ticpp::Element> child = xmlsubelement->FirstChildElement(false); child != child.end(); child++)
    547549                            {
    548                                 Identifier* identifier = ClassByString(child->Value());
     550                                Identifier* identifier = Factory::getIdentifier(child->Value());
    549551                                if (identifier)
    550552                                {
    551                                     if (identifier->isA(Class(O)))
     553                                    if (identifier->isA(ClassIdentifier<O>::getIdentifier()))
    552554                                    {
    553555                                        if (identifier->isLoadable())
    … …  
    607609                                    else
    608610                                    {
    609                                         COUT(2) << object->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << Class(O)->getName() << "'." << std::endl;
     611                                        COUT(2) << object->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << ClassIdentifier<O>::getIdentifier()->getName() << "'." << std::endl;
    610612                                    }
    611613                                }
    … …  
    627629                    {
    628630                        COUT(1) << std::endl;
    629                         COUT(1) << "An error occurred in XMLPort.h while loading a '" << Class(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << object->getName() << ") in " << object->getFilename() << ":" << std::endl;
     631                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << ClassIdentifier<O>::getIdentifier()->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << object->getName() << ") in " << object->getFilename() << ":" << std::endl;
    630632                        COUT(1) << ex.what() << std::endl;
    631633                    }

  • code/branches/pch/src/core/input/InputManager.cc

    r3150 r3154  
    4141#include <ois/OISInputManager.h>
    4242
     43#include "util/Convert.h"
    4344#include "util/Exception.h"
    4445#include "util/Debug.h"
    … …  
    4849#include "core/ConsoleCommand.h"
    4950#include "core/CommandLine.h"
     51#include "core/ObjectList.h"
    5052
    5153#include "InputBuffer.h"

  • code/branches/pch/src/network/GamestateClient.cc

    r3102 r3154  
    3434#include "core/CoreIncludes.h"
    3535#include "core/BaseObject.h"
    36 #include "core/Iterator.h"
     36#include "core/ObjectList.h"
    3737#include "synchronisable/Synchronisable.h"
    3838#include "synchronisable/NetworkCallbackManager.h"

  • code/branches/pch/src/network/NetworkFunction.h

    r3084 r3154  
    3737#include <cassert>
    3838#include "util/MultiType.h"
     39#include "core/Functor.h"
    3940#include "synchronisable/Synchronisable.h"
    4041#include "OrxonoxConfig.h"

  • code/branches/pch/src/network/Server.cc

    r3102 r3154  
    5454#include "core/ConsoleCommand.h"
    5555#include "core/CoreIncludes.h"
    56 #include "core/Iterator.h"
     56#include "core/ObjectList.h"
    5757#include "packet/Chat.h"
    5858#include "packet/Packet.h"

  • code/branches/pch/src/network/packet/Gamestate.cc

    r3084 r3154  
    3636#include "core/GameMode.h"
    3737#include "core/CoreIncludes.h"
    38 #include "core/Iterator.h"
     38#include "core/ObjectList.h"
    3939
    4040

  • code/branches/pch/src/orxonox/CameraManager.cc

    r3131 r3154  
    3434#include "util/String.h"
    3535#include "core/GameMode.h"
    36 #include "core/Iterator.h"
     36#include "core/ObjectList.h"
    3737#include "tools/Shader.h"
    3838#include "objects/worldentities/Camera.h"

  • code/branches/pch/src/orxonox/gamestates/GSLevel.cc

    r3110 r3154  
    148148        if (show)
    149149        {
    150             GUIManager::getInstancePtr()->showGUI("inGameTest");
    151             GUIManager::getInstancePtr()->executeCode("showCursor()");
     150            GUIManager::getInstance().showGUI("inGameTest");
     151            GUIManager::getInstance().executeCode("showCursor()");
    152152            InputManager::getInstance().requestEnterState("guiMouseOnly");
    153153        }
    154154        else
    155155        {
    156             GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
    157             GUIManager::getInstancePtr()->executeCode("hideCursor()");
     156            GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
     157            GUIManager::getInstance().executeCode("hideCursor()");
    158158            InputManager::getInstance().requestLeaveState("guiMouseOnly");
    159159        }

  • code/branches/pch/src/orxonox/objects/Radar.cc

    r3110 r3154  
    3737#include "core/CoreIncludes.h"
    3838#include "core/ConsoleCommand.h"
    39 #include "core/Iterator.h"
     39#include "core/ObjectList.h"
    4040#include "RadarListener.h"
    4141

  • code/branches/pch/src/orxonox/objects/Radar.h

    r1818 r3154  
    3939#include <map>
    4040#include <string>
    41 #include "core/Iterator.h"
     41#include "core/ObjectList.h"
    4242#include "core/OrxonoxClass.h"
    4343#include "objects/Tickable.h"

  • code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc

    r3110 r3154  
    3434#include "core/Executor.h"
    3535#include "core/ConfigValueIncludes.h"
    36 #include "core/Iterator.h"
     36#include "core/ObjectList.h"
    3737#include "tools/ParticleInterface.h"
    3838

  • code/branches/pch/src/orxonox/objects/worldentities/Camera.cc

    r3110 r3154  
    3737
    3838#include "util/Exception.h"
     39#include "util/String.h"
    3940#include "core/CoreIncludes.h"
    4041#include "core/ConfigValueIncludes.h"

  • code/branches/pch/src/orxonox/overlays/OverlayGroup.cc

    r3110 r3154  
    3737#include "core/ConsoleCommand.h"
    3838#include "core/CoreIncludes.h"
    39 #include "core/Iterator.h"
     39#include "core/ObjectList.h"
    4040#include "core/XMLPort.h"
    4141#include "OrxonoxOverlay.h"

  • code/branches/pch/src/orxonox/overlays/map/Map.cc

    r3144 r3154  
    3131#include <OgreBorderPanelOverlayElement.h>
    3232#include <OgreCamera.h>
     33#include <OgreEntity.h>
    3334#include <OgreHardwarePixelBuffer.h>
    3435#include <OgreMaterialManager.h>
    … …  
    5051#include "core/ConsoleCommand.h"
    5152#include "core/CoreIncludes.h"
    52 #include "core/Iterator.h"
     53#include "core/ObjectList.h"
    5354#include "core/XMLPort.h"
    5455#include "objects/Scene.h"
    … …  
    265266    }
    266267
    267     Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, std::string matName)
     268    Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, const std::string& matName)
    268269    {
    269270        Ogre::TexturePtr rttTex = Ogre::TextureManager::getSingleton().createManual(matName+"_tex", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 512, 512, 0, Ogre::PF_R8G8B8, Ogre::TU_RENDERTARGET);

  • code/branches/pch/src/orxonox/overlays/map/Map.h

    r3144 r3154  
    3030#include "OrxonoxPrereqs.h"
    3131
    32 #include <string>
    3332#include <OgreMaterial.h>
    3433
    … …  
    5049        virtual void changedOwner();
    5150
    52         static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, std::string matName);
     51        static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, const std::string& matName);
    5352
    5453        static void openMap();
Note: See TracChangeset for help on using the changeset viewer.