Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1764


Ignore:
Timestamp:
Sep 10, 2008, 1:11:19 PM (16 years ago)
Author:
rgrieder
Message:

Moved Exception to util now that debug has been moved.

Location:
code/trunk
Files:
11 edited
2 moved

Legend:

Unmodified
Added
Removed
  • code/trunk/src/core/CMakeLists.txt

    r1755 r1764  
    44  ConfigValueContainer.cc
    55  Core.cc
    6   Exception.cc
    76  GameState.cc
    87  Language.cc
  • code/trunk/src/core/CommandLine.h

    r1755 r1764  
    3434#include "util/Convert.h"
    3535#include "util/Debug.h"
    36 #include "Exception.h"
     36#include "util/Exception.h"
    3737
    3838#define SetCommandLineArgument(name, defaultValue) \
  • code/trunk/src/core/GameState.cc

    r1755 r1764  
    3535#include "GameState.h"
    3636#include "util/Debug.h"
    37 #include "Exception.h"
     37#include "util/Exception.h"
    3838
    3939namespace orxonox
  • code/trunk/src/core/RootGameState.cc

    r1756 r1764  
    3232#include "util/SubString.h"
    3333#include "util/Debug.h"
     34#include "util/Exception.h"
    3435#include "Core.h"
    3536#include "Clock.h"
    36 #include "Exception.h"
    3737#include "CommandLine.h"
    3838
  • code/trunk/src/core/input/InputManager.cc

    r1755 r1764  
    4242#include "ois/OISInputManager.h"
    4343
     44#include "util/Exception.h"
    4445#include "core/CoreIncludes.h"
    4546#include "core/ConfigValueIncludes.h"
    46 #include "core/Exception.h"
    4747#include "core/CommandExecutor.h"
    4848#include "core/ConsoleCommand.h"
  • code/trunk/src/orxonox/gamestates/GSGraphics.cc

    r1755 r1764  
    4141
    4242#include "util/Debug.h"
     43#include "util/Exception.h"
    4344#include "core/ConsoleCommand.h"
    4445#include "core/ConfigValueIncludes.h"
    4546#include "core/CoreIncludes.h"
    4647#include "core/input/InputManager.h"
    47 #include "core/Exception.h"
    4848#include "overlays/console/InGameConsole.h"
    4949#include "gui/GUIManager.h"
  • code/trunk/src/orxonox/gamestates/GSRoot.cc

    r1755 r1764  
    3434
    3535//#include "util/SubString.h"
     36#include "util/Exception.h"
     37#include "util/Debug.h"
    3638#include "core/Factory.h"
    3739#include "core/ConfigFileManager.h"
     
    4042#include "core/ConsoleCommand.h"
    4143#include "core/CommandLine.h"
    42 #include "util/Debug.h"
    43 #include "core/Exception.h"
    4444#include "core/TclBind.h"
    4545#include "core/TclThreadManager.h"
  • code/trunk/src/orxonox/gui/GUIManager.cc

    r1755 r1764  
    4040#include <CEGUI.h>
    4141#include <CEGUILua.h>
     42#include "util/Exception.h"
    4243#include "core/input/InputManager.h"
    4344#include "core/input/SimpleInputState.h"
    4445#include "core/tolua/tolua_bind.h"
    4546#include "core/ConsoleCommand.h"
    46 #include "core/Exception.h"
    4747#include "core/Core.h"
    4848#include "tolua/tolua_bind.h"
  • code/trunk/src/util/CMakeLists.txt

    r1755 r1764  
    33  Error.cc
    44  CRC32.cc
     5  Exception.cc
    56  ExprParser.cc
    67  Math.cc
  • code/trunk/src/util/Exception.cc

  • code/trunk/src/util/Exception.h

    r1761 r1764  
    3636#define _Exception_H__
    3737
    38 #include "CorePrereqs.h"
     38#include "UtilPrereqs.h"
    3939
    4040#include <string>
    4141#include <exception>
    4242#include <cassert>
    43 #include "util/Debug.h"
     43#include "Debug.h"
    4444
    4545// Define some ugly macros to make things more clear
     
    5252namespace orxonox
    5353{
    54     class _CoreExport Exception : public std::exception
     54    class _UtilExport Exception : public std::exception
    5555    {
    5656    public:
  • code/trunk/visual_studio/vc8/core.vcproj

    r1755 r1764  
    165165                        </File>
    166166                        <File
    167                                 RelativePath="..\..\src\core\Exception.cc"
    168                                 >
    169                         </File>
    170                         <File
    171167                                RelativePath="..\..\src\core\GameState.cc"
    172168                                >
     
    396392                        </File>
    397393                        <File
    398                                 RelativePath="..\..\src\core\Exception.h"
    399                                 >
    400                         </File>
    401                         <File
    402394                                RelativePath="..\..\src\core\GameState.h"
    403395                                >
  • code/trunk/visual_studio/vc8/util.vcproj

    r1755 r1764  
    161161                        </File>
    162162                        <File
     163                                RelativePath="..\..\src\util\Exception.cc"
     164                                >
     165                        </File>
     166                        <File
    163167                                RelativePath="..\..\src\util\ExprParser.cc"
    164168                                >
     
    215219                        </File>
    216220                        <File
     221                                RelativePath="..\..\src\util\Exception.h"
     222                                >
     223                        </File>
     224                        <File
    217225                                RelativePath="..\..\src\util\ExprParser.h"
    218226                                >
Note: See TracChangeset for help on using the changeset viewer.