From 16df8b8c1dbb6e438775d723e74470c9e3a3519c Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 30 Oct 2016 15:59:20 +0100 Subject: [PATCH] Changed: Use empty() instead of comparison with "" --HG-- branch : develop --- code/nel/src/3d/font_generator.cpp | 2 +- code/nel/src/3d/landscape_user.cpp | 4 ++-- code/nel/src/3d/scene_group.cpp | 2 +- code/nel/src/gui/group_html.cpp | 2 +- code/nel/src/gui/widget_manager.cpp | 2 +- .../src/interface_v3/inventory_manager.cpp | 4 ++-- .../src/interface_v3/item_consumable_effect.cpp | 2 +- .../client/src/interface_v3/lua_ihm_ryzom.cpp | 2 +- .../src/interface_v3/view_bitmap_faber_mp.cpp | 6 +++--- code/ryzom/client/src/net_manager.cpp | 2 +- .../client/src/r2/dmc/property_accessor.cpp | 2 +- code/ryzom/client/src/rosace.cpp | 2 +- code/ryzom/common/src/game_share/object.cpp | 10 +++++----- .../src/game_share/server_edition_module.cpp | 4 ++-- .../common/src/game_share/string_mgr_module.cpp | 4 ++-- .../server/src/ai_data_service/pacs_scan.cpp | 4 ++-- .../r2_islands_textures/screenshot_islands.cpp | 2 +- .../leveldesign/csv_transform/csv_transform.cpp | 8 ++++---- code/ryzom/tools/leveldesign/export/export.cpp | 16 ++++++++-------- code/ryzom/tools/leveldesign/export/tools.cpp | 2 +- .../mission_compiler_lib/variables.cpp | 4 ++-- .../tools/leveldesign/mp_generator/main.cpp | 2 +- .../named_items_2_csv/named_items_2_csv.cpp | 12 +++++++----- .../world_editor/land_export_lib/export.cpp | 12 ++++++------ code/ryzom/tools/pd_parser/main.cpp | 2 +- code/ryzom/tools/pd_parser/parse_node.h | 2 +- .../ai_build_wmap/build_proximity_maps.cpp | 2 +- code/ryzom/tools/server/ai_build_wmap/main.cpp | 6 +++--- 28 files changed, 63 insertions(+), 61 deletions(-) diff --git a/code/nel/src/3d/font_generator.cpp b/code/nel/src/3d/font_generator.cpp index cdbaf8834..ce8048f15 100644 --- a/code/nel/src/3d/font_generator.cpp +++ b/code/nel/src/3d/font_generator.cpp @@ -457,7 +457,7 @@ CFontGenerator::CFontGenerator (const std::string &fontFileName, const std::stri nlerror ("FT_New_Face() failed with file '%s': %s", fontFileName.c_str(), getFT2Error(error)); } - if (fontExFileName != "") + if (!fontExFileName.empty()) { error = FT_Attach_File (_Face, fontExFileName.c_str ()); if (error) diff --git a/code/nel/src/3d/landscape_user.cpp b/code/nel/src/3d/landscape_user.cpp index d6de7df9e..c2c3a4b27 100644 --- a/code/nel/src/3d/landscape_user.cpp +++ b/code/nel/src/3d/landscape_user.cpp @@ -213,9 +213,9 @@ void CLandscapeUser::refreshAllZonesAround(const CVector &pos, float radius, std refreshZonesAround (pos, radius, za, zr); // some zone added or removed?? - if(za != "") + if(!za.empty()) zonesAdded.push_back(za); - if(zr != "") + if(!zr.empty()) zonesRemoved.push_back(zr); _ZoneManager.checkZonesAround ((uint)pos.x, (uint)(-pos.y), (uint)radius); diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp index 5b29709cc..c5f6f24dc 100644 --- a/code/nel/src/3d/scene_group.cpp +++ b/code/nel/src/3d/scene_group.cpp @@ -1121,7 +1121,7 @@ void CInstanceGroup::setClusterSystemForInstances(CInstanceGroup *pIG) void CInstanceGroup::getDynamicPortals (std::vector &names) { for (uint32 i = 0; i < _Portals.size(); ++i) - if (_Portals[i].getName() != "") + if (!_Portals[i].getName().empty()) names.push_back (_Portals[i].getName()); } diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index fa8265876..3ea18a717 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -572,7 +572,7 @@ namespace NLGUI curl_easy_cleanup(it->curl); string tmpfile = it->dest + ".tmp"; - if(res != CURLE_OK || r < 200 || r >= 300 || ((it->md5sum != "") && (it->md5sum != getMD5(tmpfile).toString()))) + if(res != CURLE_OK || r < 200 || r >= 300 || (!it->md5sum.empty() && (it->md5sum != getMD5(tmpfile).toString()))) { NLMISC::CFile::deleteFile(tmpfile.c_str()); } diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp index bd8dfb5fe..d3888b68c 100644 --- a/code/nel/src/gui/widget_manager.cpp +++ b/code/nel/src/gui/widget_manager.cpp @@ -442,7 +442,7 @@ namespace NLGUI if (sZeStart[sZeStart.size()-1] == ':') sZeStart = sZeStart.substr(0, sZeStart.size()-1); - while (sZeStart != "") + while (!sZeStart.empty()) { if (sEltId[0] == ':') sTmp = sZeStart + sEltId; diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp index f886bc3e9..4f882fd21 100644 --- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp +++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp @@ -2504,13 +2504,13 @@ class CHandlerInvCanDropTo : public IActionHandler if (pCSDst != NULL) { // If we want to drop something on a reference slot (hand or equip) - if (pInv->getDBIndexPath(pCSDst) != "") + if (!pInv->getDBIndexPath(pCSDst).empty()) { // We must drag'n'drop an item if (pCSSrc && pCSSrc->getType() == CCtrlSheetInfo::SheetType_Item) if (pCSDst && pCSDst->getType() == CCtrlSheetInfo::SheetType_Item) { - if (pInv->getDBIndexPath(pCSSrc) != "") + if (!pInv->getDBIndexPath(pCSSrc).empty()) { // The item dragged comes from a slot check if this is the good type if (pCSDst->canDropItem(pCSSrc)) diff --git a/code/ryzom/client/src/interface_v3/item_consumable_effect.cpp b/code/ryzom/client/src/interface_v3/item_consumable_effect.cpp index 6e50666b1..a91394390 100644 --- a/code/ryzom/client/src/interface_v3/item_consumable_effect.cpp +++ b/code/ryzom/client/src/interface_v3/item_consumable_effect.cpp @@ -52,7 +52,7 @@ void CItemConsumableEffectHelper::getItemConsumableEffectText(const CItemSheet * // Extract parameters from sheet vector params; CSString param = eff.splitTo(':', true); - while (param != "") + while (!param.empty()) { params.push_back(param); param = eff.splitTo(':', true); diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index 714ed7029..3d9aadea3 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -352,7 +352,7 @@ void CLuaIHMRyzom::createLuaEnumTable(CLuaState &ls, const std::string &str) p = s.splitTo('.', true); while (p.size() > 0) { - if (path == "") + if (path.empty()) path = p; else path += "." + p; diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp b/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp index 212ceebeb..a87e807cc 100644 --- a/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp +++ b/code/ryzom/client/src/interface_v3/view_bitmap_faber_mp.cpp @@ -128,7 +128,7 @@ void CViewBitmapFaberMp::draw () { CItemSheet *pIS = (CItemSheet*)pES; - if (pIS->getIconBack() != "") + if (!pIS->getIconBack().empty()) { if (_AccIconBackString != pIS->getIconBack()) { @@ -140,7 +140,7 @@ void CViewBitmapFaberMp::draw () _AccIconBackId); } - if (pIS->getIconMain() != "") + if (!pIS->getIconMain().empty()) { if (_AccIconMainString != pIS->getIconMain()) { @@ -152,7 +152,7 @@ void CViewBitmapFaberMp::draw () _AccIconMainId); } - if (pIS->getIconOver() != "") + if (!pIS->getIconOver().empty()) { if (_AccIconOverString != pIS->getIconOver()) { diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp index 0e9f09747..b949263e7 100644 --- a/code/ryzom/client/src/net_manager.cpp +++ b/code/ryzom/client/src/net_manager.cpp @@ -507,7 +507,7 @@ void impulseShardId(NLMISC::CBitMemStream &impulse) string webHost; impulse.serial(webHost); - if (webHost != "") + if (!webHost.empty()) { WebServer = webHost; } diff --git a/code/ryzom/client/src/r2/dmc/property_accessor.cpp b/code/ryzom/client/src/r2/dmc/property_accessor.cpp index d8f7a1290..2db78ad14 100644 --- a/code/ryzom/client/src/r2/dmc/property_accessor.cpp +++ b/code/ryzom/client/src/r2/dmc/property_accessor.cpp @@ -125,7 +125,7 @@ const CObject *CPropertyAccessor::getPropertyValue(const CObject* componentParam std::string str = propClass->toString(); - while (!toRet && str != "") + while (!toRet && !str.empty()) { CObjectGenerator* generator = _Factory->getGenerator(str); diff --git a/code/ryzom/client/src/rosace.cpp b/code/ryzom/client/src/rosace.cpp index 6711d19ad..71e41929b 100644 --- a/code/ryzom/client/src/rosace.cpp +++ b/code/ryzom/client/src/rosace.cpp @@ -503,7 +503,7 @@ void CRosace::init() void CRosace::add(const string &name, const CRosaceContext &context) { // If the name is not empty. - if(name != "") + if(!name.empty()) _Contexts.insert(TContexts::value_type (name, context)); }// add // diff --git a/code/ryzom/common/src/game_share/object.cpp b/code/ryzom/common/src/game_share/object.cpp index 45e1a549e..dddb6b270 100644 --- a/code/ryzom/common/src/game_share/object.cpp +++ b/code/ryzom/common/src/game_share/object.cpp @@ -647,7 +647,7 @@ bool CObjectString::set(const std::string& key, const std::string & value) { //H_AUTO(R2_CObjectString_set) - BOMB_IF( key != "", "Try to set the a sub value of an object that does not allowed it", return false); + BOMB_IF(!key.empty(), "Try to set the a sub value of an object that does not allowed it", return false); _Value = value; return true; } @@ -808,7 +808,7 @@ bool CObjectNumber::set(const std::string& key, double value) { //H_AUTO(R2_CObjectNumber_set) - BOMB_IF(key != "", "Try to set an element of a table on an object that is not a table", return false); + BOMB_IF(!key.empty(), "Try to set an element of a table on an object that is not a table", return false); _Value = value; return true; @@ -819,7 +819,7 @@ bool CObjectNumber::set(const std::string& key, const std::string & value) { //H_AUTO(R2_CObjectNumber_set) //XXX - BOMB_IF(key != "", "Try to set an element of a table on an object that is not a table", return false); + BOMB_IF(!key.empty(), "Try to set an element of a table on an object that is not a table", return false); NLMISC::fromString(value, _Value); return true; } @@ -907,7 +907,7 @@ bool CObjectInteger::set(const std::string& key, sint64 value) { //H_AUTO(R2_CObjectInteger_set) - BOMB_IF(key != "", "Try to set an element of a table on an object that is not a table", return false); + BOMB_IF(!key.empty(), "Try to set an element of a table on an object that is not a table", return false); _Value = value; return true; @@ -918,7 +918,7 @@ bool CObjectInteger::set(const std::string& key, const std::string & value) { //H_AUTO(R2_CObjectInteger_set) //XXX - BOMB_IF(key != "", "Try to set an element of a table on an object that is not a table", return false); + BOMB_IF(!key.empty(), "Try to set an element of a table on an object that is not a table", return false); NLMISC::fromString(value, _Value); return true; } diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index 486391487..924f23497 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -2813,7 +2813,7 @@ void CServerEditionModule::createSession(NLNET::IModuleProxy *sender, TCharId ow else if (first->first == "Rules" ) { info.setDMLess( first->second != "Mastered"); } else if (first->first == "NevraxScenario" && first->second == "1") { nevraxScenario = true; } else if (first->first == "TrialAllowed" && first->second == "1") { trialAllowed = true; } - else if (first->first == "MissionTag" && first->second != "") { missionTag = first->second; } + else if (first->first == "MissionTag" && !first->second.empty()) { missionTag = first->second; } } // info.setMissionTag(missionTag); info.setSessionAnimatorCharId( ownerCharId); @@ -3863,7 +3863,7 @@ void CServerEditionModule::startScenario(NLNET::IModuleProxy *senderModuleProxy, else if (first->first == "Rules" ) { info.setDMLess( first->second != "Mastered"); } else if (first->first == "NevraxScenario" && first->second == "1") { nevraxScenario = true; } else if (first->first == "TrialAllowed" && first->second == "1") { trialAllowed = true; } - else if (first->first == "MissionTag" && first->second != "") { missionTag = first->second; } + else if (first->first == "MissionTag" && !first->second.empty()) { missionTag = first->second; } } info.setSessionAnimatorCharId( charId); diff --git a/code/ryzom/common/src/game_share/string_mgr_module.cpp b/code/ryzom/common/src/game_share/string_mgr_module.cpp index e28fc0c8c..df74f35d1 100644 --- a/code/ryzom/common/src/game_share/string_mgr_module.cpp +++ b/code/ryzom/common/src/game_share/string_mgr_module.cpp @@ -479,14 +479,14 @@ void CStringManagerModule::translateAndForwardWithArg(TDataSetRow senderId,CChat void CStringManagerModule::translateAndForward(TDataSetRow senderId,CChatGroup::TGroupType groupType,std::string id,TSessionId sessionId) { std::string toSend = getValue(sessionId.asInt(), id); - if(toSend != "") + if(!toSend.empty()) send(senderId,groupType,toSend); } void CStringManagerModule::send(TDataSetRow& senderId,CChatGroup::TGroupType groupType,const std::string& toSend) { - if(toSend != "") + if(!toSend.empty()) { ucstring uStr; uStr.fromUtf8(toSend); diff --git a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp index b99009bed..796ce7b78 100644 --- a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp +++ b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp @@ -2071,7 +2071,7 @@ public: _WorldMap.clear(); string ext = CFile::getExtension(name); - if (ext == "") + if (ext.empty()) ext = "cwmap2"; CIFile f(OutputPath+CFile::getFilenameWithoutExtension(name)+"."+ext); f.serial(_WorldMap); @@ -2213,7 +2213,7 @@ public: _WorldMap.clear(); string ext = CFile::getExtension(name); - if (ext == "") + if (ext.empty()) ext = "cw_map2"; CIFile f(CFile::getPath(name) + CFile::getFilenameWithoutExtension(name)+"."+ext); diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp index cd0e4581c..c166f3a14 100644 --- a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp +++ b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp @@ -1178,7 +1178,7 @@ void CScreenshotIslands::loadIslands() } // write the processed proximity map to an output file - if(fileName != "") + if(!fileName.empty()) { writeProximityBufferToTgaFile(fileName, cleanBuffer, zones[i].getZoneWidth(), zones[i].getZoneHeight()); _TempFileNames.push_back(fileName); diff --git a/code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp b/code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp index f94890f04..941db4100 100644 --- a/code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp +++ b/code/ryzom/tools/leveldesign/csv_transform/csv_transform.cpp @@ -167,7 +167,7 @@ public: //--------------------------------------------------------------------------------------------- // housekeeping - if (outputName!="") + if (!outputName.empty()) flush(outputName); } @@ -258,7 +258,7 @@ private: if (i>=cols.size() || i>=lastTblCols.size() || cols[i]!=lastTblCols[i] - || (cols[i]!="" && !headerIsOpen[tblColumnNames[i]])) + || (!cols[i].empty() && !headerIsOpen[tblColumnNames[i]])) { CSString s=headers[tblColumnNames[i]]; for (uint32 j=1;jOutIGDir == "") + if (_Options->OutIGDir.empty()) _OutIGDir = CTools::normalizePath (ContinentCFG.OutIGDir); else _OutIGDir = CTools::normalizePath (_Options->OutIGDir); - if (_Options->LandFile == "") + if (_Options->LandFile.empty()) _LandFile = ContinentCFG.LandFile; else _LandFile = _Options->LandFile; - if (_Options->DfnDir == "") + if (_Options->DfnDir.empty()) _DfnDir = ContinentCFG.DfnDir; else _DfnDir = _Options->DfnDir; - if (_Options->GameElemDir == "") + if (_Options->GameElemDir.empty()) _GameElemDir = ContinentCFG.GameElemDir; else _GameElemDir = _Options->GameElemDir; - if (_Options->InLandscapeDir == "") + if (_Options->InLandscapeDir.empty()) _InLandscapeDir = ContinentCFG.LandZoneWDir; // Directory where to get .zonew files else _InLandscapeDir = _Options->InLandscapeDir; - if (_Options->LandFarBankFile == "") + if (_Options->LandFarBankFile.empty()) _LandBankFile = ContinentCFG.LandBankFile; // The .smallbank file associated with the landscape else _LandBankFile = _Options->LandBankFile; - if (_Options->LandFarBankFile == "") + if (_Options->LandFarBankFile.empty()) _LandFarBankFile = ContinentCFG.LandFarBankFile; // The .farbank file else _LandFarBankFile = _Options->LandFarBankFile; - if (_Options->LandTileNoiseDir == "") + if (_Options->LandTileNoiseDir.empty()) _LandTileNoiseDir = ContinentCFG.LandTileNoiseDir; // Directory where to get displacement map else _LandTileNoiseDir = _Options->LandTileNoiseDir; diff --git a/code/ryzom/tools/leveldesign/export/tools.cpp b/code/ryzom/tools/leveldesign/export/tools.cpp index 6e7dcbad0..5c1e1d9b3 100644 --- a/code/ryzom/tools/leveldesign/export/tools.cpp +++ b/code/ryzom/tools/leveldesign/export/tools.cpp @@ -27,7 +27,7 @@ using namespace NLMISC; // --------------------------------------------------------------------------- void CTools::mkdir (const string &dirName) { - if (dirName == "") + if (dirName.empty()) return; // Does the directory exist ? string newDir = pwd(); diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp index bf405ab5c..f27f2a974 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp @@ -80,7 +80,7 @@ public: return getNpcFullName(); else if (subPart == "function") return _NpcFunction; - else if (subPart == "") + else if (subPart.empty()) return _NpcLabel; throw EParseException(NULL, toString("var_npc don't have a subpart '%s'", subPart.c_str()).c_str()); @@ -137,7 +137,7 @@ public: string evalVar(const string &subPart) { - if (subPart == "") + if (subPart.empty()) return string("\"")+_NpcLabel+"\""; throw EParseException(NULL, toString("var_npc_name don't have a subpart '%s'", subPart.c_str()).c_str()); diff --git a/code/ryzom/tools/leveldesign/mp_generator/main.cpp b/code/ryzom/tools/leveldesign/mp_generator/main.cpp index 1766a3b3b..eed001ac7 100644 --- a/code/ryzom/tools/leveldesign/mp_generator/main.cpp +++ b/code/ryzom/tools/leveldesign/mp_generator/main.cpp @@ -1069,7 +1069,7 @@ void GenerateSpecialItem( int numMP, const CSString& nomMP, const MPCraftStats& void parseSpecialAttributes(const CSString &specialAttributes, MPCraftStats &craftStats, CExtraInfo &extraInfo) { // evaluate DropOrSell according to CraftStats: can DropOrSell if it is a MP Craft - extraInfo.DropOrSell= craftStats.Craft != ""; + extraInfo.DropOrSell= !craftStats.Craft.empty(); // parse attributes vector strArray; diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp b/code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp index f2fa783dc..d34e30c5a 100644 --- a/code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp +++ b/code/ryzom/tools/leveldesign/named_items_2_csv/named_items_2_csv.cpp @@ -254,7 +254,8 @@ int importCsv(const char *filename) do { fields.push_back(s.splitTo(';', true)); - } while (s != ""); + } + while (!s.empty()); } // read values for each item @@ -278,7 +279,8 @@ int importCsv(const char *filename) { val = s.splitTo(';', true); items[n].push_back(val); - } while (s != ""); + } + while (!s.empty()); } fclose(f); @@ -376,7 +378,7 @@ void updateItemField(CVectorSString &lines, uint itemIndex, uint fieldIndex, uin if (pos == string::npos) continue; - if (val != "") + if (!val.empty()) { // check if the attribute is the right one and not included in another one // for example: Protection is in ProtectionFactor @@ -507,7 +509,7 @@ int main(int argc, char *argv[]) } // create a .csv file - if (scriptFile != "") + if (!scriptFile.empty()) { if (CFile::getFilename(scriptFile) == scriptFile) scriptFile = curDir + scriptFile; @@ -545,7 +547,7 @@ int main(int argc, char *argv[]) } // create a .txt file - if (csvFile != "") + if (!csvFile.empty()) { if (CFile::getFilename(csvFile) == csvFile) csvFile = curDir + csvFile; diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp index 279578293..7b47bb88b 100644 --- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp @@ -205,7 +205,7 @@ bool CExport::export_ (SExportOptions &options, IExportCB *expCB) if (_ExportCB != NULL) _ExportCB->dispPass ("Loading height map"); _HeightMap = NULL; - if (_Options->HeightMapFile != "") + if (!_Options->HeightMapFile.empty()) { _HeightMap = new CBitmap; try @@ -236,7 +236,7 @@ bool CExport::export_ (SExportOptions &options, IExportCB *expCB) if (_ExportCB != NULL) _ExportCB->dispPass ("Loading height map"); _HeightMap2 = NULL; - if (_Options->HeightMapFile2 != "") + if (!_Options->HeightMapFile2.empty()) { _HeightMap2 = new CBitmap; try @@ -267,7 +267,7 @@ bool CExport::export_ (SExportOptions &options, IExportCB *expCB) if (_ExportCB != NULL) _ExportCB->dispPass ("Loading color map"); _ColorMap = NULL; - if (_Options->ColorMapFile != "") + if (!_Options->ColorMapFile.empty()) { _ColorMap = new CBitmap; try @@ -314,12 +314,12 @@ bool CExport::export_ (SExportOptions &options, IExportCB *expCB) try { // Add zone files - if (_Options->OutZoneDir != "") + if (!_Options->OutZoneDir.empty()) NLMISC::CPath::getPathContent(_Options->OutZoneDir, true, false, true, allFiles); // Add ig files vector allOtherFiles; - if (_Options->OutIGDir != "") + if (!_Options->OutIGDir.empty()) NLMISC::CPath::getPathContent(_Options->OutIGDir, true, false, true, allOtherFiles); allFiles.insert(allFiles.end(), allOtherFiles.begin(), allOtherFiles.end()); } @@ -386,7 +386,7 @@ bool CExport::export_ (SExportOptions &options, IExportCB *expCB) _ZoneMaxX = nMaxX; _ZoneMaxY = nMaxY; - if ((_Options->ZoneMin != "") && (_Options->ZoneMax != "")) + if (!_Options->ZoneMin.empty() && !_Options->ZoneMax.empty()) { _Options->ZoneMin = strupr (_Options->ZoneMin); _Options->ZoneMax = strupr (_Options->ZoneMax); diff --git a/code/ryzom/tools/pd_parser/main.cpp b/code/ryzom/tools/pd_parser/main.cpp index d181e0c45..bbd9cc8bc 100644 --- a/code/ryzom/tools/pd_parser/main.cpp +++ b/code/ryzom/tools/pd_parser/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char **argv) } } - if (inputfile == "") + if (inputfile.empty()) { nlwarning("Error: missing input file(s)"); exit(EXIT_FAILURE); diff --git a/code/ryzom/tools/pd_parser/parse_node.h b/code/ryzom/tools/pd_parser/parse_node.h index ad2b6a8f2..9a4371234 100644 --- a/code/ryzom/tools/pd_parser/parse_node.h +++ b/code/ryzom/tools/pd_parser/parse_node.h @@ -735,7 +735,7 @@ public: return UserCodes[i].UserCode; // then look for a default code for (i=0; i