Changeset 3153 for code/branches/pch/src/orxonox

Timestamp:

Jun 13, 2009, 4:12:45 PM (16 years ago)

Author:

rgrieder

Message:

Small fixes.

Location:

code/branches/pch/src/orxonox

Files:

• gui/GUIManager.cc (modified) (2 diffs)
• gui/GUIManager.h (modified) (1 diff)
• tools/TextureGenerator.cc (modified) (1 diff)
• tools/TextureGenerator.h (modified) (1 diff)

code/branches/pch/src/orxonox/gui/GUIManager.cc

@@ -271 +271 @@
         Returns false if the Overlay was already present.
     */
-    bool GUIManager::registerOverlay(std::string name, GUIOverlay* overlay)
+    bool GUIManager::registerOverlay(const std::string& name, GUIOverlay* overlay)
     {
         return (this->guiOverlays_.insert(std::pair<std::string, GUIOverlay*>(name, overlay))).second;
@@ -284 +284 @@
         Returns a pointer to the GUIOverlay.
     */
-    GUIOverlay* GUIManager::getOverlay(std::string name)
+    GUIOverlay* GUIManager::getOverlay(const std::string& name)
     {
         return (this->guiOverlays_.find(name))->second;

code/branches/pch/src/orxonox/gui/GUIManager.h

@@ -91 +91 @@
         void executeCode(const std::string& str);
 
-        bool registerOverlay(std::string name, GUIOverlay* overlay); //!< Register a GUIOverlay with the GUIManager.
-        GUIOverlay* getOverlay(std::string name); // Get the GUIOverlay of the GUI with the given name.
+        bool registerOverlay(const std::string& name, GUIOverlay* overlay); //!< Register a GUIOverlay with the GUIManager.
+        GUIOverlay* getOverlay(const std::string& name); // Get the GUIOverlay of the GUI with the given name.
 
         void setCamera(Ogre::Camera* camera);

code/branches/pch/src/orxonox/tools/TextureGenerator.cc

@@ -65 +65 @@
     unsigned int TextureGenerator::materialCount_s = 0;
 
-    /*static*/ const std::string& TextureGenerator::getMaterialName(std::string textureName, const ColourValue& colour)
+    /*static*/ const std::string& TextureGenerator::getMaterialName(const std::string& textureName, const ColourValue& colour)
     {
         std::map<ColourValue, std::string>& colourMap = materials_s[textureName];

code/branches/pch/src/orxonox/tools/TextureGenerator.h

@@ -46 +46 @@
     {
     public:
-        static const std::string& getMaterialName(std::string textureName, const ColourValue& colour);
+        static const std::string& getMaterialName(const std::string& textureName, const ColourValue& colour);
 
     private: