TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moves from using dStrCmp to the new String::compare static functions. Keeps things cleaner, consistent, and works with intellisense.

Browse source
This commit is contained in:
Lukas Aldershaab 2020-10-03 14:37:55 +02:00
parent 76c5e30869
commit c999baf7ed
68 changed files with 168 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/util/settings.cpp
View file

@ -92,9 +92,9 @@ const UTF8 *Settings::value(const UTF8 *settingName, const UTF8 *defaultValue)
const UTF8 *storedDefaultValue = getDataField(defaultNameEntry, NULL);
setModStaticFields(true);
if(dStrcmp(value, "") != 0)
if(String::compare(value, "") != 0)
return value;
else if(dStrcmp(storedDefaultValue, "") != 0)
else if(String::compare(storedDefaultValue, "") != 0)
return storedDefaultValue;
else
return defaultValue;
@ -124,9 +124,9 @@ void Settings::remove(const UTF8 *settingName, bool includeDefaults)
SimFieldDictionary::Entry* fieldEntry = *itr;
// is this a field of our current group
if ( (dStrcmp(nameEntry, "") == 0) ||
dStrcmp( nameEntry, fieldEntry->slotName ) == 0 ||
(includeDefaults && dStrcmp( nameEntryDefault, fieldEntry->slotName ) == 0) )
if ( (String::compare(nameEntry, "") == 0) ||
String::compare( nameEntry, fieldEntry->slotName ) == 0 ||
(includeDefaults && String::compare( nameEntryDefault, fieldEntry->slotName ) == 0) )
{
// Yes, so remove it.
pFieldDictionary->setFieldValue( fieldEntry->slotName, "" );
@ -297,7 +297,7 @@ void Settings::readLayer(SimXMLDocument *document, String groupStack)
const UTF8 *name = document->attribute("name");
const UTF8 *value = document->getText();
if(dStrcmp(type, "Group") == 0)
if(String::compare(type, "Group") == 0)
{
String newStack = groupStack;
@ -306,7 +306,7 @@ void Settings::readLayer(SimXMLDocument *document, String groupStack)
newStack += name;
readLayer(document, newStack);
} else if(dStrcmp(type, "Setting") == 0)
} else if(String::compare(type, "Setting") == 0)
{
String nameString = groupStack;
@ -678,9 +678,9 @@ DefineEngineMethod(Settings, value, const char*, (const char * settingName, cons
{
StringTableEntry fieldName = StringTable->insert( settingName );
if (dStrcmp(defaultValue, "") != 0)
if (String::compare(defaultValue, "") != 0)
return object->value( fieldName, defaultValue );
else if (dStrcmp(settingName, "") != 0)
else if (String::compare(settingName, "") != 0)
return object->value( fieldName );
return "";