Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 18, 2007, 12:32:09 PM (17 years ago)
Author:
rgrieder
Message:
  • removed all the "using namespace Ogre" in the header files
  • cleaned up the orxonox.cc header a little bit (every Ogre class referenced is now included via header file)
File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/orxonox/hud/HUD.h

    r587 r609  
    77//#include <CEGUIRenderer.h>
    88
    9 using namespace Ogre;
    109
    1110namespace hud
    … …  
    1716  private:
    1817
    19         OverlayElement* timeText_;
    20         OverlayElement* targetWindowNameText_;
    21         OverlayElement* targetWindowStatusText_;
    22         OverlayElement* targetWindowDistanceText_;
    23         OverlayElement* targetWindowHitRatingText_;
    24         OverlayElement* energyLength_;
    25         OverlayElement* shieldLeftTop_;
    26         OverlayElement* shieldRightTop_;
    27         OverlayElement* shieldLeftBottom_;
    28         OverlayElement* shieldRightBottom_;
    29         OverlayElement* rocketNum1_;
    30         OverlayElement* rocketNum2_;
    31         OverlayElement* rocketNum3_;
    32         OverlayElement* rocketNum4_;
    33         OverlayElement* energyDistrPoint_;
    34         OverlayElement* primarChoice_;
     18    Ogre::OverlayElement* timeText_;
     19        Ogre::OverlayElement* targetWindowNameText_;
     20        Ogre::OverlayElement* targetWindowStatusText_;
     21        Ogre::OverlayElement* targetWindowDistanceText_;
     22        Ogre::OverlayElement* targetWindowHitRatingText_;
     23        Ogre::OverlayElement* energyLength_;
     24        Ogre::OverlayElement* shieldLeftTop_;
     25        Ogre::OverlayElement* shieldRightTop_;
     26        Ogre::OverlayElement* shieldLeftBottom_;
     27        Ogre::OverlayElement* shieldRightBottom_;
     28        Ogre::OverlayElement* rocketNum1_;
     29        Ogre::OverlayElement* rocketNum2_;
     30        Ogre::OverlayElement* rocketNum3_;
     31        Ogre::OverlayElement* rocketNum4_;
     32        Ogre::OverlayElement* energyDistrPoint_;
     33        Ogre::OverlayElement* primarChoice_;
    3534
    3635
    … …  
    4140        int timeSec_;
    4241
    43         String targetWindowName_;
    44         String targetWindowStatus_;
     42        Ogre::String targetWindowName_;
     43        Ogre::String targetWindowStatus_;
    4544        int targetWindowDistance_;
    4645        int targetWindowHitRating_;
    … …  
    7877
    7978        void setTime(int i, int j);
    80         void setTargetWindowName(String i);
    81         void setTargetWindowStatus(String i);
     79        void setTargetWindowName(Ogre::String i);
     80        void setTargetWindowStatus(Ogre::String i);
    8281        void setTargetWindowDistance(int i);
    8382        void setTargetWindowHitRating(int i);
Note: See TracChangeset for help on using the changeset viewer.