Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 15, 2009, 10:48:12 PM (16 years ago)
Author:
rgrieder
Message:

Renamed Teamcolourable to TeamColourable

Location:
code/branches/pch/src/orxonox/interfaces
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc

    r3181 r3183  
    3737#include "RadarListener.h"
    3838#include "Rewardable.h"
    39 #include "Teamcolourable.h"
     39#include "TeamColourable.h"
    4040#include "Tickable.h"
    4141#include "TimeFactorListener.h"
     
    7474
    7575    //----------------------------
    76     // Teamcolourable
     76    // TeamColourable
    7777    //----------------------------
    78     Teamcolourable::Teamcolourable()
     78    TeamColourable::TeamColourable()
    7979    {
    80         RegisterRootObject(Teamcolourable);
     80        RegisterRootObject(TeamColourable);
    8181    }
    8282
  • code/branches/pch/src/orxonox/interfaces/TeamColourable.h

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/buildsystem/src/orxonox/interfaces/Teamcolourable.h1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/interfaces/Teamcolourable.h2506-2658
      /code/branches/buildsystem3/src/orxonox/interfaces/Teamcolourable.h2662-2708
      /code/branches/ceguilua/src/orxonox/interfaces/Teamcolourable.h1802-1808
      /code/branches/core3/src/orxonox/interfaces/Teamcolourable.h1572-1739
      /code/branches/gametypes/src/orxonox/interfaces/Teamcolourable.h2826-3031
      /code/branches/gcc43/src/orxonox/interfaces/Teamcolourable.h1580
      /code/branches/gui/src/orxonox/interfaces/Teamcolourable.h1635-1723,​2795-2894
      /code/branches/input/src/orxonox/interfaces/Teamcolourable.h1629-1636
      /code/branches/lodfinal/src/orxonox/interfaces/Teamcolourable.h2372-2411
      /code/branches/map/src/orxonox/interfaces/Teamcolourable.h2801-3086,​3089
      /code/branches/miniprojects/src/orxonox/interfaces/Teamcolourable.h2754-2824
      /code/branches/netp2/src/orxonox/interfaces/Teamcolourable.h2835-2988
      /code/branches/netp3/src/orxonox/interfaces/Teamcolourable.h2988-3082
      /code/branches/network/src/orxonox/interfaces/Teamcolourable.h2356
      /code/branches/network64/src/orxonox/interfaces/Teamcolourable.h2210-2355
      /code/branches/objecthierarchy/src/orxonox/interfaces/Teamcolourable.h1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/interfaces/Teamcolourable.h2171-2479
      /code/branches/overlay/src/orxonox/interfaces/Teamcolourable.h2117-2385
      /code/branches/particles/src/orxonox/interfaces/Teamcolourable.h2829-3085
      /code/branches/physics/src/orxonox/interfaces/Teamcolourable.h1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/interfaces/Teamcolourable.h2436-2457
      /code/branches/pickups/src/orxonox/interfaces/Teamcolourable.h1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/orxonox/interfaces/Teamcolourable.h2107-2497,​2915-3071
      /code/branches/presentation/src/orxonox/interfaces/Teamcolourable.h2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/interfaces/Teamcolourable.h1894-2088
      /code/branches/questsystem2/src/orxonox/interfaces/Teamcolourable.h2107-2259
      /code/branches/questsystem5/src/orxonox/interfaces/Teamcolourable.h2776-2905
      /code/branches/script_trigger/src/orxonox/interfaces/Teamcolourable.h1295-1953,​1955
      /code/branches/sound/src/orxonox/interfaces/Teamcolourable.h2829-3010
      /code/branches/weapon/src/orxonox/interfaces/Teamcolourable.h1925-2094
      /code/branches/weapon2/src/orxonox/interfaces/Teamcolourable.h2107-2488
      /code/branches/weapons/src/orxonox/interfaces/Teamcolourable.h2897-3051
      /code/branches/weaponsystem/src/orxonox/interfaces/Teamcolourable.h2742-2890
    r3182 r3183  
    2727 */
    2828
    29 #ifndef _Teamcolourable_H__
    30 #define _Teamcolourable_H__
     29#ifndef _TeamColourable_H__
     30#define _TeamColourable_H__
    3131
    3232#include "OrxonoxPrereqs.h"
     
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
     39    class _OrxonoxExport TeamColourable : virtual public OrxonoxClass
    4040    {
    4141        public:
     
    4343
    4444        protected:
    45             Teamcolourable();
     45            TeamColourable();
    4646    };
    4747}
    4848
    49 #endif /* _Teamcolourable_H__ */
     49#endif /* _TeamColourable_H__ */
Note: See TracChangeset for help on using the changeset viewer.