Assortment of code correctness fixes

src/common/imageutils.cpp

@@ -1359,16 +1359,16 @@ ConversionErrorType ImgUtl_ConvertTGAToVTF(const char *tgaPath, int nMaxWidth/*=
 		return CE_ERROR_LOADING_DLL;
 	}
 
-	char *vtfParams[4];
+	const char *vtfParams[4];
 
 	// the 0th entry is skipped cause normally thats the program name.
 	vtfParams[0] = "";
 	vtfParams[1] = "-quiet";
 	vtfParams[2] = "-dontusegamedir";
-	vtfParams[3] = (char *)tgaPath;
+	vtfParams[3] = tgaPath;
 
 	// call vtex to do the conversion.
-	vtex->VTex(4, vtfParams);  // how do we know this works?
+	vtex->VTex(4, const_cast<char**>(vtfParams));  // how do we know this works?
 
 	Sys_UnloadModule(vtexmod);
 

src/fgdlib/gamedata.cpp

@@ -91,7 +91,7 @@ static bool DoGetToken(TokenReader &tr, char **ppszStore, int nSize, trtoken_t t
 		// We didn't get the expected token type but no expected
 		// string was specified.
 		//
-		char *pszTokenName;
+		const char *pszTokenName;
 		switch (ttexpecting)
 		{
 			case IDENT:

src/fgdlib/gdvar.cpp

@@ -14,7 +14,7 @@
 typedef struct
 {
 	GDIV_TYPE eType;		// The enumeration of this type.
-	char *pszName;			// The name of this type.
+	const char *pszName;			// The name of this type.
 	trtoken_t eStoreAs;		// How this type is stored (STRING, INTEGER, etc).
 } TypeMap_t;
 
@@ -60,7 +60,7 @@ static TypeMap_t TypeMap[] =
 };
 
 
-char *GDinputvariable::m_pszEmpty = "";
+const char *GDinputvariable::m_pszEmpty = "";
 
 
 //-----------------------------------------------------------------------------

src/fgdlib/inputoutput.cpp

@@ -15,11 +15,11 @@
 typedef struct
 {
 	InputOutputType_t eType;	// The enumeration of this type.
-	char *pszName;				// The name of this type.
+	const char *pszName;				// The name of this type.
 } TypeMap_t;
 
 
-char *CClassInputOutputBase::g_pszEmpty = "";
+const char *CClassInputOutputBase::g_pszEmpty = "";
 
 
 //-----------------------------------------------------------------------------

src/fgdlib/wckeyvalues.cpp

@@ -139,8 +139,8 @@ WCKeyValuesT<Base>::~WCKeyValuesT(void)
 template<class Base>
 const char *WCKeyValuesT<Base>::GetValue(const char *pszKey, int *piIndex) const
 {
-	int i = FindByKeyName( pszKey );
-	if ( i == GetInvalidIndex() )
+	int i = Base::FindByKeyName( pszKey );
+	if ( i == Base::GetInvalidIndex() )
 	{
 		return NULL;
 	}
@@ -149,7 +149,7 @@ const char *WCKeyValuesT<Base>::GetValue(const char *pszKey, int *piIndex) const
 		if(piIndex)
 			piIndex[0] = i;
 
-		return m_KeyValues[i].szValue;
+		return Base::m_KeyValues[i].szValue;
 	}
 }
 
@@ -233,8 +233,8 @@ void WCKeyValuesT<Base>::SetValue(const char *pszKey, const char *pszValue)
 	StripEdgeWhiteSpace(szTmpKey);
 	StripEdgeWhiteSpace(szTmpValue);
 
-	int i = FindByKeyName( szTmpKey );
-	if ( i == GetInvalidIndex() )
+	int i = Base::FindByKeyName( szTmpKey );
+	if ( i == Base::GetInvalidIndex() )
 	{
 		if ( pszValue )
 		{
@@ -244,21 +244,21 @@ void WCKeyValuesT<Base>::SetValue(const char *pszKey, const char *pszValue)
 			MDkeyvalue newkv;
 			Q_strncpy( newkv.szKey, szTmpKey, sizeof( newkv.szKey ) );
 			Q_strncpy( newkv.szValue, szTmpValue, sizeof( newkv.szValue ) );
-			InsertKeyValue( newkv );
+			Base::InsertKeyValue( newkv );
 		}
 	}
 	else
 	{
 		if (pszValue != NULL)
 		{
-			V_strncpy(m_KeyValues[i].szValue, szTmpValue, sizeof(m_KeyValues[i].szValue));
+			V_strncpy(Base::m_KeyValues[i].szValue, szTmpValue, sizeof(Base::m_KeyValues[i].szValue));
 		}
 		//
 		// If we are setting to a NULL value, delete the key.
 		//
 		else
 		{
-			RemoveKeyAt( i );
+			Base::RemoveKeyAt( i );
 		}
 	}
 }
@@ -270,7 +270,7 @@ void WCKeyValuesT<Base>::SetValue(const char *pszKey, const char *pszValue)
 template<class Base>
 void WCKeyValuesT<Base>::RemoveAll(void)
 {
-	m_KeyValues.RemoveAll();
+	Base::m_KeyValues.RemoveAll();
 }
 
 

src/game/client/c_baselesson.cpp

@@ -1828,7 +1828,7 @@ void CScriptedIconLesson::InitElementsFromKeys( CUtlVector< LessonElement_t > *p
 		pchToken = strtok( szSubKeyName, " " );
 		_fieldtypes paramType = LessonParamTypeFromString( pchToken );
 
-		char *pchParam = "";
+		const char *pchParam = "";
 
 		if ( paramType != FIELD_VOID )
 		{

src/game/client/c_effects.h

@@ -174,9 +174,9 @@ friend class CClient_Precipitation::CPrecipitationEffect;
 
 protected:
 	float							m_flParticleInnerDist;	//The distance at which to start drawing the inner system
-	char							*m_pParticleInnerNearDef; //Name of the first inner system
-	char							*m_pParticleInnerFarDef;  //Name of the second inner system
-	char							*m_pParticleOuterDef;     //Name of the outer system
+	const char						*m_pParticleInnerNearDef; //Name of the first inner system
+	const char						*m_pParticleInnerFarDef;  //Name of the second inner system
+	const char						*m_pParticleOuterDef;     //Name of the outer system
 	HPARTICLEFFECT					m_pParticlePrecipInnerNear;
 	HPARTICLEFFECT					m_pParticlePrecipInnerFar;
 	HPARTICLEFFECT					m_pParticlePrecipOuter;

src/game/client/c_team.cpp

@@ -117,7 +117,7 @@ int C_Team::GetTeamNumber() const
 //=================================================================================================
 // Purpose: 
 //-----------------------------------------------------------------------------
-char *C_Team::Get_Name( void )
+const char *C_Team::Get_Name( void )
 {
 	return m_szTeamname;
 }

src/game/client/c_team.h

@@ -31,7 +31,7 @@ class C_Team : public C_BaseEntity
 	virtual void	PreDataUpdate( DataUpdateType_t updateType );
 
 	// Data Handling
-	virtual char	*Get_Name( void );
+	virtual const char	*Get_Name( void );
 	virtual int		Get_Score( void );
 	virtual int		Get_Deaths( void );
 	virtual int		Get_Ping( void );

src/game/client/econ/store/store_viewcart.cpp

@@ -383,7 +383,7 @@ void CCartViewItemEntry::SetEntry( cart_item_t *pEntry, int iEntryIndex )
 		pRemoveButton->AddActionSignalTarget( GetStoreViewCartPanel() );
 	}
 
-	wchar_t *pwzPreviewItem = L"";
+	const wchar_t *pwzPreviewItem = L"";
 	if ( pEntry->bPreviewItem )
 	{
 		pwzPreviewItem = g_pVGuiLocalize->Find( "#Econ_Store_PurchaseType_PreviewItem" );

src/game/client/hl2mp/c_hl2mp_playerresource.cpp

@@ -92,7 +92,7 @@ const char *C_HL2MP_PlayerResource::GetPlayerName( int index )
 		{
 			if (FStrEq( m_szName[nBotIdx], PLAYER_UNCONNECTED_NAME ))
 			{
-				wchar_t *pIdleLabel = g_pVGuiLocalize->Find( "#game_idle" );
+				const wchar_t *pIdleLabel = g_pVGuiLocalize->Find( "#game_idle" );
 				if (!pIdleLabel)
 					pIdleLabel = L"IDLE";
 

src/game/client/hud_squadstatus.cpp

@@ -244,7 +244,7 @@ void CHudSquadStatus::Paint()
 	}
 
 	// draw our squad status
-	wchar_t *text = NULL;
+	const wchar_t *text = NULL;
 	if (m_bSquadMembersFollowing)
 	{
 		text = g_pVGuiLocalize->Find("#Valve_Hud_SQUAD_FOLLOWING");

src/game/client/tf/c_tf_team.cpp

@@ -87,7 +87,7 @@ void C_TFTeam::OnDataChanged( DataUpdateType_t updateType )
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-char* C_TFTeam::Get_Name( void )
+const char* C_TFTeam::Get_Name( void )
 {
 	// Use Get_Localized_Name() instead
 	AssertMsg( false, "Use Get_Localized_Name() instead" );
@@ -120,7 +120,7 @@ void C_TFTeam::UpdateTeamName( void )
 			if ( g_TF_PR && ( g_TF_PR->HasPremadeParties() || g_TF_PR->GetEventTeamStatus() ) )
 			{
 				wchar_t wszTempName[MAX_TEAM_NAME_LENGTH];
-				wchar_t *pFormat = g_pVGuiLocalize->Find( "#TF_Team_PartyLeader" );
+				const wchar_t *pFormat = g_pVGuiLocalize->Find( "#TF_Team_PartyLeader" );
 				if ( !pFormat )
 				{
 					pFormat = L"%s";

src/game/client/tf/c_tf_team.h

@@ -35,7 +35,7 @@ class C_TFTeam : public C_Team
 
 	int				GetFlagCaptures( void ) { return m_nFlagCaptures; }
 	int				GetRole( void ) { return m_iRole; }
-	char			*Get_Name( void );
+	const char		*Get_Name( void );
 
 	int				GetNumObjects( int iObjectType = -1 );
 	CBaseObject		*GetObject( int num );

src/game/client/tf/c_tf_weapon_builder.cpp

@@ -262,7 +262,7 @@ void C_TFWeaponBuilder::SetupObjectSelectionSprite( void )
 {
 #ifdef CLIENT_DLL
 	// Use the sprite details from the text file, with a custom sprite
-	char *iconTexture = GetObjectInfo( m_iObjectType )->m_pIconActive;
+	const char *iconTexture = GetObjectInfo( m_iObjectType )->m_pIconActive;
 	if ( iconTexture && iconTexture[ 0 ] )
 	{
 		m_pSelectionTextureActive = gHUD.GetIcon( iconTexture );

src/game/client/tf/tf_demo_support.cpp

@@ -209,7 +209,7 @@ void CTFDemoSupport::Status( void )
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void CTFDemoSupport::Notify( char *pszMessage )
+void CTFDemoSupport::Notify( const char *pszMessage )
 {
 	if ( engine->IsPlayingDemo() )
 		return;

src/game/client/tf/tf_demo_support.h

@@ -50,7 +50,7 @@ class CTFDemoSupport : public CAutoGameSystemPerFrame, public CGameEventListener
 private:
 	bool IsValidPath( const char *pszFolder );
 	void LogEvent( EDemoEventType eType, int nValue = 0, const char *pszValue = NULL );
-	void Notify( char *pszMessage );
+	void Notify( const char *pszMessage );
 
 	bool m_bRecording;
 	char m_szFolder[24];

src/game/client/tf/tf_hud_mann_vs_machine_status.cpp

@@ -1390,7 +1390,7 @@ void CWaveCompleteSummaryPanel::OnTick( void )
 //-----------------------------------------------------------------------------
 // Purpose: updates the target field based on the input args.  Returns TRUE if transitioning to new state
 //-----------------------------------------------------------------------------
-bool CWaveCompleteSummaryPanel::StateUpdateValue( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int endValue )
+bool CWaveCompleteSummaryPanel::StateUpdateValue( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int endValue )
 {
 	float fPercent = currentTime / targetTime;
 	fPercent = 1.0 < fPercent ? 1.0f : fPercent;

src/game/client/tf/tf_hud_mann_vs_machine_status.h

@@ -244,7 +244,7 @@ class CWaveCompleteSummaryPanel : public vgui::EditablePanel
 		FINISHED,
 	};
 
-	bool StateUpdateValue( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int endValue );
+	bool StateUpdateValue( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int endValue );
 
 	void RatingLabelUpdate( void );
 	void RatingScoreUpdate( void );

src/game/client/tf/tf_hud_mann_vs_machine_victory.cpp

@@ -295,7 +295,7 @@ void CVictoryPanel::CaptureStats()
 //-----------------------------------------------------------------------------
 // Purpose: updates the target field based on the input args.  Returns TRUE if transitioning to new state
 //-----------------------------------------------------------------------------
-bool CVictoryPanel::StateUpdateValue( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int endValue )
+bool CVictoryPanel::StateUpdateValue( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int endValue )
 {
 	float fPercent = currentTime / targetTime;
 	fPercent = 1.0 < fPercent ? 1.0f : fPercent;
@@ -325,7 +325,7 @@ bool CVictoryPanel::StateUpdateValue( vgui::EditablePanel *parent, char* field,
 // Purpose: updates the target field based on the input args.  Returns TRUE if transitioning to new state
 //	Adds "Credit" count text
 //-----------------------------------------------------------------------------
-bool CVictoryPanel::StateUpdateCreditText( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int useValue, int creditValue )
+bool CVictoryPanel::StateUpdateCreditText( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int useValue, int creditValue )
 {
 	float fPercent = currentTime / targetTime;
 	fPercent = 1.0 < fPercent ? 1.0f : fPercent;

src/game/client/tf/tf_hud_mann_vs_machine_victory.h

@@ -66,8 +66,8 @@ class CVictoryPanel : public vgui::EditablePanel
 
 	void CaptureStats();
 
-	bool StateUpdateValue( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int endValue );
-	bool StateUpdateCreditText( vgui::EditablePanel *parent, char* field, float targetTime, float currentTime, int nextState, int useValue, int creditValue );
+	bool StateUpdateValue( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int endValue );
+	bool StateUpdateCreditText( vgui::EditablePanel *parent, const char* field, float targetTime, float currentTime, int nextState, int useValue, int creditValue );
 	bool CheckState( float targetTime, float currentTime, int nextState );
 
 	void RatingLabelUpdate( void );

src/game/client/tf/tf_hud_passtime.cpp

@@ -1578,7 +1578,7 @@ void CTFHudPasstimeBallStatus::OnBallGetOther( int iPlayer )
 
 	wchar_t wszFinalText[128];
 	wchar_t wszPlayerName[MAX_PLAYER_NAME_LENGTH];
-	wchar_t *pwszFormatString = g_pVGuiLocalize->Find( "#TF_Passtime_CarrierName" );
+	const wchar_t *pwszFormatString = g_pVGuiLocalize->Find( "#TF_Passtime_CarrierName" );
 	if ( !pwszFormatString )
 	{
 		pwszFormatString = L"%s1";
@@ -1601,7 +1601,7 @@ void CTFHudPasstimeBallStatus::OnBallGetSelf( int iPlayer )
 
 	wchar_t wszFinalText[128];
 	wchar_t wszPlayerName[MAX_PLAYER_NAME_LENGTH];
-	wchar_t *pwszFormatString = g_pVGuiLocalize->Find( "#TF_Passtime_CarrierName" );
+	const wchar_t *pwszFormatString = g_pVGuiLocalize->Find( "#TF_Passtime_CarrierName" );
 	if ( !pwszFormatString )
 	{
 		pwszFormatString = L"%s1";

src/game/client/tf/tf_hud_pve_winpanel.cpp

@@ -95,7 +95,7 @@ void CTFPVEWinPanel::FireGameEvent( IGameEvent * event )
 		SetDialogVariable( "WinReasonLabel", "" );
 		SetDialogVariable( "DetailsLabel", "" );
 
-		wchar_t *pwchWinReason = L"";
+		const wchar_t *pwchWinReason = L"";
 		switch ( iWinReason )
 		{
 		case 0:

src/game/client/tf/vgui/crafting_panel.cpp

@@ -59,7 +59,7 @@ recipefilter_data_t g_RecipeFilters[NUM_RECIPE_CATEGORIES] =
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-wchar_t *LocalizeRecipeStringPiece( const char *pszString, wchar_t *pszConverted, int nConvertedSizeInBytes ) 
+const wchar_t *LocalizeRecipeStringPiece( const char *pszString, wchar_t *pszConverted, int nConvertedSizeInBytes ) 
 {
 	if ( !pszString )
 		return L"";
@@ -104,16 +104,16 @@ void SetItemPanelToRecipe( CItemModelPanel *pPanel, const CEconCraftingRecipeDef
 		wchar_t	wcTmp[512];
 
 		// Build the input string
-		wchar_t *pInp_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_A(), wcTmpA, sizeof( wcTmpA ) );
-		wchar_t *pInp_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_B(), wcTmpB, sizeof( wcTmpB ) );
-		wchar_t *pInp_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_C(), wcTmpC, sizeof( wcTmpC ) );
+		const wchar_t *pInp_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_A(), wcTmpA, sizeof( wcTmpA ) );
+		const wchar_t *pInp_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_B(), wcTmpB, sizeof( wcTmpB ) );
+		const wchar_t *pInp_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_C(), wcTmpC, sizeof( wcTmpC ) );
 		g_pVGuiLocalize->ConstructString_safe( wcTmpDesc, g_pVGuiLocalize->Find( pRecipeDef->GetDescInputs() ), 3, pInp_A, pInp_B, pInp_C );
 		iNegAttribsBegin = Q_wcslen(wcTmpDesc);
 
 		// Build the output string
-		wchar_t *pOut_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_A(), wcTmpA, sizeof( wcTmpA ) );
-		wchar_t *pOut_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_B(), wcTmpB, sizeof( wcTmpB ) );
-		wchar_t *pOut_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_C(), wcTmpC, sizeof( wcTmpC ) );
+		const wchar_t *pOut_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_A(), wcTmpA, sizeof( wcTmpA ) );
+		const wchar_t *pOut_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_B(), wcTmpB, sizeof( wcTmpB ) );
+		const wchar_t *pOut_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_C(), wcTmpC, sizeof( wcTmpC ) );
 		g_pVGuiLocalize->ConstructString_safe( wcTmp, g_pVGuiLocalize->Find( pRecipeDef->GetDescOutputs() ), 3, pOut_A, pOut_B, pOut_C );
 
 		// Concatenate, and mark the text changes
@@ -654,15 +654,15 @@ void CCraftingPanel::UpdateRecipeItems( bool bClearInputItems )
 				wchar_t wcTmpB[32];
 				wchar_t wcTmpC[32];
 				wchar_t	wcTmp[512];
-				wchar_t *pOut_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_A(), wcTmpA, sizeof( wcTmpA ) );
-				wchar_t *pOut_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_B(), wcTmpB, sizeof( wcTmpB ) );
+				const wchar_t *pOut_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_A(), wcTmpA, sizeof( wcTmpA ) );
+				const wchar_t *pOut_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_B(), wcTmpB, sizeof( wcTmpB ) );
 				wcTmp[0] = '\0';
 				V_wcscat_safe( wcTmp, pOut_A );
 				V_wcscat_safe( wcTmp, L" " );
 				V_wcscat_safe( wcTmp, pOut_B );
 				if ( Q_strnicmp( pRecipeDef->GetDescOutputs(), "#RDO_ABC", 8 ) == 0 )
 				{
-					wchar_t *pOut_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_C(), wcTmpC, sizeof( wcTmpC ) );
+					const wchar_t *pOut_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescO_C(), wcTmpC, sizeof( wcTmpC ) );
 					V_wcscat_safe( wcTmp, L" " );
 					V_wcscat_safe( wcTmp, pOut_C );
 				}
@@ -921,9 +921,9 @@ void CCraftingPanel::UpdateSelectedRecipe( bool bClearInputItems )
 					wchar_t wcTmpB[32];
 					wchar_t wcTmpC[32];
 					wchar_t	wcTmpDesc[512];
-					wchar_t *pInp_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_A(), wcTmpA, sizeof( wcTmpA ) );
-					wchar_t *pInp_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_B(), wcTmpB, sizeof( wcTmpB ) );
-					wchar_t *pInp_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_C(), wcTmpC, sizeof( wcTmpC ) );
+					const wchar_t *pInp_A = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_A(), wcTmpA, sizeof( wcTmpA ) );
+					const wchar_t *pInp_B = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_B(), wcTmpB, sizeof( wcTmpB ) );
+					const wchar_t *pInp_C = LocalizeRecipeStringPiece( pRecipeDef->GetDescI_C(), wcTmpC, sizeof( wcTmpC ) );
 					g_pVGuiLocalize->ConstructString_safe( wcTmpDesc, g_pVGuiLocalize->Find( pRecipeDef->GetDescInputs() ), 3, pInp_A, pInp_B, pInp_C );
 					m_pSelectedRecipeContainer->SetDialogVariable( "recipeinputstring", wcTmpDesc );
 				}

src/game/client/tf/vgui/tf_matchmaking_dashboard_party_member.cpp

@@ -113,9 +113,9 @@ void CDashboardPartyMember::ApplySettings( KeyValues *inResourceData )
 	m_nDisplayPartySlot = inResourceData->GetInt( "party_slot" );
 }
 
-wchar_t* FindStringSafe( const char* pszToken )
+const wchar_t* FindStringSafe( const char* pszToken )
 {
-	static wchar_t* wszEmptyString = L"";
+	static const wchar_t* wszEmptyString = L"";
 	auto index = g_pVGuiLocalize->FindIndex( pszToken );
 	if ( index == INVALID_LOCALIZE_STRING_INDEX )
 		return wszEmptyString;