mirror of
https://github.com/cookiengineer/audacity
synced 2026-02-09 13:12:17 +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:
@@ -1190,14 +1190,14 @@ bool ControlToolBar::DoRecord(AudacityProject &project,
|
||||
}
|
||||
|
||||
if (useDateStamp) {
|
||||
if (!nameSuffix.IsEmpty()) {
|
||||
if (!nameSuffix.empty()) {
|
||||
nameSuffix += wxT("_");
|
||||
}
|
||||
nameSuffix += wxDateTime::Now().FormatISODate();
|
||||
}
|
||||
|
||||
if (useTimeStamp) {
|
||||
if (!nameSuffix.IsEmpty()) {
|
||||
if (!nameSuffix.empty()) {
|
||||
nameSuffix += wxT("_");
|
||||
}
|
||||
nameSuffix += wxDateTime::Now().FormatISOTime();
|
||||
@@ -1206,10 +1206,10 @@ bool ControlToolBar::DoRecord(AudacityProject &project,
|
||||
// ISO standard would be nice, but ":" is unsafe for file name.
|
||||
nameSuffix.Replace(wxT(":"), wxT("-"));
|
||||
|
||||
if (baseTrackName.IsEmpty()) {
|
||||
if (baseTrackName.empty()) {
|
||||
newTrack->SetName(nameSuffix);
|
||||
}
|
||||
else if (nameSuffix.IsEmpty()) {
|
||||
else if (nameSuffix.empty()) {
|
||||
newTrack->SetName(baseTrackName);
|
||||
}
|
||||
else {
|
||||
@@ -1389,7 +1389,7 @@ wxString ControlToolBar::StateForStatusBar()
|
||||
auto pProject = GetActiveProject();
|
||||
auto scrubState =
|
||||
pProject ? pProject->GetScrubber().GetUntranslatedStateString() : wxString();
|
||||
if (!scrubState.IsEmpty())
|
||||
if (!scrubState.empty())
|
||||
state = wxGetTranslation(scrubState);
|
||||
else if (mPlay->IsDown())
|
||||
state = wxGetTranslation(mStatePlay);
|
||||
|
||||
Reference in New Issue
Block a user