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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsExportPackage.cpp
+17 -17
View File
@@ -35,12 +35,12 @@ void ScreenOptionsExportPackage::BeginScreen()
// announcers, characters, others?
vector<OptionRowHandler*> OptionRowHandlers;
FOREACH_CONST( RString, m_vsPackageTypes, s )
for (RString const &s : m_vsPackageTypes)
{
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeNull();
OptionRowDefinition &def = pHand->m_Def;
def.m_sName = *s;
def.m_sName = s;
def.m_bAllowExplanation = false;
//def.m_sExplanationName = "# files, # MB, # subdirs";
def.m_bAllowThemeTitle = false;
@@ -117,8 +117,8 @@ void ScreenOptionsExportPackageSubPage::BeginScreen()
// add noteskins
vector<RString> vs;
GetDirListing( SpecialFiles::NOTESKINS_DIR + "*", vs, true, true );
FOREACH_CONST( RString, vs, s )
GetDirListing( *s + "*", m_vsPossibleDirsToExport, true, true );
for (RString const &s : vs)
GetDirListing( s + "*", m_vsPossibleDirsToExport, true, true );
}
else if( *s_packageType == "Courses" )
{
@@ -128,10 +128,10 @@ void ScreenOptionsExportPackageSubPage::BeginScreen()
GetDirListing( SpecialFiles::COURSES_DIR + "*", vs, true, true );
StripCvsAndSvn( vs );
StripMacResourceForks( vs );
FOREACH_CONST( RString, vs, s )
for (RString const &s : vs)
{
m_vsPossibleDirsToExport.push_back( *s );
GetDirListing( *s + "/*", m_vsPossibleDirsToExport, true, true );
m_vsPossibleDirsToExport.push_back( s );
GetDirListing( s + "/*", m_vsPossibleDirsToExport, true, true );
}
}
else if( *s_packageType == "Songs" )
@@ -139,9 +139,9 @@ void ScreenOptionsExportPackageSubPage::BeginScreen()
// Add song groups
vector<RString> asAllGroups;
SONGMAN->GetSongGroupNames(asAllGroups);
FOREACH_CONST( RString, asAllGroups , s )
for (RString const &s : asAllGroups)
{
m_vsPossibleDirsToExport.push_back(*s);
m_vsPossibleDirsToExport.push_back(s);
}
}
else if( *s_packageType == "SubGroup" )
@@ -149,17 +149,17 @@ void ScreenOptionsExportPackageSubPage::BeginScreen()
//ExportPackages::m_sFolder
vector<RString> vs;
GetDirListing( SpecialFiles::SONGS_DIR + "/" + ExportPackages::m_sFolder + "/*", vs, true, true );
FOREACH_CONST( RString, vs, s )
for (RString const &s : vs)
{
m_vsPossibleDirsToExport.push_back( *s );
GetDirListing( *s + "/*", m_vsPossibleDirsToExport, true, true );
m_vsPossibleDirsToExport.push_back( s );
GetDirListing( s + "/*", m_vsPossibleDirsToExport, true, true );
}
}
StripCvsAndSvn( m_vsPossibleDirsToExport );
StripMacResourceForks( m_vsPossibleDirsToExport );
vector<OptionRowHandler*> OptionRowHandlers;
FOREACH_CONST( RString, m_vsPossibleDirsToExport, s )
for (RString const &s : m_vsPossibleDirsToExport)
{
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeNull();
OptionRowDefinition &def = pHand->m_Def;
@@ -167,7 +167,7 @@ void ScreenOptionsExportPackageSubPage::BeginScreen()
def.m_bAllowThemeTitle = false;
def.m_bAllowThemeItems = false;
def.m_bAllowExplanation = false;
def.m_sName = *s;
def.m_sName = s;
def.m_sExplanationName = "# files, # MB, # subdirs";
def.m_vsChoices.push_back( "" );
@@ -213,11 +213,11 @@ static bool ExportPackage( RString sPackageName, RString sDirToExport, RString &
GetDirListingRecursive( sDirToExport, "*", vs );
SMPackageUtil::StripIgnoredSmzipFiles( vs );
LOG->Trace("Adding files...");
FOREACH( RString, vs, s )
for (RString &s : vs)
{
if( !zip.AddFile( *s ) )
if( !zip.AddFile( s ) )
{
sErrorOut = ssprintf( "Couldn't add file: %s", s->c_str() );
sErrorOut = ssprintf( "Couldn't add file: %s", s.c_str() );
return false;
}
}