Changeset 1634 for code/branches/gcc43/src/orxonox/hud

Timestamp:

Jun 29, 2008, 7:36:33 PM (16 years ago)

Author:

nicolasc

Message:

just a test - don't morge this

Location:

code/branches/gcc43/src/orxonox/hud

Files:

• BarOverlayElement.h (modified) (1 diff)
• HUD.h (modified) (1 diff)
• Navigation.h (modified) (1 diff)
• RadarObject.h (modified) (2 diffs)

code/branches/gcc43/src/orxonox/hud/BarOverlayElement.h

@@ -54 +54 @@
       void clearColours();
 
-      inline void setRightToLeft(bool r2l)
+      void setRightToLeft(bool r2l)
         { this->right2Left_ = r2l; }
-      inline bool getRightToLeft() const
+      bool getRightToLeft() const
         { return this->right2Left_; }
-      inline float getValue() const
+      float getValue() const
         { return this->value_; }
 

code/branches/gcc43/src/orxonox/hud/HUD.h

@@ -55 +55 @@
         void setFPS();
 
-        inline std::list<RadarObject*>& getRadarObjects()
+        std::list<RadarObject*>& getRadarObjects()
             { return this->roSet_; }
 

code/branches/gcc43/src/orxonox/hud/Navigation.h

@@ -49 +49 @@
         float getDist2Focus() const;
 
-        inline RadarObject* getFocus() const
+        RadarObject* getFocus() const
             { return this->focus_; }
         void releaseFocus();

code/branches/gcc43/src/orxonox/hud/RadarObject.h

@@ -46 +46 @@
 
         void setMaterial(const ColourValue& colour, const std::string& texturename);
-        inline void setColour(const ColourValue& colour)
+        void setColour(const ColourValue& colour)
             { this->setMaterial(colour, this->texturename_); }
-        inline void setTexture(const std::string& texturename)
+        void setTexture(const std::string& texturename)
             { this->setMaterial(this->colour_, texturename); }
-        inline void resetMaterial()
+        void resetMaterial()
             { this->setMaterial(this->colour_, this->texturename_); }
 
@@ -56 +56 @@
         Vector3 getOrientedVelocity() const;
 
-        inline WorldEntity* getObject() const
+        WorldEntity* getObject() const
             { return this->object_; }
-        inline Ogre::PanelOverlayElement* getPanel() const
+        Ogre::PanelOverlayElement* getPanel() const
             { return this->panel_; }