[Orxonox-commit 3920] r8594 - in code/branches/presentation/src: libraries/core libraries/util modules/overlays/hud modules/pickup orxonox/worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2011-05-26 13:57:01 +0200 (Thu, 26 May 2011)
New Revision: 8594

Modified:
   code/branches/presentation/src/libraries/core/Identifier.h
   code/branches/presentation/src/libraries/util/Exception.h
   code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/presentation/src/modules/pickup/PickupManager.h
   code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h
Log:
fixed a few warnings that were only visible with EXTRA_COMPILER_WARNINGS enabled)

Modified: code/branches/presentation/src/libraries/core/Identifier.h
===================================================================
--- code/branches/presentation/src/libraries/core/Identifier.h	2011-05-26 11:53:52 UTC (rev 8593)
+++ code/branches/presentation/src/libraries/core/Identifier.h	2011-05-26 11:57:01 UTC (rev 8594)
@@ -118,7 +118,7 @@
             void setName(const std::string& name);
 
             /// Returns the network ID to identify a class through the network.
-            inline const uint32_t getNetworkID() const { return this->networkID_; }
+            inline uint32_t getNetworkID() const { return this->networkID_; }
             void setNetworkID(uint32_t id);
 
             /// Returns the unique ID of the class.

Modified: code/branches/presentation/src/libraries/util/Exception.h
===================================================================
--- code/branches/presentation/src/libraries/util/Exception.h	2011-05-26 11:53:52 UTC (rev 8593)
+++ code/branches/presentation/src/libraries/util/Exception.h	2011-05-26 11:57:01 UTC (rev 8594)
@@ -109,7 +109,7 @@
         //! Returns the short developer written exception
         virtual const std::string& getDescription()     const { return this->description_; }
         //! Returns the line number on which the exception occurred.
-        virtual const unsigned int getLineNumber()      const { return this->lineNumber_; }
+        virtual unsigned int getLineNumber()            const { return this->lineNumber_; }
         //! Returns the function in which the exception occurred.
         virtual const std::string& getFunctionName()    const { return this->functionName_; }
         //! Returns the filename in which the exception occurred.

Modified: code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc	2011-05-26 11:53:52 UTC (rev 8593)
+++ code/branches/presentation/src/modules/overlays/hud/HUDNavigation.cc	2011-05-26 11:57:01 UTC (rev 8594)
@@ -341,7 +341,7 @@
     panel->hide();
     text->hide();
 
-    ObjectInfo tempStruct = {panel, text, false};
+    ObjectInfo tempStruct = {panel, text, false /*, TODO: initialize wasOutOfView_ */};
     activeObjectList_[object] = tempStruct;
 
     this->background_->addChild ( panel );

Modified: code/branches/presentation/src/modules/pickup/PickupManager.h
===================================================================
--- code/branches/presentation/src/modules/pickup/PickupManager.h	2011-05-26 11:53:52 UTC (rev 8593)
+++ code/branches/presentation/src/modules/pickup/PickupManager.h	2011-05-26 11:57:01 UTC (rev 8594)
@@ -147,7 +147,7 @@
             @param pickup The Pickupable.
             @return Returns true if the input Pickupable is still valid, false if not.
             */
-            const bool isValidPickup(uint32_t pickup) const
+            bool isValidPickup(uint32_t pickup) const
                 { return this->pickups_.find(pickup) != this->pickups_.end(); }
             // tolua_end
 

Modified: code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-26 11:53:52 UTC (rev 8593)
+++ code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-26 11:57:01 UTC (rev 8594)
@@ -80,7 +80,7 @@
                 { this->engineTicksNotDone = this->engineList_.size(); }
             inline void oneEngineTickDone()
                 { this->engineTicksNotDone--; }
-            inline const bool hasEngineTicksRemaining()
+            inline bool hasEngineTicksRemaining()
                 { return (this->engineTicksNotDone>0); }
 
             inline bool getBoost() const