ToLower -> MakeLower
This commit is contained in:
@@ -58,7 +58,7 @@ void NoteField::Unload()
|
|||||||
void NoteField::CacheNoteSkin( const RString &sNoteSkin_ )
|
void NoteField::CacheNoteSkin( const RString &sNoteSkin_ )
|
||||||
{
|
{
|
||||||
RString sNoteSkin = sNoteSkin_;
|
RString sNoteSkin = sNoteSkin_;
|
||||||
sNoteSkin.ToLower();
|
sNoteSkin.MakeLower();
|
||||||
|
|
||||||
if( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end() )
|
if( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end() )
|
||||||
return;
|
return;
|
||||||
@@ -78,7 +78,7 @@ void NoteField::CacheNoteSkin( const RString &sNoteSkin_ )
|
|||||||
void NoteField::UncacheNoteSkin( const RString &sNoteSkin_ )
|
void NoteField::UncacheNoteSkin( const RString &sNoteSkin_ )
|
||||||
{
|
{
|
||||||
RString sNoteSkin( sNoteSkin_ );
|
RString sNoteSkin( sNoteSkin_ );
|
||||||
sNoteSkin.ToLower();
|
sNoteSkin.MakeLower();
|
||||||
|
|
||||||
LOG->Trace("NoteField::CacheNoteSkin: release %s", sNoteSkin.c_str() );
|
LOG->Trace("NoteField::CacheNoteSkin: release %s", sNoteSkin.c_str() );
|
||||||
ASSERT_M( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end(), sNoteSkin );
|
ASSERT_M( m_NoteDisplays.find(sNoteSkin) != m_NoteDisplays.end(), sNoteSkin );
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ int BMSLoader::GetMeasureStartRow( const MeasureToTimeSig_t &sigs, int iMeasureN
|
|||||||
|
|
||||||
void BMSLoader::SearchForDifficulty( RString sTag, Steps *pOut )
|
void BMSLoader::SearchForDifficulty( RString sTag, Steps *pOut )
|
||||||
{
|
{
|
||||||
sTag.ToLower();
|
sTag.MakeLower();
|
||||||
|
|
||||||
/* Only match "Light" in parentheses. */
|
/* Only match "Light" in parentheses. */
|
||||||
if( sTag.find( "(light" ) != sTag.npos )
|
if( sTag.find( "(light" ) != sTag.npos )
|
||||||
@@ -892,7 +892,7 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
|
|||||||
if( GetTagFromMap( aBMSData[i], "#title", sTag ) && sTag.size() != commonSubstring.size() )
|
if( GetTagFromMap( aBMSData[i], "#title", sTag ) && sTag.size() != commonSubstring.size() )
|
||||||
{
|
{
|
||||||
sTag = sTag.substr( commonSubstring.size(), sTag.size() - commonSubstring.size() );
|
sTag = sTag.substr( commonSubstring.size(), sTag.size() - commonSubstring.size() );
|
||||||
sTag.ToLower();
|
sTag.MakeLower();
|
||||||
|
|
||||||
// XXX: We should do this with filenames too, I have plenty of examples.
|
// XXX: We should do this with filenames too, I have plenty of examples.
|
||||||
// however, filenames will be trickier, as stuffs at the beginning AND
|
// however, filenames will be trickier, as stuffs at the beginning AND
|
||||||
|
|||||||
@@ -525,7 +525,7 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
|
|||||||
|
|
||||||
pos = endpos + 1;
|
pos = endpos + 1;
|
||||||
|
|
||||||
sub.ToLower();
|
sub.MakeLower();
|
||||||
BlacklistedImages.insert( sub );
|
BlacklistedImages.insert( sub );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ SoundReader *RageSoundReader_Chain::Copy() const
|
|||||||
* read it more than once at a time. */
|
* read it more than once at a time. */
|
||||||
bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fPan )
|
bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fPan )
|
||||||
{
|
{
|
||||||
sPath.ToLower();
|
sPath.MakeLower();
|
||||||
|
|
||||||
map<RString, SoundReader *>::const_iterator it;
|
map<RString, SoundReader *>::const_iterator it;
|
||||||
it = m_apLoadedSounds.find( sPath );
|
it = m_apLoadedSounds.find( sPath );
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ void FileSet::GetFilesMatching( const RString &sBeginning_, const RString &sCont
|
|||||||
/* "files" is a case-insensitive mapping, by filename. Use lower_bound to figure
|
/* "files" is a case-insensitive mapping, by filename. Use lower_bound to figure
|
||||||
* out where to start. */
|
* out where to start. */
|
||||||
RString sBeginning = sBeginning_;
|
RString sBeginning = sBeginning_;
|
||||||
sBeginning.ToLower();
|
sBeginning.MakeLower();
|
||||||
RString sContaining = sContaining_;
|
RString sContaining = sContaining_;
|
||||||
sContaining.ToLower();
|
sContaining.MakeLower();
|
||||||
RString sEnding = sEnding_;
|
RString sEnding = sEnding_;
|
||||||
sEnding.ToLower();
|
sEnding.MakeLower();
|
||||||
|
|
||||||
set<File>::const_iterator i = files.lower_bound( File(sBeginning) );
|
set<File>::const_iterator i = files.lower_bound( File(sBeginning) );
|
||||||
for( ; i != files.end(); ++i )
|
for( ; i != files.end(); ++i )
|
||||||
|
|||||||
@@ -642,7 +642,7 @@ void Song::TidyUpData()
|
|||||||
|
|
||||||
// ignore DWI "-char" graphics
|
// ignore DWI "-char" graphics
|
||||||
RString sLower = arrayImages[i];
|
RString sLower = arrayImages[i];
|
||||||
sLower.ToLower();
|
sLower.MakeLower();
|
||||||
if( BlacklistedImages.find(sLower) != BlacklistedImages.end() )
|
if( BlacklistedImages.find(sLower) != BlacklistedImages.end() )
|
||||||
continue; // skip
|
continue; // skip
|
||||||
|
|
||||||
|
|||||||
@@ -404,13 +404,13 @@ struct CompareLanguageTag
|
|||||||
{
|
{
|
||||||
m_sLanguageString = RString("(lang ") + sLang + ")";
|
m_sLanguageString = RString("(lang ") + sLang + ")";
|
||||||
LOG->Trace( "try \"%s\"", sLang.c_str() );
|
LOG->Trace( "try \"%s\"", sLang.c_str() );
|
||||||
m_sLanguageString.ToLower();
|
m_sLanguageString.MakeLower();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator()( const RString &sFile ) const
|
bool operator()( const RString &sFile ) const
|
||||||
{
|
{
|
||||||
RString sLower( sFile );
|
RString sLower( sFile );
|
||||||
sLower.ToLower();
|
sLower.MakeLower();
|
||||||
size_t iPos = sLower.find( m_sLanguageString );
|
size_t iPos = sLower.find( m_sLanguageString );
|
||||||
return iPos != RString::npos;
|
return iPos != RString::npos;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user