refactor(string): Fix constness of TheEmptyString (#1930)

Author: xezon

Core/GameEngine/Include/Common/AsciiString.h

@@ -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.

Core/GameEngine/Include/Common/UnicodeString.h

@@ -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.

Core/GameEngine/Source/Common/System/AsciiString.cpp

@@ -49,7 +49,7 @@
 
 // -----------------------------------------------------
 
-/*static*/ AsciiString AsciiString::TheEmptyString;
+/*static*/ const AsciiString AsciiString::TheEmptyString;
 
 //-----------------------------------------------------------------------------
 inline char* skipSeps(char* p, const char* seps)

Core/GameEngine/Source/Common/System/UnicodeString.cpp

@@ -49,7 +49,7 @@
 
 // -----------------------------------------------------
 
-/*static*/ UnicodeString UnicodeString::TheEmptyString;
+/*static*/ const UnicodeString UnicodeString::TheEmptyString;
 
 // -----------------------------------------------------
 #ifdef RTS_DEBUG

Generals/Code/GameEngine/Include/GameClient/IMEManager.h

@@ -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

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp

@@ -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 )

Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp

@@ -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
@@ -1525,7 +1525,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 )
 	{

GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h

@@ -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

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp

@@ -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 )

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp

@@ -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
@@ -1525,7 +1525,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 )
 	{