mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-26 23:33:49 +01:00
Use standard library style members of wxArrayString (and wxString) ...
... which will make it easier to change the types of those containers to std::vectors of other string-like classes for wxString, IsEmpty => empty Clear => clear Alloc => reserve for wxArrayString, Count => size GetCount => size IsEmpty => empty Add => push_back Clear => clear Empty => clear Sort => std::sort (only with default comparator) SetCount => resize Last => back Item => operator [] Alloc => reserve
This commit is contained in:
@@ -175,7 +175,7 @@ void ApplyMacroDialog::PopulateMacros()
|
||||
|
||||
int topItem = mMacros->GetTopItem();
|
||||
mMacros->DeleteAllItems();
|
||||
for (i = 0; i < (int)names.GetCount(); i++) {
|
||||
for (i = 0; i < (int)names.size(); i++) {
|
||||
mMacros->InsertItem(i, names[i]);
|
||||
}
|
||||
|
||||
@@ -246,7 +246,7 @@ void ApplyMacroDialog::ApplyMacroToProject( const wxString & MacroID, bool bHasG
|
||||
void ApplyMacroDialog::ApplyMacroToProject( int iMacro, bool bHasGui )
|
||||
{
|
||||
wxString name = mMacros->GetItemText(iMacro);
|
||||
if( name.IsEmpty() )
|
||||
if( name.empty() )
|
||||
return;
|
||||
|
||||
#ifdef OPTIONAL_ACTIVITY_WINDOW
|
||||
@@ -420,7 +420,7 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
|
||||
S.EndVerticalLay();
|
||||
|
||||
int i;
|
||||
for (i = 0; i < (int)files.GetCount(); i++ ) {
|
||||
for (i = 0; i < (int)files.size(); i++ ) {
|
||||
fileList->InsertItem(i, files[i], i == 0);
|
||||
}
|
||||
|
||||
@@ -450,7 +450,7 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
|
||||
Hide();
|
||||
|
||||
mMacroCommands.ReadMacro(name);
|
||||
for (i = 0; i < (int)files.GetCount(); i++) {
|
||||
for (i = 0; i < (int)files.size(); i++) {
|
||||
wxWindowDisabler wd(&activityWin);
|
||||
if (i > 0) {
|
||||
//Clear the arrow in previous item.
|
||||
|
||||
Reference in New Issue
Block a user