[Scummvm-git-logs] scummvm master -> a751a60c7246728f05faf21425ef2a14ff00f494
grisenti
noreply at scummvm.org
Fri Dec 15 07:09:46 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a751a60c72 HPL1: Take constant strings as const&
Commit: a751a60c7246728f05faf21425ef2a14ff00f494
https://github.com/scummvm/scummvm/commit/a751a60c7246728f05faf21425ef2a14ff00f494
Author: grisenti (emanuele at grisenti.net)
Date: 2023-12-15T08:09:37+01:00
Commit Message:
HPL1: Take constant strings as const&
Changed paths:
engines/hpl1/engine/system/String.cpp
engines/hpl1/engine/system/String.h
engines/hpl1/penumbra-overture/MainMenu.cpp
diff --git a/engines/hpl1/engine/system/String.cpp b/engines/hpl1/engine/system/String.cpp
index 2124d73716b..b8941f3e796 100644
--- a/engines/hpl1/engine/system/String.cpp
+++ b/engines/hpl1/engine/system/String.cpp
@@ -93,7 +93,7 @@ tWString cString::SubW(const tWString &asString, int alStart, int alCount) {
//-----------------------------------------------------------------------
// Get the file extension of a string
-tString cString::GetFileExt(tString aString) {
+tString cString::GetFileExt(const tString &aString) {
int pos = GetLastStringPos(aString, ".");
if (pos < 0)
@@ -102,7 +102,7 @@ tString cString::GetFileExt(tString aString) {
return aString.substr(pos + 1);
}
-tWString cString::GetFileExtW(tWString aString) {
+tWString cString::GetFileExtW(const tWString &aString) {
int pos = GetLastStringPosW(aString, Common::U32String("."));
if (pos < 0)
@@ -124,7 +124,6 @@ tWString cString::ToLowerCaseW(tWString aString) {
}
//-----------------------------------------------------------------------
-
// Set the file extension
tString cString::SetFileExt(tString aString, tString aExt) {
if (aExt.substr(0, 1) == ".")
@@ -154,13 +153,13 @@ tWString cString::SetFileExtW(tWString aString, tWString aExt) {
//-----------------------------------------------------------------------
-tString cString::SetFilePath(tString aString, tString aPath) {
+tString cString::SetFilePath(const tString &aString, tString aPath) {
if (GetLastChar(aPath) != "/" && GetLastChar(aPath) != "\\")
aPath += "/";
- aString = GetFileName(aString);
+ auto fileName = GetFileName(aString);
- return aPath + aString;
+ return aPath + fileName;
}
tWString cString::SetFilePathW(tWString aString, tWString aPath) {
@@ -175,7 +174,7 @@ tWString cString::SetFilePathW(tWString aString, tWString aPath) {
//-----------------------------------------------------------------------
// Gets the filename in a path
-tString cString::GetFileName(tString aString) {
+tString cString::GetFileName(const tString &aString) {
int pos1 = GetLastStringPos(aString, "\\");
int pos2 = GetLastStringPos(aString, "/");
int pos = pos1 > pos2 ? pos1 : pos2;
@@ -185,7 +184,7 @@ tString cString::GetFileName(tString aString) {
else
return aString.substr(pos + 1);
}
-tWString cString::GetFileNameW(tWString aString) {
+tWString cString::GetFileNameW(const tWString &aString) {
int pos1 = GetLastStringPosW(aString, _W("\\"));
int pos2 = GetLastStringPosW(aString, _W("/"));
int pos = pos1 > pos2 ? pos1 : pos2;
@@ -198,7 +197,7 @@ tWString cString::GetFileNameW(tWString aString) {
//-----------------------------------------------------------------------
-tString cString::GetFilePath(tString aString) {
+tString cString::GetFilePath(const tString &aString) {
if (GetLastStringPos(aString, ".") < 0)
return aString;
@@ -212,7 +211,7 @@ tString cString::GetFilePath(tString aString) {
return aString.substr(0, pos + 1);
}
-tWString cString::GetFilePathW(tWString aString) {
+tWString cString::GetFilePathW(const tWString &aString) {
if (GetLastStringPosW(aString, _W(".")) < 0)
return aString;
@@ -228,7 +227,7 @@ tWString cString::GetFilePathW(tWString aString) {
//-----------------------------------------------------------------------
-tString cString::ReplaceCharTo(tString aString, tString asOldChar, tString asNewChar) {
+tString cString::ReplaceCharTo(tString aString, const tString &asOldChar, const tString &asNewChar) {
if (asNewChar != "") {
for (int i = 0; i < (int)aString.size(); i++) {
if (aString[i] == asOldChar[0])
@@ -246,7 +245,7 @@ tString cString::ReplaceCharTo(tString aString, tString asOldChar, tString asNew
}
}
-tWString cString::ReplaceCharToW(tWString aString, tWString asOldChar, tWString asNewChar) {
+tWString cString::ReplaceCharToW(tWString aString, const tWString &asOldChar, const tWString &asNewChar) {
if (asNewChar != _W("")) {
for (int i = 0; i < (int)aString.size(); i++) {
if (aString[i] == asOldChar[0])
@@ -266,15 +265,15 @@ tWString cString::ReplaceCharToW(tWString aString, tWString asOldChar, tWString
//-----------------------------------------------------------------------
-tString cString::ReplaceStringTo(tString asString, tString asOldString, tString asNewString) {
+tString cString::ReplaceStringTo(const tString &aString, const tString &asOldString, const tString &asNewString) {
tString sNewString = "";
- for (size_t i = 0; i < asString.size(); i++) {
+ for (size_t i = 0; i < aString.size(); i++) {
bool bFound = true;
// Search for old string
- if (asString.size() >= i + asOldString.size()) {
+ if (aString.size() >= i + asOldString.size()) {
for (size_t j = 0; j < asOldString.size(); ++j) {
- if (asString[i + j] != asOldString[j]) {
+ if (aString[i + j] != asOldString[j]) {
bFound = false;
break;
}
@@ -290,7 +289,7 @@ tString cString::ReplaceStringTo(tString asString, tString asOldString, tString
}
// Just add the character
else {
- sNewString += asString[i];
+ sNewString += aString[i];
}
}
return sNewString;
@@ -299,20 +298,20 @@ tString cString::ReplaceStringTo(tString asString, tString asOldString, tString
//-----------------------------------------------------------------------
// gets the last char in the string
-tString cString::GetLastChar(tString aString) {
+tString cString::GetLastChar(const tString &aString) {
if (aString.size() == 0)
return "";
return aString.substr(aString.size() - 1);
}
-tWString cString::GetLastCharW(tWString aString) {
+tWString cString::GetLastCharW(const tWString &aString) {
if (aString.size() == 0)
return _W("");
return aString.substr(aString.size() - 1);
}
//-----------------------------------------------------------------------
-tString cString::ToString(const char *asString, tString asDefault) {
+tString cString::ToString(const char *asString, const tString &asDefault) {
if (asString == NULL)
return asDefault;
@@ -559,7 +558,7 @@ tStringVec &cString::GetStringVec(const tString &asData, tStringVec &avVec, tStr
/// Helper
// returns last char in a string
-int cString::GetLastStringPos(tString aString, tString aChar) {
+int cString::GetLastStringPos(const tString &aString, const tString &aChar) {
int pos = -1;
for (int i = 0; i < (int)aString.size(); i++) {
if (aString.substr(i, aChar.size()) == aChar)
@@ -570,7 +569,7 @@ int cString::GetLastStringPos(tString aString, tString aChar) {
/// Helper
// returns last char in a string
-int cString::GetLastStringPosW(tWString aString, tWString aChar) {
+int cString::GetLastStringPosW(const tWString &aString, const tWString &aChar) {
int pos = -1;
for (int i = 0; i < (int)aString.size(); i++) {
if (aString.substr(i, aChar.size()) == aChar)
diff --git a/engines/hpl1/engine/system/String.h b/engines/hpl1/engine/system/String.h
index 641039322b2..bbefcff5149 100644
--- a/engines/hpl1/engine/system/String.h
+++ b/engines/hpl1/engine/system/String.h
@@ -66,8 +66,8 @@ public:
* \param aString extension (for example ".exe"). If none "" is returned.
* \return
*/
- static tString GetFileExt(tString aString);
- static tWString GetFileExtW(tWString aString);
+ static tString GetFileExt(const tString &aString);
+ static tWString GetFileExtW(const tWString &aString);
/**
* Sets the file extension. "" removes extension, for example "test.exe" -> "test"
* \param aString New string
@@ -82,22 +82,22 @@ public:
* \param aString The Filename
* \return
*/
- static tString GetFileName(tString aString);
- static tWString GetFileNameW(tWString aString);
+ static tString GetFileName(const tString &aString);
+ static tWString GetFileNameW(const tWString &aString);
/**
* Removes the filename from a path
* \param aString
* \return
*/
- static tString GetFilePath(tString aString);
- static tWString GetFilePathW(tWString aString);
+ static tString GetFilePath(const tString &aString);
+ static tWString GetFilePathW(const tWString &aString);
/**
* Sets the path for a file.
* \param aString
* \param aPath New path
* \return
*/
- static tString SetFilePath(tString aString, tString aPath);
+ static tString SetFilePath(const tString &aString, tString aPath);
static tWString SetFilePathW(tWString aString, tWString aPath);
/**
* Converts a string to lower case.
@@ -114,8 +114,8 @@ public:
* \param asNewChar The char to replace with (one character only!)
* \return
*/
- static tString ReplaceCharTo(tString aString, tString asOldChar, tString asNewChar);
- static tWString ReplaceCharToW(tWString aString, tWString asOldChar, tWString asNewChar);
+ static tString ReplaceCharTo(tString aString, const tString &asOldChar, const tString &asNewChar);
+ static tWString ReplaceCharToW(tWString aString, const tWString &asOldChar, const tWString &asNewChar);
/**
*
@@ -124,9 +124,9 @@ public:
* \param asNewString The char to replace with
* \return
*/
- static tString ReplaceStringTo(tString aString, tString asOldString, tString asNewString);
+ static tString ReplaceStringTo(const tString &aString, const tString &asOldString, const tString &asNewString);
- static tString ToString(const char *asString, tString asDefault);
+ static tString ToString(const char *asString, const tString &asDefault);
static int ToInt(const char *asString, int alDefault);
static bool ToBool(const char *asString, bool abDefault);
static float ToFloat(const char *asString, float afDefault);
@@ -184,16 +184,16 @@ public:
* \param aString
* \return
*/
- static tString GetLastChar(tString aString);
- static tWString GetLastCharW(tWString aString);
+ static tString GetLastChar(const tString &aString);
+ static tWString GetLastCharW(const tWString &aString);
/**
* Get the last pos where aChar is found.
* \param aString
* \param aChar
* \return >=0 if string is found else -1
*/
- static int GetLastStringPos(tString aString, tString aChar);
- static int GetLastStringPosW(tWString aString, tWString aChar);
+ static int GetLastStringPos(const tString &aString, const tString &aChar);
+ static int GetLastStringPosW(const tWString &aString, const tWString &aChar);
static void UIntStringToArray(unsigned int *apArray, const char *apString, int alSize);
static void FloatStringToArray(float *apArray, const char *apString, int alSize);
diff --git a/engines/hpl1/penumbra-overture/MainMenu.cpp b/engines/hpl1/penumbra-overture/MainMenu.cpp
index dd69e38da21..a163ce4a003 100644
--- a/engines/hpl1/penumbra-overture/MainMenu.cpp
+++ b/engines/hpl1/penumbra-overture/MainMenu.cpp
@@ -720,7 +720,7 @@ class cMainMenuWidget_LoadSaveGame : public cMainMenuWidget_Button {
public:
cMainMenuWidget_LoadSaveGame(cInit *apInit, const cVector3f &avPos, const tWString &asText,
cVector2f avFontSize, eFontAlign aAlignment,
- tWString asDir, int alNum)
+ const tWString &asDir, int alNum)
: cMainMenuWidget_Button(apInit, avPos, asText, eMainMenuState_LastEnum, avFontSize, aAlignment) {
msDir = asDir;
mlNum = alNum;
@@ -747,7 +747,7 @@ class cMainMenuWidget_RemoveSaveGame : public cMainMenuWidget_Button {
public:
cMainMenuWidget_RemoveSaveGame(cInit *apInit, const cVector3f &avPos, const tWString &asText,
cVector2f avFontSize, eFontAlign aAlignment,
- tWString asDir, int alNum)
+ const tWString &asDir, int alNum)
: cMainMenuWidget_Button(apInit, avPos, asText, eMainMenuState_LastEnum, avFontSize, aAlignment) {
msDir = asDir;
mlNum = alNum;
More information about the Scummvm-git-logs
mailing list