diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index 53b960a104..8a8df22cb7 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -48,7 +48,7 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers) { try { Driver = DriversToTry[i]; - LOG->Trace("Initializing driver: %s", DriversToTry[i].GetString()); + LOG->Trace("Initializing driver: %s", DriversToTry[i].c_str()); #ifdef WIN32 if(!DriversToTry[i].CompareNoCase("DirectSound")) ret = new RageSound_DSound; @@ -60,15 +60,15 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers) #endif if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null; if( !ret ) - LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].GetString()); + LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].c_str()); } catch(const RageException &e) { - LOG->Info("Couldn't load driver %s: %s", DriversToTry[i].GetString(), e.what()); + LOG->Info("Couldn't load driver %s: %s", DriversToTry[i].c_str(), e.what()); } } if(ret) - LOG->Info("Sound driver: %s", Driver.GetString()); + LOG->Info("Sound driver: %s", Driver.c_str()); return ret; } diff --git a/stepmania/src/archutils/Win32/DebugInfoHunt.cpp b/stepmania/src/archutils/Win32/DebugInfoHunt.cpp index a713c5e471..be973994ad 100644 --- a/stepmania/src/archutils/Win32/DebugInfoHunt.cpp +++ b/stepmania/src/archutils/Win32/DebugInfoHunt.cpp @@ -18,11 +18,11 @@ struct VideoDriverInfo void LogVideoDriverInfo( VideoDriverInfo info ) { LOG->Info("Video Driver Information:"); - LOG->Info("%-15s:\t%s", "Provider", info.sProvider.GetString()); - LOG->Info("%-15s:\t%s", "Description", info.sDescription.GetString()); - LOG->Info("%-15s:\t%s", "Version", info.sVersion.GetString()); - LOG->Info("%-15s:\t%s", "Date", info.sDate.GetString()); - LOG->Info("%-15s:\t%s", "DeviceID", info.sDeviceID.GetString()); + LOG->Info("%-15s:\t%s", "Provider", info.sProvider.c_str()); + LOG->Info("%-15s:\t%s", "Description", info.sDescription.c_str()); + LOG->Info("%-15s:\t%s", "Version", info.sVersion.c_str()); + LOG->Info("%-15s:\t%s", "Date", info.sDate.c_str()); + LOG->Info("%-15s:\t%s", "DeviceID", info.sDeviceID.c_str()); } CString GetRegValue( HKEY hKey, CString sName ) @@ -119,7 +119,7 @@ static void GetDisplayDriverDebugInfo() if( sPrimaryDeviceName == "" ) LOG->Info( "Primary display driver could not be determined." ); else - LOG->Info( "Primary display driver: %s", sPrimaryDeviceName.GetString() ); + LOG->Info( "Primary display driver: %s", sPrimaryDeviceName.c_str() ); OSVERSIONINFO version; version.dwOSVersionInfoSize=sizeof(version); @@ -213,7 +213,7 @@ void SearchForDebugInfo() } else Ver += "???"; Ver += ssprintf(") build %i [%s]", ovi.dwBuildNumber & 0xffff, ovi.szCSDVersion); - LOG->Info("%s", Ver.GetString()); + LOG->Info("%s", Ver.c_str()); } }