From c46fbd919cbe502aeecd3bf4a9f7039aab3aec33 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 21 Apr 2019 17:33:18 -0400 Subject: [PATCH] rename function as AudacityProject::GetProjectName... ... So it does not hide inherited wxWindow::GetName(). And make it const. --- src/LyricsWindow.cpp | 4 ++-- src/MixerBoard.cpp | 4 ++-- src/Project.cpp | 10 +++++----- src/Project.h | 2 +- src/effects/nyquist/Nyquist.cpp | 2 +- src/export/Export.cpp | 2 +- src/export/ExportMultiple.cpp | 2 +- src/menus/FileMenus.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/LyricsWindow.cpp b/src/LyricsWindow.cpp index feda83e79..22f517170 100644 --- a/src/LyricsWindow.cpp +++ b/src/LyricsWindow.cpp @@ -46,11 +46,11 @@ const wxSize gSize = wxSize(LYRICS_DEFAULT_WIDTH, LYRICS_DEFAULT_HEIGHT); LyricsWindow::LyricsWindow(AudacityProject *parent): wxFrame(parent, -1, wxString::Format(_("Audacity Karaoke%s"), - ((parent->GetName().empty()) ? + ((parent->GetProjectName().empty()) ? wxT("") : wxString::Format( wxT(" - %s"), - parent->GetName()))), + parent->GetProjectName()))), wxPoint(100, 300), gSize, //v Bug in wxFRAME_FLOAT_ON_PARENT: // If both the project frame and LyricsWindow are minimized and you restore LyricsWindow, diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index a44016704..050af9577 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -1408,10 +1408,10 @@ const wxSize kDefaultSize = MixerBoardFrame::MixerBoardFrame(AudacityProject* parent) : wxFrame(parent, -1, wxString::Format(_("Audacity Mixer Board%s"), - ((parent->GetName().empty()) ? + ((parent->GetProjectName().empty()) ? wxT("") : wxString::Format(wxT(" - %s"), - parent->GetName()))), + parent->GetProjectName()))), wxDefaultPosition, kDefaultSize, //vvv Bug in wxFRAME_FLOAT_ON_PARENT: // If both the project frame and MixerBoardFrame are minimized and you restore MixerBoardFrame, diff --git a/src/Project.cpp b/src/Project.cpp index ee46f0351..82563e167 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -1519,7 +1519,7 @@ void AudacityProject::SetTags( const std::shared_ptr &tags ) mTags = tags; } -wxString AudacityProject::GetName() +wxString AudacityProject::GetProjectName() const { wxString name = wxFileNameFromPath(mFileName); @@ -1534,7 +1534,7 @@ wxString AudacityProject::GetName() // Pass a number in to show project number, or -1 not to. void AudacityProject::SetProjectTitle( int number) { - wxString name = GetName(); + wxString name = GetProjectName(); // If we are showing project numbers, then we also explicitly show "" if there // is none. @@ -2142,7 +2142,7 @@ int AudacityProject::CountUnnamed() int j = 0; for ( size_t i = 0; i < gAudacityProjects.size(); i++) { if ( gAudacityProjects[i] ) - if ( gAudacityProjects[i]->GetName().empty() ) + if ( gAudacityProjects[i]->GetProjectName().empty() ) j++; } return j; @@ -2437,7 +2437,7 @@ public: p->Raise(); // May help identifying the window on Mac // Construct this projects name and number. - sProjName = p->GetName(); + sProjName = p->GetProjectName(); if (sProjName.empty()){ sProjName = _(""); UnnamedCount=AudacityProject::CountUnnamed(); @@ -3480,7 +3480,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs) // international characters (such as capital 'A' with an umlaut.) if (!mDirManager->SetProject(projPath, projName, false)) { - projName = GetName() + wxT("_data"); + projName = GetProjectName() + wxT("_data"); if (!mDirManager->SetProject(projPath, projName, false)) { AudacityMessageBox(wxString::Format(_("Couldn't find the project data folder: \"%s\""), projName), diff --git a/src/Project.h b/src/Project.h index dd7c74dbf..62fb8d09f 100644 --- a/src/Project.h +++ b/src/Project.h @@ -218,7 +218,7 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame, bool IsPlayRegionLocked() { return mLockPlayRegion; } void SetPlayRegionLocked(bool value) { mLockPlayRegion = value; } - wxString GetName(); + wxString GetProjectName() const; const std::shared_ptr &GetDirManager(); TrackFactory *GetTrackFactory(); AdornedRulerPanel *GetRulerPanel(); diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 75db3670d..acdb3bcb2 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -707,7 +707,7 @@ bool NyquistEffect::Process() mProps += wxString::Format(wxT("(putprop '*SYSTEM-TIME* \"%s\" 'DAY-NAME)\n"), now.GetWeekDayName(day)); mProps += wxString::Format(wxT("(putprop '*PROJECT* %d 'PROJECTS)\n"), (int) gAudacityProjects.size()); - mProps += wxString::Format(wxT("(putprop '*PROJECT* \"%s\" 'NAME)\n"), project->GetName()); + mProps += wxString::Format(wxT("(putprop '*PROJECT* \"%s\" 'NAME)\n"), project->GetProjectName()); int numTracks = 0; int numWave = 0; diff --git a/src/export/Export.cpp b/src/export/Export.cpp index fdc791df9..4b6ba7919 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -562,7 +562,7 @@ bool Exporter::GetFilename() //Bug 1304: Set a default path if none was given. For Export. mFilename = FileNames::DefaultToDocumentsFolder(wxT("/Export/Path")); - mFilename.SetName(mProject->GetName()); + mFilename.SetName(mProject->GetProjectName()); if (mFilename.GetName().empty()) mFilename.SetName(_("untitled")); while (true) { diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index d681c88af..2ecdb646d 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -215,7 +215,7 @@ int ExportMultiple::ShowModal() void ExportMultiple::PopulateOrExchange(ShuttleGui& S) { - wxString name = mProject->GetName(); + wxString name = mProject->GetProjectName(); wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"), wxT("WAV")); wxArrayStringEx formats; diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index ab49c9759..be7fdb4cb 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -536,7 +536,7 @@ void OnPageSetup(const CommandContext &context) void OnPrint(const CommandContext &context) { auto &project = context.project; - auto name = project.GetName(); + auto name = project.GetProjectName(); auto tracks = project.GetTracks(); HandlePrint(&project, name, tracks, *project.GetTrackPanel()); }