From ded2472a9b6ee91ea594c5027c2122d886c483f9 Mon Sep 17 00:00:00 2001 From: iobyte Date: Mon, 2 May 2022 19:53:22 +0000 Subject: [PATCH] use string functions to clear and check if empty git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8143 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 98ed072e69fc7f92af5fcfe6e3e169754b7c2150 Former-commit-id: 8aac7891213e47820f3454f06b0156ce673dda5d --- src/modules/graphic/osggraph/Car/OsgCar.cpp | 4 ++-- src/modules/graphic/osggraph/Car/OsgWheel.cpp | 2 +- src/modules/graphic/osggraph/Loader/ReaderWriterACC.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/graphic/osggraph/Car/OsgCar.cpp b/src/modules/graphic/osggraph/Car/OsgCar.cpp index 385a73634..f7ecdbbc0 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 5914c4fcf..699a5a5ba 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 dbc519903..1a1e8418d 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);