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
Files:
7 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                            {

  • code/branches/core5/src/libraries/network/NetworkPrereqs.h

    r5738 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 network library
    3233*/
    3334
    … …  
    4041// Shared library settings
    4142//-----------------------------------------------------------------------
     43
    4244#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( NETWORK_STATIC_BUILD )
    4345#  ifdef NETWORK_SHARED_BUILD
    … …  
    5759
    5860//-----------------------------------------------------------------------
    59 // Library global contants
     61// Constants
    6062//-----------------------------------------------------------------------
     63
    6164namespace orxonox
    6265{
    6366  static const unsigned int GAMESTATEID_INITIAL = static_cast<unsigned int>(-1);
    6467  static const unsigned int CLIENTID_UNKNOWN    = static_cast<unsigned int>(-2);
    65   static const uint32_t     OBJECTID_UNKNOWN    = static_cast<uint32_t>(-1);
     68}
     69
     70//-----------------------------------------------------------------------
     71// Enums
     72//-----------------------------------------------------------------------
     73
     74namespace orxonox
     75{
     76  namespace packet
     77  {
     78    namespace PacketFlag
     79    {
     80      enum Value
     81      {
     82        Reliable   = 1,
     83        Unsequence = 2,
     84        NoAllocate = 4
     85      };
     86    }
     87  }
    6688}
    6789
    … …  
    84106namespace orxonox
    85107{
     108  class ChatListener;
    86109  class Client;
    87110  class ClientConnection;
    88111  class ClientConnectionListener;
    89   class ClientFrameListener;
    90112  class ClientInformation;
    91113  class Connection;
    92114  class FunctionCallManager;
    93115  class GamestateClient;
     116  class GamestateHandler;
    94117  class GamestateManager;
    95   class GamestateHandler;
    96   class NetworkCallbackBase;
    97   template <class T> class NetworkCallback;
    98   class NetworkCallbackManager;
     118  class Host;
    99119  class NetworkFunctionBase;
     120  struct NetworkFunctionPointer;
    100121  class NetworkFunctionStatic;
     122  template <class T>
     123  class NetworkMemberFunction;
    101124  class NetworkMemberFunctionBase;
    102   template <class T> class NetworkMemeberFunction;
    103   struct NetworkFunctionPointer;
    104125  class Server;
    105126  class ServerConnection;
    106   class ServerFrameListener;
    107   class Synchronisable;
    108   class SynchronisableVariableBase;
    109   template <class T> class SynchronisableVariable;
    110   template <class T> class SynchronisableVariableBidirectional;
    111   struct ClientList;
    112   struct PacketEnvelope;
    113   struct QueueItem;
    114   struct syncData;
    115127  class TrafficControl;
    116   class obj;
    117   class objInfo;
    118128
     129  // packet
    119130  namespace packet
    120131  {
    … …  
    122133    class Chat;
    123134    class ClassID;
     135    class DeleteObjects;
    124136    class FunctionCalls;
    125137    class FunctionIDs;
    126138    class Gamestate;
    127     class NetworkIDs;
    128139    class Packet;
    129140    class Welcome;
     141  }
    130142
    131     namespace PacketFlag
    132     {
    133       enum Value
    134       {
    135         Reliable   = 1,
    136         Unsequence = 2,
    137         NoAllocate = 4
    138       };
    139     }
    140   }
     143  // synchronisable
     144  template <class T>
     145  class NetworkCallback;
     146  class NetworkCallbackBase;
     147  class NetworkCallbackManager;
     148  class Synchronisable;
     149  class SynchronisableHeader;
     150  template <class T>
     151  class SynchronisableVariable;
     152  class SynchronisableVariableBase;
     153  template <class T>
     154  class SynchronisableVariableBidirectional;
    141155}
    142156

  • code/branches/core5/src/libraries/tools/ToolsPrereqs.h

    r5831 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 tools module
    3233*/
    3334
    … …  
    4041// Shared library settings
    4142//-----------------------------------------------------------------------
     43
    4244#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
    4345#  ifdef TOOLS_SHARED_BUILD
    … …  
    5759
    5860//-----------------------------------------------------------------------
    59 // Forward declarations
     61// Enums
    6062//-----------------------------------------------------------------------
    6163
    … …  
    7274        };
    7375    }
     76}
    7477
     78//-----------------------------------------------------------------------
     79// Forward declarations
     80//-----------------------------------------------------------------------
     81
     82namespace orxonox
     83{
    7584    class BillboardSet;
    7685    class Mesh;
    7786    class ParticleInterface;
     87    class ResourceCollection;
     88    class ResourceLocation;
    7889    class Shader;
     90    class Tickable;
     91    class TimeFactorListener;
    7992    class Timer;
    8093}

  • code/branches/core5/src/libraries/util/Scope.h

    r5850 r5858  
    3939namespace orxonox
    4040{
    41     namespace ScopeID
    42     {
    43         /**
    44             @brief A list of available scopes for the Scope template.
    45         */
    46         enum Value
    47         {
    48             Root,
    49             Graphics
    50         };
    51     }
    52 
    53     // Forward declarations
    54     class ScopeListener;
    55     class Clock;
    56 
    5741    /**
    5842        @brief The ScopeManager stores the variables of the scope templates in a statically linked context.

  • code/branches/core5/src/libraries/util/UtilPrereqs.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 util library
    3233*/
    3334
    … …  
    4041// Shared library settings
    4142//-----------------------------------------------------------------------
     43
    4244#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( UTIL_STATIC_BUILD )
    4345#  ifdef UTIL_SHARED_BUILD
    … …  
    5658#endif
    5759
     60//-----------------------------------------------------------------------
     61// Enums
     62//-----------------------------------------------------------------------
     63
     64namespace orxonox
     65{
     66    namespace ScopeID
     67    {
     68        //!A list of available scopes for the Scope template.
     69        enum Value
     70        {
     71            Root,
     72            Graphics
     73        };
     74    }
     75}
    5876
    5977//-----------------------------------------------------------------------
    … …  
    7290    class OutputBufferListener;
    7391    class OutputHandler;
     92    template <ScopeID::Value>
     93    class Scope;
     94    template <class, ScopeID::Value>
     95    class ScopedSingleton;
     96    class ScopeListener;
    7497    class SignalHandler;
     98    template <class T>
     99    class Singleton;
    75100    class SubString;
    76101}
Note: See TracChangeset for help on using the changeset viewer.