diff --git a/src/modules/graphic/osggraph/Car/OsgCar.cpp b/src/modules/graphic/osggraph/Car/OsgCar.cpp index 385a7363..f7ecdbbc 100644 --- a/src/modules/graphic/osggraph/Car/OsgCar.cpp +++ b/src/modules/graphic/osggraph/Car/OsgCar.cpp @@ -412,7 +412,7 @@ osg::ref_ptr SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat } this->DRMSelector2->addChild(pWing1_branch.get()); - strPath =""; + strPath.clear(); } this->DRMSelector2->setSingleChildOn(0); @@ -581,7 +581,7 @@ osg::ref_ptr SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat this->DRMSelectMask[i-1] = 1 << selIndex; GfLogDebug(" # DRMSelectMask = %i - nDRM = %i\n", DRMSelectMask[i-1], nDRM); - driver_path =""; + driver_path.clear(); selIndex++; } diff --git a/src/modules/graphic/osggraph/Car/OsgWheel.cpp b/src/modules/graphic/osggraph/Car/OsgWheel.cpp index 5914c4fc..699a5a5b 100644 --- a/src/modules/graphic/osggraph/Car/OsgWheel.cpp +++ b/src/modules/graphic/osggraph/Car/OsgWheel.cpp @@ -92,7 +92,7 @@ osg::ref_ptr SDWheels::initWheel(int wheelIndex, const cha GfLogInfo("Car Texture = %s\n", bSkinName.c_str()); if (!exist) - bSkinName=""; + bSkinName.clear(); else { snprintf(buf, MaxPathSize, "wheel3d-%s", car->_skinName); diff --git a/src/modules/graphic/osggraph/Loader/ReaderWriterACC.h b/src/modules/graphic/osggraph/Loader/ReaderWriterACC.h index dbc51990..1a1e8418 100644 --- a/src/modules/graphic/osggraph/Loader/ReaderWriterACC.h +++ b/src/modules/graphic/osggraph/Loader/ReaderWriterACC.h @@ -232,7 +232,7 @@ public: // Use a shared modulate TexEnv mModulateTexEnv = modulateTexEnv; - if (name1!="") + if (!name1.empty()) { std::string absFileName1 = osgDB::findDataFile(name1, options); i = TextureData::mTextureImageMap.find(absFileName1); @@ -271,7 +271,7 @@ public: mTexture2DClamp1->setImage(mImage1.get()); } - if (name2!="") + if (!name2.empty()) { std::string absFileName2 = osgDB::findDataFile(name2, options); i = TextureData::mTextureImageMap.find(absFileName2); @@ -310,7 +310,7 @@ public: mTexture2DClamp2->setImage(mImage2.get()); } - if (name3!="") + if (!name3.empty()) { std::string absFileName3 = osgDB::findDataFile(name3, options); i = TextureData::mTextureImageMap.find(absFileName3);