diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp index df3d0cb980..bba5aea92f 100644 --- a/apps/opencs/model/doc/savingstages.cpp +++ b/apps/opencs/model/doc/savingstages.cpp @@ -145,7 +145,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message ESM::DialInfo info = (*iter)->get(); info.mId = info.mId.substr (info.mId.find_last_of ('#')+1); - info.mPrev = ""; + info.mPrev.clear(); if (iter!=range.first) { CSMWorld::InfoCollection::RecordConstIterator prev = iter; @@ -157,7 +157,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform (int stage, Messages& message CSMWorld::InfoCollection::RecordConstIterator next = iter; ++next; - info.mNext = ""; + info.mNext.clear(); if (next!=range.second) { info.mNext = (*next)->get().mId.substr ((*next)->get().mId.find_last_of ('#')+1); diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp index a5daefc3cd..b1785cc919 100644 --- a/apps/opencs/model/world/nestedcoladapterimp.hpp +++ b/apps/opencs/model/world/nestedcoladapterimp.hpp @@ -163,7 +163,7 @@ namespace CSMWorld std::vector& spells = raceOrBthSgn.mPowers.mList; // blank row - std::string spell = ""; + std::string spell; spells.insert(spells.begin()+position, spell); diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp index 41de82a0ef..0cfde25569 100644 --- a/apps/opencs/model/world/refidadapterimp.hpp +++ b/apps/opencs/model/world/refidadapterimp.hpp @@ -1527,7 +1527,7 @@ namespace CSMWorld ESM::Transport::Dest newRow; newRow.mPos = newPos; - newRow.mCellName = ""; + newRow.mCellName.clear(); if (position >= (int)list.size()) list.push_back(newRow); @@ -1679,7 +1679,7 @@ namespace CSMWorld for (int i = 0; i < 8; ++i) newRow.mWander.mIdle[i] = 0; newRow.mWander.mShouldRepeat = 1; - newRow.mCellName = ""; + newRow.mCellName.clear(); if (position >= (int)list.size()) list.push_back(newRow); @@ -2013,8 +2013,8 @@ namespace CSMWorld ESM::PartReference newPart; newPart.mPart = 0; // 0 == head - newPart.mMale = ""; - newPart.mFemale = ""; + newPart.mMale.clear(); + newPart.mFemale.clear(); if (position >= (int)list.size()) list.push_back(newPart); @@ -2362,7 +2362,7 @@ namespace CSMWorld std::vector& list = leveled.mList; ESM::LevelledListBase::LevelItem newItem; - newItem.mId = ""; + newItem.mId.clear(); newItem.mLevel = 0; if (position >= (int)list.size()) diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp index b0c2140da9..2cc3b3a582 100644 --- a/apps/opencs/view/render/scenewidget.cpp +++ b/apps/opencs/view/render/scenewidget.cpp @@ -44,7 +44,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f) //ds->setNumMultiSamples(8); osg::ref_ptr traits = new osg::GraphicsContext::Traits; - traits->windowName = ""; + traits->windowName.clear(); traits->windowDecoration = true; traits->x = 0; traits->y = 0; diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp index 80eca21785..f55bda0464 100644 --- a/apps/opencs/view/widget/scenetooltexturebrush.cpp +++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp @@ -185,7 +185,7 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture) mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel) + landtexturesCollection.getData(rowInNew, landTextureFilename).value()); } else { - newBrushTextureId = ""; + newBrushTextureId.clear(); mBrushTextureLabel = "No selected texture or invalid texture"; mSelectedBrush->setText(QString::fromStdString(mBrushTextureLabel)); } diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 91250ca0fb..650f6511f9 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -770,19 +770,15 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings) const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt"; std::string userGameControllerdb; - if (boost::filesystem::exists(userdefault)){ + if (boost::filesystem::exists(userdefault)) userGameControllerdb = userdefault; - } - else - userGameControllerdb = ""; std::string gameControllerdb; if (boost::filesystem::exists(localdefault)) gameControllerdb = localdefault; else if (boost::filesystem::exists(globaldefault)) gameControllerdb = globaldefault; - else - gameControllerdb = ""; //if it doesn't exist, pass in an empty string + //else if it doesn't exist, pass in an empty string // gui needs our shaders path before everything else mResourceSystem->getSceneManager()->setShaderPath((mResDir / "shaders").string()); diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 22c46bf579..da2420d94a 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/apps/openmw/mwclass/armor.cpp @@ -205,7 +205,9 @@ namespace MWClass // get armor type string (light/medium/heavy) std::string typeText; if (ref->mBase->mData.mWeight == 0) - typeText = ""; + { + // no type + } else { int armorType = getEquipmentSkill(ptr); @@ -255,7 +257,7 @@ namespace MWClass const MWWorld::LiveCellRef *ref = ptr.get(); ESM::Armor newItem = *ref->mBase; - newItem.mId=""; + newItem.mId.clear(); newItem.mName=newName; newItem.mData.mEnchant=enchCharge; newItem.mEnchant=enchId; diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp index c8a05a132e..86a0c56b9b 100644 --- a/apps/openmw/mwclass/book.cpp +++ b/apps/openmw/mwclass/book.cpp @@ -140,7 +140,7 @@ namespace MWClass const MWWorld::LiveCellRef *ref = ptr.get(); ESM::Book newItem = *ref->mBase; - newItem.mId=""; + newItem.mId.clear(); newItem.mName=newName; newItem.mData.mIsScroll = 1; newItem.mData.mEnchant=enchCharge; diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp index 32396cae35..79c502d673 100644 --- a/apps/openmw/mwclass/clothing.cpp +++ b/apps/openmw/mwclass/clothing.cpp @@ -189,7 +189,7 @@ namespace MWClass const MWWorld::LiveCellRef *ref = ptr.get(); ESM::Clothing newItem = *ref->mBase; - newItem.mId=""; + newItem.mId.clear(); newItem.mName=newName; newItem.mData.mEnchant=enchCharge; newItem.mEnchant=enchId; diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp index 9290c19d80..9fbc7a8da9 100644 --- a/apps/openmw/mwclass/weapon.cpp +++ b/apps/openmw/mwclass/weapon.cpp @@ -266,7 +266,7 @@ namespace MWClass const MWWorld::LiveCellRef *ref = ptr.get(); ESM::Weapon newItem = *ref->mBase; - newItem.mId=""; + newItem.mId.clear(); newItem.mName=newName; newItem.mData.mEnchant=enchCharge; newItem.mEnchant=enchId; diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp index feb3c22035..9d8516ae79 100644 --- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp +++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp @@ -135,7 +135,7 @@ namespace MWDialogue if (actor.getClass().getCreatureStats(actor).isDead()) return false; - mLastTopic = ""; + mLastTopic.clear(); // Note that we intentionally don't reset mPermanentDispositionChange mChoice = -1; diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp index 43da1ef83f..19ba432d58 100644 --- a/apps/openmw/mwgui/charactercreation.cpp +++ b/apps/openmw/mwgui/charactercreation.cpp @@ -249,7 +249,7 @@ namespace MWGui break; case GM_ClassGenerate: mGenerateClassStep = 0; - mGenerateClass = ""; + mGenerateClass.clear(); mGenerateClassSpecializations[0] = 0; mGenerateClassSpecializations[1] = 0; mGenerateClassSpecializations[2] = 0; diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp index d2dfa827b4..f914ee8556 100644 --- a/apps/openmw/mwgui/itemwidget.cpp +++ b/apps/openmw/mwgui/itemwidget.cpp @@ -146,7 +146,7 @@ namespace MWGui if (state == None) { if (!isMagic) - backgroundTex = ""; + backgroundTex.clear(); } else if (state == Equip) { diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index 99876e0c85..7f53916d65 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/apps/openmw/mwgui/quickkeysmenu.cpp @@ -142,8 +142,8 @@ namespace MWGui else { key->type = Type_Unassigned; - key->id = ""; - key->name = ""; + key->id.clear(); + key->name.clear(); MyGUI::TextBox* textBox = key->button->createWidgetReal("SandText", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Default); diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index f806d3829a..10ed206e3f 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/apps/openmw/mwgui/tooltips.cpp @@ -122,7 +122,7 @@ namespace MWGui info.caption = mFocusObject.getClass().getName(mFocusObject); if (info.caption.empty()) info.caption=mFocusObject.getCellRef().getRefId(); - info.icon=""; + info.icon.clear(); tooltipSize = createToolTip(info, checkOwned()); } else @@ -371,7 +371,7 @@ namespace MWGui ToolTipInfo info = object.getToolTipInfo(mFocusObject, count); if (!image) - info.icon = ""; + info.icon.clear(); tooltipSize = createToolTip(info, isOwned); } diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 6f053643d6..e3d61e7c08 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -1313,7 +1313,7 @@ namespace MWGui void WindowManager::setSelectedEnchantItem(const MWWorld::Ptr& item) { mSelectedEnchantItem = item; - mSelectedSpell = ""; + mSelectedSpell.clear(); const ESM::Enchantment* ench = mStore->get() .find(item.getClass().getEnchantment(item)); @@ -1346,7 +1346,7 @@ namespace MWGui void WindowManager::unsetSelectedSpell() { - mSelectedSpell = ""; + mSelectedSpell.clear(); mSelectedEnchantItem = MWWorld::Ptr(); mHud->unsetSelectedSpell(); diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index b2eb316e24..f626419707 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -759,19 +759,19 @@ void CharacterController::playDeath(float startpoint, CharacterState death) // However, they could still trigger text keys, such as Hit events, or sounds. mMovementState = CharState_None; mAnimation->disable(mCurrentMovement); - mCurrentMovement = ""; + mCurrentMovement.clear(); mUpperBodyState = UpperCharState_Nothing; mAnimation->disable(mCurrentWeapon); - mCurrentWeapon = ""; + mCurrentWeapon.clear(); mHitState = CharState_None; mAnimation->disable(mCurrentHit); - mCurrentHit = ""; + mCurrentHit.clear(); mIdleState = CharState_None; mAnimation->disable(mCurrentIdle); - mCurrentIdle = ""; + mCurrentIdle.clear(); mJumpState = JumpState_None; mAnimation->disable(mCurrentJump); - mCurrentJump = ""; + mCurrentJump.clear(); mMovementAnimationControlled = true; mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::BlendMask_All, diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp index 08f4cd6f27..9a9a315bdb 100644 --- a/apps/openmw/mwscript/statsextensions.cpp +++ b/apps/openmw/mwscript/statsextensions.cpp @@ -553,7 +553,7 @@ namespace MWScript { MWWorld::ConstPtr actor = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0==0) { @@ -585,7 +585,7 @@ namespace MWScript { MWWorld::ConstPtr actor = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0==0) { @@ -624,7 +624,7 @@ namespace MWScript { MWWorld::ConstPtr actor = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0==0) { @@ -656,7 +656,7 @@ namespace MWScript { MWWorld::ConstPtr ptr = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0 >0) { factionID = runtime.getStringLiteral (runtime[0].mInteger); @@ -922,7 +922,7 @@ namespace MWScript { MWWorld::ConstPtr ptr = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0 >0 ) { factionID = runtime.getStringLiteral (runtime[0].mInteger); @@ -954,7 +954,7 @@ namespace MWScript { MWWorld::ConstPtr ptr = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0 >0 ) { factionID = runtime.getStringLiteral (runtime[0].mInteger); @@ -981,7 +981,7 @@ namespace MWScript { MWWorld::ConstPtr ptr = R()(runtime, false); - std::string factionID = ""; + std::string factionID; if(arg0 >0 ) { factionID = runtime.getStringLiteral (runtime[0].mInteger); diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp index e2b75edc40..16a0bef131 100644 --- a/apps/openmw/mwworld/weather.cpp +++ b/apps/openmw/mwworld/weather.cpp @@ -945,7 +945,7 @@ namespace MWWorld { stopSounds(); - mCurrentRegion = ""; + mCurrentRegion.clear(); mTimePassed = 0.0f; mWeatherUpdateTime = 0.0f; forceWeather(0); diff --git a/components/esm3/inventorystate.cpp b/components/esm3/inventorystate.cpp index b43a7b7233..7dc971d205 100644 --- a/components/esm3/inventorystate.cpp +++ b/components/esm3/inventorystate.cpp @@ -59,7 +59,7 @@ void InventoryState::load (ESMReader &esm) //Get its name std::string id = esm.getHString(); int count; - std::string parentGroup = ""; + std::string parentGroup; //Then get its count esm.getHNT (count, "COUN"); //Old save formats don't have information about parent group; check for that diff --git a/components/esm4/loadcell.cpp b/components/esm4/loadcell.cpp index 1bd7cb783a..6da827499d 100644 --- a/components/esm4/loadcell.cpp +++ b/components/esm4/loadcell.cpp @@ -85,7 +85,7 @@ void ESM4::Cell::load(ESM4::Reader& reader) if (!reader.getZString(mEditorId)) throw std::runtime_error ("CELL EDID data read error"); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "CELL Editor ID: " << mEditorId << std::endl; #endif @@ -108,7 +108,7 @@ void ESM4::Cell::load(ESM4::Reader& reader) reader.get(mX); reader.get(mY); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "CELL group " << ESM4::printLabel(reader.grp().label, reader.grp().type) << std::endl; std::cout << padding << "CELL formId " << std::hex << reader.hdr().record.id << std::endl; @@ -143,7 +143,7 @@ void ESM4::Cell::load(ESM4::Reader& reader) reader.get((std::uint8_t&)mCellFlags); // 8 bits in Obvlivion } #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "flags: " << std::hex << mCellFlags << std::endl; #endif @@ -156,7 +156,7 @@ void ESM4::Cell::load(ESM4::Reader& reader) { reader.getFormId(*it); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "region: " << std::hex << *it << std::endl; #endif diff --git a/components/esm4/loadnavi.cpp b/components/esm4/loadnavi.cpp index 4ed72c20f1..ae8d433f28 100644 --- a/components/esm4/loadnavi.cpp +++ b/components/esm4/loadnavi.cpp @@ -68,7 +68,7 @@ void ESM4::Navigation::IslandInfo::load(ESM4::Reader& reader) reader.get(*it); // FIXME: debugging only #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "NVMI vert " << std::dec << (*it).x << ", " << (*it).y << ", " << (*it).z << std::endl; #endif @@ -88,7 +88,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader) // FIXME: for debugging only #if 0 - std::string padding = ""; + std::string padding; if (flags == ESM4::FLG_Modified) padding.insert(0, 2, '-'); else if (flags == ESM4::FLG_Unmodified) @@ -157,7 +157,7 @@ void ESM4::Navigation::NavMeshInfo::load(ESM4::Reader& reader) reader.get(cellGrid.grid.x); // FIXME: debugging only #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); if (worldSpaceId == ESM4::FLG_Morrowind) std::cout << padding << "NVMI MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl; diff --git a/components/esm4/loadnavm.cpp b/components/esm4/loadnavm.cpp index 5fce00893c..5a90f67b01 100644 --- a/components/esm4/loadnavm.cpp +++ b/components/esm4/loadnavm.cpp @@ -69,7 +69,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader) reader.get(cellGrid.grid.x); // FIXME: debugging only #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); if (worldSpaceId == ESM4::FLG_Morrowind) std::cout << padding << "NVNM MW: X " << std::dec << cellGrid.grid.x << ", Y " << cellGrid.grid.y << std::endl; @@ -82,7 +82,7 @@ void ESM4::NavMesh::NVNMstruct::load(ESM4::Reader& reader) reader.get(cellGrid.cellId); #if 0 - std::string padding = ""; // FIXME + std::string padding; // FIXME padding.insert(0, reader.stackSize()*2, ' '); if (worldSpaceId == 0) // interior std::cout << padding << "NVNM Interior: cellId " << std::hex << cellGrid.cellId << std::endl; @@ -194,7 +194,7 @@ void ESM4::NavMesh::load(ESM4::Reader& reader) // FIXME: debugging only #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "NAVM flags 0x" << std::hex << reader.hdr().record.flags << std::endl; std::cout << padding << "NAVM id 0x" << std::hex << reader.hdr().record.id << std::endl; diff --git a/components/esm4/loadregn.cpp b/components/esm4/loadregn.cpp index 2455966036..b57ce81aa0 100644 --- a/components/esm4/loadregn.cpp +++ b/components/esm4/loadregn.cpp @@ -62,7 +62,7 @@ void ESM4::Region::load(ESM4::Reader& reader) { reader.get(*it); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "RPLD: 0x" << std::hex << *it << std::endl; #endif diff --git a/components/esm4/loadstat.cpp b/components/esm4/loadstat.cpp index 10ce91980c..d57294cc40 100644 --- a/components/esm4/loadstat.cpp +++ b/components/esm4/loadstat.cpp @@ -58,7 +58,7 @@ void ESM4::Static::load(ESM4::Reader& reader) { reader.get(*it); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "MODT: " << std::hex << *it << std::endl; #endif diff --git a/components/esm4/loadtes4.cpp b/components/esm4/loadtes4.cpp index 7123f60e38..7814b0f4ad 100644 --- a/components/esm4/loadtes4.cpp +++ b/components/esm4/loadtes4.cpp @@ -85,7 +85,7 @@ void ESM4::Header::load(ESM4::Reader& reader) if (!reader.getExact(mOverride)) throw std::runtime_error("TES4 ONAM data read error"); #if 0 - std::string padding = ""; + std::string padding; padding.insert(0, reader.stackSize()*2, ' '); std::cout << padding << "ESM4::Header::ONAM overrides: " << formIdToString(mOverride) << std::endl; #endif diff --git a/components/esm4/reader.cpp b/components/esm4/reader.cpp index ce7ede2bf4..9ac8da8802 100644 --- a/components/esm4/reader.cpp +++ b/components/esm4/reader.cpp @@ -423,7 +423,7 @@ void Reader::skipSubRecordData(std::uint32_t size) void Reader::enterGroup() { #ifdef DEBUG_GROUPSTACK - std::string padding = ""; // FIXME: debugging only + std::string padding; // FIXME: debugging only padding.insert(0, mCtx.groupStack.size()*2, ' '); std::cout << padding << "Starting record group " << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl; @@ -473,7 +473,7 @@ void Reader::exitGroupCheck() mCtx.groupStack.pop_back(); #ifdef DEBUG_GROUPSTACK - std::string padding = ""; // FIXME: debugging only + std::string padding; // FIXME: debugging only padding.insert(0, mCtx.groupStack.size()*2, ' '); std::cout << padding << "Finished record group " << printLabel(grp.label, grp.type) << std::endl; #endif @@ -521,7 +521,7 @@ void Reader::skipGroupData() void Reader::skipGroup() { #ifdef DEBUG_GROUPSTACK - std::string padding = ""; // FIXME: debugging only + std::string padding; // FIXME: debugging only padding.insert(0, mCtx.groupStack.size()*2, ' '); std::cout << padding << "Skipping record group " << printLabel(mCtx.recordHeader.group.label, mCtx.recordHeader.group.type) << std::endl; diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp index d97ddd1d6f..d8578a67cc 100644 --- a/components/resource/stats.cpp +++ b/components/resource/stats.cpp @@ -106,7 +106,7 @@ Profiler::Profiler(bool offlineCollect): if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf")) _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); else - _font = ""; + _font.clear(); _characterSize = 18; diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp index ecd25dbd4e..e9ad6a1bf5 100644 --- a/components/settings/settings.cpp +++ b/components/settings/settings.cpp @@ -28,8 +28,8 @@ std::string Manager::load(const Files::ConfigurationManager& cfgMgr, bool loadEd throw std::runtime_error("No config dirs! ConfigurationManager::readConfiguration must be called first."); // Create file name strings for either the engine or the editor. - std::string defaultSettingsFile = ""; - std::string userSettingsFile = ""; + std::string defaultSettingsFile; + std::string userSettingsFile; if (!loadEditorSettings) { diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp index 1341baad60..b15825126a 100644 --- a/components/shader/shadermanager.cpp +++ b/components/shader/shadermanager.cpp @@ -193,7 +193,7 @@ namespace Shader } lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + overallEnd, '\n'); - std::string replacement = ""; + std::string replacement; for (std::vector::const_iterator element = listElements.cbegin(); element != listElements.cend(); element++) { std::string contentInstance = content; @@ -247,7 +247,7 @@ namespace Shader condition = !condition; if (!condition) - linkTarget = ""; + linkTarget.clear(); } source.replace(foundPos, lineEnd - foundPos, "");