From 85cbccad564b80d9a4c6411aa65659744edf5b0c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 16 Jun 2004 07:03:25 +0000 Subject: [PATCH] unsigned -> size_t for string::find returns --- stepmania/src/FontCharAliases.cpp | 2 +- stepmania/src/NotesLoaderBMS.cpp | 2 +- stepmania/src/NotesLoaderDWI.cpp | 6 +++--- stepmania/src/ScreenTestSound.cpp | 2 +- stepmania/src/TitleSubstitution.cpp | 2 +- stepmania/src/archutils/Win32/RegistryAccess.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/FontCharAliases.cpp b/stepmania/src/FontCharAliases.cpp index 86c2517094..70b3a2a890 100644 --- a/stepmania/src/FontCharAliases.cpp +++ b/stepmania/src/FontCharAliases.cpp @@ -319,7 +319,7 @@ void ReplaceText( CString &Text, const map &m ) size_t start = 0; while(1) { - unsigned pos = txt.find(it->first, start); + size_t pos = txt.find(it->first, start); if(pos == txt.npos) break; diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index 92275f6045..c7a27c580a 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -516,7 +516,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out ) if( value_name == "#title" ) { // strip Steps type out of description leaving only song title - looks like 'B4U ' - unsigned iIndex = value_data.find_last_of('<'); + size_t iIndex = value_data.find_last_of('<'); if( iIndex == value_data.npos ) iIndex = value_data.find_last_of('('); if( iIndex != value_data.npos ) diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index a4ee6797a3..46bcc9753e 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -484,14 +484,14 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out ) * to pick up images used here as song images (eg. banners). */ CString param = sParams[1]; /* "{foo} ... {foo2}" */ - unsigned pos = 0; + size_t pos = 0; while( pos < CString::npos ) { - unsigned startpos = param.find('{', pos); + size_t startpos = param.find('{', pos); if( startpos == CString::npos ) break; - unsigned endpos = param.find('}', startpos); + size_t endpos = param.find('}', startpos); if( endpos == CString::npos ) break; diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp index 0fd4b014fe..745e2d69c1 100644 --- a/stepmania/src/ScreenTestSound.cpp +++ b/stepmania/src/ScreenTestSound.cpp @@ -60,7 +60,7 @@ void ScreenTestSound::UpdateText(int n) { CString fn = s[n].s.GetLoadedFilePath(); - unsigned x = fn.find_last_of("/\\"); + size_t x = fn.find_last_of("/\\"); if(x != fn.npos) fn.erase(0, x+1); vector snds; diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp index 70210814da..908df85eb8 100644 --- a/stepmania/src/TitleSubstitution.cpp +++ b/stepmania/src/TitleSubstitution.cpp @@ -143,7 +143,7 @@ void TitleSubst::Load(const CString &filename, const CString §ion) continue; } - unsigned pos = line.find_first_of(':'); + size_t pos = line.find_first_of(':'); if(pos != string::npos) { /* x: y */ diff --git a/stepmania/src/archutils/Win32/RegistryAccess.cpp b/stepmania/src/archutils/Win32/RegistryAccess.cpp index 01f7af0412..260d344c14 100644 --- a/stepmania/src/archutils/Win32/RegistryAccess.cpp +++ b/stepmania/src/archutils/Win32/RegistryAccess.cpp @@ -7,7 +7,7 @@ * the HKEY_LOCAL_MACHINE constant in key. */ static bool GetRegKeyType( const CString &in, CString &out, HKEY &key ) { - unsigned backslash = in.find( '\\' ); + size_t backslash = in.find( '\\' ); if( backslash == in.npos ) { LOG->Warn( "Invalid registry key: \"%s\" ", in.c_str() );