Changeset 6394 for code/branches/presentation2/src/libraries/tools

Timestamp:

Dec 22, 2009, 2:07:44 PM (15 years ago)

Author:

rgrieder

Message:

std::string tweaks:

• Declared BLANKSTRING in UtilPrereqs.h as well (removed obsolete StringUtils.h includes to avoid dependencies)
• Using BLANKSTRING if const std::string& return type is possible
• Replaced a few (const) std::string arguments with const std::string&
• if (str == "") —> if (str.empty())
• std::string msg = name + "adsf"; —> const std::string& msg = name + "asdf";
• std::string asdf = object→getFooBar(); —> const std::string& asdf = object→getFooBar();
• std::string asdf = "asdf"; —> std::string asdf("asdf");
• ostream << "."; and name + "." —> ostream << '.'; and name + '.'
• str = ""; —> str.clear()
• std::string asdf = ""; —> std::string asdf;
• asdf_ = ""; (in c'tor) —> delete line

Location:

code/branches/presentation2/src/libraries/tools

Files:

• BillboardSet.cc (modified) (3 diffs)
• Mesh.cc (modified) (2 diffs)
• ParticleInterface.cc (modified) (1 diff)
• ResourceLocation.cc (modified) (1 diff)
• Shader.cc (modified) (3 diffs)
• TextureGenerator.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/tools/BillboardSet.cc

@@ -38 +38 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "util/StringUtils.h"
 #include "core/GameMode.h"
 
@@ -81 +80 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
             this->billboardSet_ = 0;
         }
@@ -104 +103 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
             this->billboardSet_ = 0;
         }

code/branches/presentation2/src/libraries/tools/Mesh.cc

@@ -36 +36 @@
 
 #include "util/Convert.h"
-#include "util/StringUtils.h"
 #include "core/GameMode.h"
 
@@ -84 +83 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load mesh \"" << meshsource << "\"" << std::endl;
+                COUT(1) << "Error: Couln't load mesh \"" << meshsource << '"' << std::endl;
                 this->entity_ = 0;
             }

code/branches/presentation2/src/libraries/tools/ParticleInterface.cc

@@ -78 +78 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle system \"" << templateName << "\"" << std::endl;
+                COUT(1) << "Error: Couln't load particle system \"" << templateName << '"' << std::endl;
                 this->particleSystem_ = 0;
             }

code/branches/presentation2/src/libraries/tools/ResourceLocation.cc

@@ -92 +92 @@
     {
         // Remove from Ogre paths
-        resourceGroup_.erase();
+        resourceGroup_.clear();
         try
         {

code/branches/presentation2/src/libraries/tools/Shader.cc

@@ -57 +57 @@
         this->bLoadCompositor_ = GameMode::showsGraphics();
         this->bViewportInitialized_ = false;
-        this->compositor_ = "";
-        this->oldcompositor_ = "";
 
         if (this->bLoadCompositor_ && Ogre::Root::getSingletonPtr())
@@ -111 +109 @@
             Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
             assert(viewport);
-            if (this->oldcompositor_ != "")
+            if (!this->oldcompositor_.empty())
             {
                 Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->oldcompositor_);
                 this->compositorInstance_ = 0;
             }
-            if (this->compositor_ != "")
+            if (!this->compositor_.empty())
             {
                 this->compositorInstance_ = Ogre::CompositorManager::getSingleton().addCompositor(viewport, this->compositor_);
@@ -298 +296 @@
                         continue;
 
-                    if (pass_pointer->getFragmentProgramName() != "")
+                    if (!pass_pointer->getFragmentProgramName().empty())
                     {
                         Ogre::GpuProgramParameters* parameter_pointer = pass_pointer->getFragmentProgramParameters().get();

code/branches/presentation2/src/libraries/tools/TextureGenerator.cc

@@ -72 +72 @@
         if (it == colourMap.end())
         {
-            std::string materialName = textureName + "_Material_" + multi_cast<std::string>(materialCount_s++);
+            const std::string& materialName = textureName + "_Material_" + multi_cast<std::string>(materialCount_s++);
             Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialName, "General"));
             material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);