Changeset 7676 in orxonox.OLD

Timestamp:

May 18, 2006, 11:46:23 AM (18 years ago)

Author:

bensch

Message:

some POD's

Location:

trunk/src/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• graphics/importer/objModel.cc (modified) (1 diff)
• graphics/importer/static_model.cc (modified) (3 diffs)
• graphics/importer/texture.cc (modified) (1 diff)
• gui/qt_gui/Makefile.am (modified) (1 diff)
• parser/ini_parser/ini_parser.cc (modified) (1 diff)
• shell/shell_input.cc (modified) (1 diff)
• util/loading/factory.cc (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/material.cc

@@ -291 +291 @@
 void Material::setDiffuseMap(const std::string& dMap, GLenum target)
 {
-  PRINTF(5)("setting Diffuse Map %s\n", dMap);
+  PRINTF(5)("setting Diffuse Map %s\n", dMap.c_str());
   if (this->diffuseTexture != NULL)
     ResourceManager::getInstance()->unload(this->diffuseTexture);

trunk/src/lib/graphics/importer/objModel.cc

@@ -75 +75 @@
       this->objPath.erase(len, this->objPath.size());
       this->objPath[len] = '\0';
-      PRINTF(4)("Resolved file %s to Path %s.\n", fileName, this->objPath);
+      PRINTF(4)("Resolved file %s to Path %s.\n", fileName.c_str()), this->objPath.c_str());
     }
   else

trunk/src/lib/graphics/importer/static_model.cc

@@ -226 +226 @@
   while (tmpGroup != NULL)
   {
-    PRINTF(5)("Drawing model %s\n", tmpGroup->name);
+    PRINTF(5)("Drawing model %s\n", tmpGroup->name.c_str());
     glCallList (tmpGroup->listNumber);
     tmpGroup = tmpGroup->next;
@@ -253 +253 @@
     if (counter == groupNumber)
     {
-      PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name);
+      PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name.c_str());
       glCallList (tmpGroup->listNumber);
       return;
@@ -368 +368 @@
 bool StaticModel::addGroup(const std::string& groupString)
 {
-  PRINTF(5)("Read Group: %s.\n", groupString);
+  PRINTF(5)("Read Group: %s.\n", groupString.c_str());
   if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
   {

trunk/src/lib/graphics/importer/texture.cc

@@ -90 +90 @@
       if(tmpSurf != NULL)
       {
-        PRINTF(4)("loading Image %s\n", imageName);
+        PRINTF(4)("loading Image %s\n", imageName.c_str());
         bool hasAlpha;
         SDL_Surface* newSurf = this->prepareSurface(tmpSurf, hasAlpha);

trunk/src/lib/gui/qt_gui/Makefile.am

@@ -47 +47 @@
 
 clean-local:
-        rm *_moc.cc
+        rm -f *_moc.cc

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -445 +445 @@
               (*section).entries.back().name.c_str(),
               (*section).entries.back().value.c_str(),
-              (*section).name);
+              (*section).name.c_str());
     this->currentEntry = --(*section).entries.end();
     return true;

trunk/src/lib/shell/shell_input.cc

@@ -293 +293 @@
     if (event.bPressed)
     {
-      PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type));
+      PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type).c_str());
       if (event.type == SDLK_F1)
         this->help();

trunk/src/lib/util/loading/factory.cc

@@ -150 +150 @@
   else
   {
-    PRINTF(2)("Could not Fabricate an Object of Class '%s'\n", className);
+    PRINTF(2)("Could not Fabricate an Object of Class '%s'\n", className.c_str());
     return NULL;
   }

trunk/src/lib/util/loading/resource_manager.cc

@@ -436 +436 @@
       if(File(fullName).isFile())
       {
-        PRINTF(4)("Image %s resides to %s\n", fileName, fullName);
+        PRINTF(4)("Image %s resides to %s\n", fileName.c_str(), fullName.c_str());
         tmpResource->pointer = new Texture(fullName, tmpResource->param[0].getInt());
       }
@@ -447 +447 @@
           if(File(imgName).isFile())
           {
-            PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
+            PRINTF(4)("Image %s resides to %s\n", fileName.c_str(), imgName.c_str());
             tmpResource->pointer = new Texture(imgName, tmpResource->param[0].getInt());
             break;