Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 23, 2010, 1:08:14 AM (14 years ago)
Author:
landauf
Message:

adjusted includes in all other files

Location:
code/branches/consolecommands3/src/libraries
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • code/branches/consolecommands3/src/libraries/core/BaseObject.cc

    r7200 r7204  
    3939#include "Event.h"
    4040#include "EventIncludes.h"
    41 #include "Functor.h"
    4241#include "Iterator.h"
    4342#include "Template.h"
    … …  
    4544#include "XMLNameListener.h"
    4645#include "XMLPort.h"
     46#include "command/Functor.h"
    4747
    4848namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc

    r7190 r7204  
    3434#include "util/Math.h"
    3535#include "util/StringUtils.h"
    36 #include "ConsoleCommand.h"
    3736#include "ConfigValueContainer.h"
    3837#include "PathConfig.h"
     38#include "command/ConsoleCommand.h"
    3939
    4040namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/Core.cc

    r7175 r7204  
    5454#include "util/SignalHandler.h"
    5555#include "PathConfig.h"
    56 #include "CommandExecutor.h"
    5756#include "CommandLineParser.h"
    5857#include "ConfigFileManager.h"
    … …  
    6564#include "Identifier.h"
    6665#include "Language.h"
    67 #include "IOConsole.h"
    6866#include "LuaState.h"
    6967#include "ScopedSingletonManager.h"
    70 #include "TclBind.h"
    71 #include "TclThreadManager.h"
     68#include "command/CommandExecutor.h"
     69#include "command/IOConsole.h"
     70#include "command/TclBind.h"
     71#include "command/TclThreadManager.h"
    7272#include "input/InputManager.h"
    7373

  • code/branches/consolecommands3/src/libraries/core/CorePrereqs.h

    r7199 r7204  
    116116    typedef std::string LanguageEntryLabel;
    117117
    118     class ArgumentCompleter;
    119     class ArgumentCompletionListElement;
    120118    class BaseObject;
    121119    template <class T>
    … …  
    127125    class ClassTreeMaskNode;
    128126    class ClassTreeMaskObjectIterator;
    129     class CommandEvaluation;
    130127    class CommandLineParser;
    131128    class CommandLineArgument;
    … …  
    137134    class ConfigFileSection;
    138135    class ConfigValueContainer;
    139     class ConsoleCommand;
    140136    class Core;
    141137    class DynLib;
    … …  
    143139    struct Event;
    144140    class EventState;
    145     class Executor;
    146     template <class T>
    147     class ExecutorMember;
    148     class ExecutorStatic;
    149141    class Factory;
    150     class Functor;
    151     template <class T>
    152     class FunctorMember;
    153     class FunctorStatic;
    154142    class Game;
    155143    class GameState;
    … …  
    159147    class GUIManager;
    160148    class Identifier;
    161     class IOConsole;
    162     class IRC;
    163149    template <class T>
    164150    class Iterator;
    … …  
    185171    struct ResourceInfo;
    186172    class SettingsConfigFile;
    187     class Shell;
    188     class ShellListener;
    189173    template <class T>
    190174    class SmartPtr;
    191175    template <class T>
    192176    class SubclassIdentifier;
    193     class TclBind;
    194     struct TclInterpreterBundle;
    195     template <class T>
    196     class TclThreadList;
    197     class TclThreadManager;
    198177    class Template;
    199178    class Thread;
    … …  
    210189    class XMLPortObjectContainer;
    211190    class XMLPortParamContainer;
     191
     192    // Command
     193    class ArgumentCompleter;
     194    class ArgumentCompletionListElement;
     195    class CommandEvaluation;
     196    class ConsoleCommand;
     197    class Executor;
     198    template <class T>
     199    class ExecutorMember;
     200    class ExecutorStatic;
     201    class Functor;
     202    template <class T>
     203    class FunctorMember;
     204    class FunctorStatic;
     205    class IOConsole;
     206    class IRC;
     207    class Shell;
     208    class ShellListener;
     209    class TclBind;
     210    struct TclInterpreterBundle;
     211    template <class T>
     212    class TclThreadList;
     213    class TclThreadManager;
    212214
    213215    // Input
    … …  
    236238}
    237239
    238 #include "FunctorPtr.h"
    239 #include "ExecutorPtr.h"
     240#include "command/FunctorPtr.h"
     241#include "command/ExecutorPtr.h"
    240242
    241243// CppTcl

  • code/branches/consolecommands3/src/libraries/core/EventIncludes.h

    r7200 r7204  
    3131
    3232#include "CorePrereqs.h"
    33 #include "Executor.h"
    3433#include "XMLPort.h"
     34#include "command/Executor.h"
    3535
    3636/**

  • code/branches/consolecommands3/src/libraries/core/GUIManager.cc

    r7163 r7204  
    5757#include "util/Exception.h"
    5858#include "util/OrxAssert.h"
    59 #include "ConsoleCommand.h"
    6059#include "Core.h"
    6160#include "GraphicsManager.h"
    … …  
    6362#include "PathConfig.h"
    6463#include "Resource.h"
     64#include "command/ConsoleCommand.h"
    6565#include "input/InputManager.h"
    6666#include "input/InputState.h"

  • code/branches/consolecommands3/src/libraries/core/Game.cc

    r6502 r7204  
    4545#include "util/SubString.h"
    4646#include "CommandLineParser.h"
    47 #include "ConsoleCommand.h"
    4847#include "Core.h"
    4948#include "CoreIncludes.h"
    … …  
    5251#include "GameState.h"
    5352#include "GUIManager.h"
     53#include "command/ConsoleCommand.h"
    5454
    5555namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc

    r6524 r7204  
    5252#include "util/StringUtils.h"
    5353#include "util/SubString.h"
    54 #include "ConsoleCommand.h"
    5554#include "ConfigValueIncludes.h"
    5655#include "CoreIncludes.h"
    … …  
    6261#include "WindowEventListener.h"
    6362#include "XMLFile.h"
     63#include "command/ConsoleCommand.h"
    6464
    6565namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/Identifier.cc

    r6536 r7204  
    3838#include "util/StringUtils.h"
    3939#include "ConfigValueContainer.h"
    40 #include "ConsoleCommand.h"
    4140#include "ClassFactory.h"
    4241#include "XMLPort.h"
     42#include "command/ConsoleCommand.h"
    4343
    4444namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/LuaState.cc

    r7199 r7204  
    3939#include "util/Exception.h"
    4040#include "util/ScopeGuard.h"
    41 #include "IOConsole.h"
    4241#include "Resource.h"
    4342#include "ToluaBindCore.h"
     43#include "command/IOConsole.h"
    4444
    4545namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/Thread.cc

    r7200 r7204  
    3636
    3737#include "util/Sleep.h"
    38 #include "Executor.h"
     38#include "command/Executor.h"
    3939
    4040namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/WeakPtr.h

    r7198 r7204  
    3636#include <cassert>
    3737#include "OrxonoxClass.h"
    38 #include "Functor.h"
     38#include "command/Functor.h"
    3939
    4040namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/XMLPort.h

    r7200 r7204  
    5353#include "util/StringUtils.h"
    5454#include "Identifier.h"
    55 #include "Executor.h"
    5655#include "BaseObject.h"
     56#include "command/Executor.h"
    5757
    5858// ------------

  • code/branches/consolecommands3/src/libraries/core/input/Button.cc

    r6536 r7204  
    3939#include "util/StringUtils.h"
    4040#include "util/Debug.h"
    41 #include "core/ConsoleCommand.h"
    42 #include "core/CommandEvaluation.h"
    43 #include "core/CommandExecutor.h"
     41#include "core/command/ConsoleCommand.h"
     42#include "core/command/CommandEvaluation.h"
     43#include "core/command/CommandExecutor.h"
    4444#include "core/ConfigFileManager.h"
    4545

  • code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc

    r5781 r7204  
    3434
    3535#include "HalfAxis.h"
    36 #include "core/CommandEvaluation.h"
     36#include "core/command/CommandEvaluation.h"
    3737
    3838namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/input/InputCommands.h

    r6417 r7204  
    3737
    3838#include "InputPrereqs.h"
    39 #include "core/CommandEvaluation.h"
     39#include "core/command/CommandEvaluation.h"
    4040
    4141namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/input/InputManager.cc

    r7174 r7204  
    4747#include "core/CoreIncludes.h"
    4848#include "core/ConfigValueIncludes.h"
    49 #include "core/ConsoleCommand.h"
    5049#include "core/CommandLineParser.h"
    51 #include "core/Functor.h"
    5250#include "core/GraphicsManager.h"
     51#include "core/command/ConsoleCommand.h"
     52#include "core/command/Functor.h"
    5353
    5454#include "InputBuffer.h"

  • code/branches/consolecommands3/src/libraries/core/input/InputState.cc

    r6746 r7204  
    2828
    2929#include "InputState.h"
    30 #include "core/Functor.h"
     30#include "core/command/Functor.h"
    3131
    3232namespace orxonox

  • code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

    r7199 r7204  
    3232#include "util/Exception.h"
    3333#include "core/ConfigValueIncludes.h"
    34 #include "core/ConsoleCommand.h"
    3534#include "core/CoreIncludes.h"
    3635#include "core/LuaState.h"
    3736#include "core/ScopedSingletonManager.h"
     37#include "core/command/ConsoleCommand.h"
    3838#include "InputManager.h"
    3939#include "KeyDetector.h"

  • code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc

    r6428 r7204  
    2929#include "KeyDetector.h"
    3030
    31 #include "core/ConsoleCommand.h"
    3231#include "core/CoreIncludes.h"
    3332#include "core/ScopedSingletonManager.h"
     33#include "core/command/ConsoleCommand.h"
    3434#include "Button.h"
    3535#include "InputManager.h"

  • code/branches/consolecommands3/src/libraries/core/input/Mouse.cc

    r5929 r7204  
    3030
    3131#include <ois/OISMouse.h>
    32 #include "core/ConsoleCommand.h"
    3332#include "core/CoreIncludes.h"
     33#include "core/command/ConsoleCommand.h"
    3434#include "InputState.h"
    3535

  • code/branches/consolecommands3/src/libraries/network/GamestateManager.cc

    r7163 r7204  
    4747
    4848#include "util/Debug.h"
    49 #include "core/Executor.h"
    5049#include "core/ThreadPool.h"
     50#include "core/command/Executor.h"
    5151#include "ClientInformation.h"
    5252#include "packet/Acknowledgement.h"

  • code/branches/consolecommands3/src/libraries/network/Host.cc

    r7190 r7204  
    3232#include <string>
    3333
    34 #include "core/ConsoleCommand.h"
    3534#include "core/ObjectList.h"
     35#include "core/command/ConsoleCommand.h"
    3636#include "ChatListener.h"
    3737

  • code/branches/consolecommands3/src/libraries/network/NetworkFunction.h

    r7198 r7204  
    3939#include <boost/static_assert.hpp>
    4040
    41 #include "core/Functor.h"
    4241#include "core/Identifier.h"
     42#include "core/command/Functor.h"
    4343#include "FunctionCallManager.h"
    4444#include "synchronisable/Synchronisable.h"

  • code/branches/consolecommands3/src/libraries/network/Server.cc

    r7163 r7204  
    4949#include "util/Debug.h"
    5050#include "core/ObjectList.h"
    51 #include "core/Executor.h"
     51#include "core/command/Executor.h"
    5252#include "packet/Chat.h"
    5353#include "packet/ClassID.h"

  • code/branches/consolecommands3/src/libraries/tools/Timer.cc

    r7200 r7204  
    3333#include "util/Clock.h"
    3434#include "core/CoreIncludes.h"
    35 #include "core/ConsoleCommand.h"
    36 #include "core/CommandExecutor.h"
    37 #include "core/Functor.h"
     35#include "core/command/ConsoleCommand.h"
     36#include "core/command/CommandExecutor.h"
     37#include "core/command/Functor.h"
    3838
    3939namespace orxonox

  • code/branches/consolecommands3/src/libraries/tools/Timer.h

    r7200 r7204  
    4444
    4545    source.cc:
    46         include "core/Executor.h"
     46        #include "core/command/Executor.h"
    4747
    4848        ClassName::ClassName()
    … …  
    6363#include "tools/ToolsPrereqs.h"
    6464
    65 #include "core/Executor.h"
    6665#include "core/OrxonoxClass.h"
     66#include "core/command/Executor.h"
    6767#include "tools/interfaces/TimeFactorListener.h"
    6868
Note: See TracChangeset for help on using the changeset viewer.