Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 2, 2009, 11:41:00 AM (15 years ago)
Author:
rgrieder
Message:

Cleanup in *Prereqs.h files

  • Removed forward declarations to non-existent classes
  • Ordered all declarations by name and folder
  • introduce new section: "Enums" for those files with enums.
  • Added missing declarations
Location:
code/branches/core5/src/libraries/core
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/libraries/core/BaseObject.cc

    r5839 r5858  
    4646#include "XMLNameListener.h"
    4747#include "XMLPort.h"
    48 #include "network/NetworkPrereqs.h"
    4948
    5049namespace orxonox
  • code/branches/core5/src/libraries/core/CorePrereqs.h

    r5855 r5858  
    2828
    2929/**
    30   @file
    31   @brief Contains all the necessary forward declarations for all classes and structs.
     30@file
     31@brief
     32    Shared library macros, enums, constants and forward declarations for the core library
    3233*/
    3334
     
    4041// Shared library settings
    4142//-----------------------------------------------------------------------
     43
    4244#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( CORE_STATIC_BUILD )
    4345#  ifdef CORE_SHARED_BUILD
     
    5658#endif
    5759
    58 
    59 //-----------------------------------------------------------------------
    60 // Forward declarations
    61 //-----------------------------------------------------------------------
     60//-----------------------------------------------------------------------
     61// Constants
     62//-----------------------------------------------------------------------
     63
     64namespace orxonox
     65{
     66    static const uint32_t OBJECTID_UNKNOWN = static_cast<uint32_t>(-1);
     67}
     68
     69//-----------------------------------------------------------------------
     70// Enums
     71//-----------------------------------------------------------------------
     72
    6273namespace orxonox
    6374{
     
    8293        };
    8394    };
    84 
     95}
     96
     97//-----------------------------------------------------------------------
     98// Forward declarations
     99//-----------------------------------------------------------------------
     100
     101namespace orxonox
     102{
    85103    typedef std::string LanguageEntryLabel;
    86104
    87105    class ArgumentCompleter;
    88106    class ArgumentCompletionListElement;
    89     class BaseMetaObjectListElement;
    90107    class BaseObject;
    91108    template <class T>
     
    98115    class ClassTreeMaskObjectIterator;
    99116    class CommandEvaluation;
    100     class CommandExecutor;
    101117    class CommandLine;
    102118    class CommandLineArgument;
     
    107123    class ConfigFileManager;
    108124    class ConfigFileSection;
     125    struct ConfigFileType;
    109126    class ConfigValueContainer;
    110127    class ConsoleCommand;
     
    123140    class FunctorMember;
    124141    class FunctorStatic;
     142    class Game;
     143    class GameState;
     144    struct GameStateInfo;
     145    struct GameStateTreeNode;
    125146    class GraphicsManager;
    126147    class GUIManager;
     
    129150    template <class T>
    130151    class Iterator;
    131     class IteratorBase;
    132152    class Language;
    133     class LanguageEntry;
    134     class Loader;
    135153    class LuaState;
    136154    class MemoryArchive;
     
    164182    class TclThreadManager;
    165183    class Template;
     184    class Thread;
     185    class ThreadPool;
    166186    template <class T>
    167187    class WeakPtr;
     
    176196    class XMLPortParamContainer;
    177197
    178     // game states
    179     class Game;
    180     class GameState;
    181     struct GameStateInfo;
    182     struct GameStateTreeNode;
    183 
    184     // input
     198    // Input
    185199    class BaseCommand;
    186200    class BufferedParamCommand;
    187201    class Button;
    188     class CalibratorCallback;
    189202    class HalfAxis;
    190203    class InputBuffer;
     
    195208    class InputManager;
    196209    class InputState;
     210    struct InputStatePriority;
     211    class JoyStickQuantityListener;
    197212    class JoyStick;
     213    class KeyBinder;
     214    class Keyboard;
     215    class KeyDetector;
     216    class KeyEvent;
    198217    class Mouse;
    199     class Keyboard;
    200     class KeyBinder;
    201     class KeyDetector;
    202218    class ParamCommand;
    203219    class SimpleCommand;
    204 
    205 
    206     // multithreading
    207     class Thread;
    208     class ThreadPool;
    209220}
    210221
     
    285296namespace orxonox
    286297{
    287     using ticpp::Document;
    288298    using ticpp::Element;
    289     using ticpp::Declaration;
    290     using ticpp::StylesheetReference;
    291     using ticpp::Text;
    292     using ticpp::Comment;
    293     using ticpp::Attribute;
    294 }
    295 
     299}
    296300
    297301#endif /* _CorePrereqs_H__ */
  • code/branches/core5/src/libraries/core/XMLPort.h

    r5778 r5858  
    376376                            this->owner_->xmlAttributes_.clear();
    377377                            // Iterate through the attributes manually in order to make them case insensitive
    378                             Attribute* attribute = xmlelement.FirstAttribute(false);
     378                            ticpp::Attribute* attribute = xmlelement.FirstAttribute(false);
    379379                            while (attribute != 0)
    380380                            {
Note: See TracChangeset for help on using the changeset viewer.