actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More loops.

Browse Source 
TODO: Look into a proper "implode" function.
This commit is contained in:
Jason Felds
2013-04-30 20:54:15 -04:00
parent a6133c35c3
commit fa3e09ce42
1 changed files with 550 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteSkinManager.cpp
+15 -13
View File
@@ -284,22 +284,22 @@ RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sEl
const NoteSkinData &data = iter->second; const NoteSkinData &data = iter->second;
RString sPath; // fill this in below RString sPath; // fill this in below
FOREACH_CONST( RString, data.vsDirSearchOrder, lIter ) for (RString const &directory : data.vsDirSearchOrder)
{ {
if( sButtonName.empty() ) if( sButtonName.empty() )
sPath = GetPathFromDirAndFile( *lIter, sElement ); sPath = GetPathFromDirAndFile( directory, sElement );
else else
sPath = GetPathFromDirAndFile( *lIter, sButtonName+" "+sElement ); sPath = GetPathFromDirAndFile( directory, sButtonName+" "+sElement );
if( !sPath.empty() ) if( !sPath.empty() )
break; // done searching break; // done searching
} }
if( sPath.empty() ) if( sPath.empty() )
{ {
FOREACH_CONST( RString, data.vsDirSearchOrder, lIter ) for (RString const &directory : data.vsDirSearchOrder)
{ {
if( !sButtonName.empty() ) if( !sButtonName.empty() )
sPath = GetPathFromDirAndFile( *lIter, "Fallback "+sElement ); sPath = GetPathFromDirAndFile( directory, "Fallback "+sElement );
if( !sPath.empty() ) if( !sPath.empty() )
break; // done searching break; // done searching
} }
@@ -308,12 +308,14 @@ RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sEl
if( sPath.empty() ) if( sPath.empty() )
{ {
RString sPaths; RString sPaths;
FOREACH_CONST( RString, data.vsDirSearchOrder, dir )
// TODO: Find a more elegant way of doing this.
for (RString const &dir : data.vsDirSearchOrder)
{ {
if( !sPaths.empty() ) if( !sPaths.empty() )
sPaths += ", "; sPaths += ", ";
sPaths += *dir; sPaths += dir;
} }
RString message = ssprintf( RString message = ssprintf(
@@ -323,8 +325,8 @@ RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sEl
if( Dialog::AbortRetryIgnore(message) == Dialog::retry ) if( Dialog::AbortRetryIgnore(message) == Dialog::retry )
{ {
FOREACH_CONST( RString, data.vsDirSearchOrder, dir ) for (RString const &dir : data.vsDirSearchOrder)
FILEMAN->FlushDirCache( *dir ); FILEMAN->FlushDirCache( dir );
g_PathCache.clear(); g_PathCache.clear();
return GetPath( sButtonName, sElement ); return GetPath( sButtonName, sElement );
} }
@@ -342,9 +344,9 @@ RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sEl
GetFileContents( sPath, sNewFileName, true ); GetFileContents( sPath, sNewFileName, true );
RString sRealPath; RString sRealPath;
FOREACH_CONST( RString, data.vsDirSearchOrder, lIter ) for (RString const &directory : data.vsDirSearchOrder)
{ {
sRealPath = GetPathFromDirAndFile( *lIter, sNewFileName ); sRealPath = GetPathFromDirAndFile( directory, sNewFileName );
if( !sRealPath.empty() ) if( !sRealPath.empty() )
break; // done searching break; // done searching
} }
@@ -358,8 +360,8 @@ RString NoteSkinManager::GetPath( const RString &sButtonName, const RString &sEl
if( Dialog::AbortRetryIgnore(message) == Dialog::retry ) if( Dialog::AbortRetryIgnore(message) == Dialog::retry )
{ {
FOREACH_CONST( RString, data.vsDirSearchOrder, dir ) for (RString const &dir : data.vsDirSearchOrder)
FILEMAN->FlushDirCache( *dir ); FILEMAN->FlushDirCache( dir );
g_PathCache.clear(); g_PathCache.clear();
return GetPath( sButtonName, sElement ); return GetPath( sButtonName, sElement );
} }