Skip to content

refactor(string): Fix constness of TheEmptyString #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Dec 1, 2025
Merged

refactor(string): Fix constness of TheEmptyString #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6792e01
refactor(string): Fix constness of TheEmptyString
xezon Nov 30, 2025
7ceae0b
Replicate in Generals
xezon Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/Common/AsciiString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class AsciiString
string, so we don't need to construct temporaries
for such a common thing.
*/
static AsciiString TheEmptyString;
static const AsciiString TheEmptyString;

/**
Default constructor -- construct a new, empty AsciiString.
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/Common/UnicodeString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class UnicodeString
string, so we don't need to construct temporaries
for such a common thing.
*/
static UnicodeString TheEmptyString;
static const UnicodeString TheEmptyString;

/**
Default constructor -- construct a new, empty UnicodeString.
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/System/AsciiString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

// -----------------------------------------------------

/*static*/ AsciiString AsciiString::TheEmptyString;
/*static*/ const AsciiString AsciiString::TheEmptyString;

//-----------------------------------------------------------------------------
inline char* skipSeps(char* p, const char* seps)
Expand Down
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/Common/System/UnicodeString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

// -----------------------------------------------------

/*static*/ UnicodeString UnicodeString::TheEmptyString;
/*static*/ const UnicodeString UnicodeString::TheEmptyString;

// -----------------------------------------------------
#ifdef RTS_DEBUG
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameClient/IMEManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class IMEManagerInterface : public SubsystemInterface


virtual Int getCandidateCount() = 0; ///< Returns the total number of candidates
virtual UnicodeString*getCandidate( Int index ) = 0; ///< Returns the candidate string
virtual const UnicodeString* getCandidate( Int index ) = 0; ///< Returns the candidate string
virtual Int getSelectedCandidateIndex() = 0; ///< Returns the indexed of the currently selected candidate
virtual Int getCandidatePageSize() = 0; ///< Returns the page size for the candidates list
virtual Int getCandidatePageStart() = 0; ///< Returns the index of the first visibel candidate
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )

for ( Int i = 0; i < count; i++, y+= height )
{
UnicodeString *candidate = ime->getCandidate( first + i );
const UnicodeString *candidate = ime->getCandidate( first + i );
Int tcolor, bcolor;

if ( i == selected )
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class IMEManager : public IMEManagerInterface
virtual Int getIndexBase( void ); ///< Get index base for candidate list

virtual Int getCandidateCount(); ///< Returns the total number of candidates
virtual UnicodeString*getCandidate( Int index ); ///< Returns the candidate string
virtual const UnicodeString* getCandidate( Int index ); ///< Returns the candidate string
virtual Int getSelectedCandidateIndex(); ///< Returns the indexed of the currently selected candidate
virtual Int getCandidatePageSize(); ///< Returns the page size for the candidates list
virtual Int getCandidatePageStart(); ///< Returns the index of the first visibel candidate
Expand Down Expand Up @@ -1528,7 +1528,7 @@ Int IMEManager::getCandidateCount()
// IMEManager::getCandidate
//============================================================================

UnicodeString* IMEManager::getCandidate( Int index )
const UnicodeString* IMEManager::getCandidate( Int index )
{
if ( m_candidateString != NULL && index >=0 && index < m_candidateCount )
{
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class IMEManagerInterface : public SubsystemInterface


virtual Int getCandidateCount() = 0; ///< Returns the total number of candidates
virtual UnicodeString*getCandidate( Int index ) = 0; ///< Returns the candidate string
virtual const UnicodeString* getCandidate( Int index ) = 0; ///< Returns the candidate string
virtual Int getSelectedCandidateIndex() = 0; ///< Returns the indexed of the currently selected candidate
virtual Int getCandidatePageSize() = 0; ///< Returns the page size for the candidates list
virtual Int getCandidatePageStart() = 0; ///< Returns the index of the first visibel candidate
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )

for ( Int i = 0; i < count; i++, y+= height )
{
UnicodeString *candidate = ime->getCandidate( first + i );
const UnicodeString *candidate = ime->getCandidate( first + i );
Int tcolor, bcolor;

if ( i == selected )
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class IMEManager : public IMEManagerInterface
virtual Int getIndexBase( void ); ///< Get index base for candidate list

virtual Int getCandidateCount(); ///< Returns the total number of candidates
virtual UnicodeString*getCandidate( Int index ); ///< Returns the candidate string
virtual const UnicodeString* getCandidate( Int index ); ///< Returns the candidate string
virtual Int getSelectedCandidateIndex(); ///< Returns the indexed of the currently selected candidate
virtual Int getCandidatePageSize(); ///< Returns the page size for the candidates list
virtual Int getCandidatePageStart(); ///< Returns the index of the first visibel candidate
Expand Down Expand Up @@ -1528,7 +1528,7 @@ Int IMEManager::getCandidateCount()
// IMEManager::getCandidate
//============================================================================

UnicodeString* IMEManager::getCandidate( Int index )
const UnicodeString* IMEManager::getCandidate( Int index )
{
if ( m_candidateString != NULL && index >=0 && index < m_candidateCount )
{
Expand Down
Loading