1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 22:12:58 +02:00

More const and override

This commit is contained in:
Paul Licameli
2017-02-22 14:23:35 -05:00
parent 9ddb5bb1f3
commit 81285ee0c1
59 changed files with 193 additions and 165 deletions

View File

@@ -1359,9 +1359,11 @@ wxString CommandManager::GetCategoryFromName(const wxString &name)
return entry->labelTop;
}
wxString CommandManager::GetKeyFromName(const wxString &name)
wxString CommandManager::GetKeyFromName(const wxString &name) const
{
CommandListEntry *entry = mCommandNameHash[name];
CommandListEntry *entry =
// May create a NULL entry
const_cast<CommandManager*>(this)->mCommandNameHash[name];
if (!entry)
return wxT("");
@@ -1426,7 +1428,7 @@ XMLTagHandler *CommandManager::HandleXMLChild(const wxChar * WXUNUSED(tag))
return this;
}
void CommandManager::WriteXML(XMLWriter &xmlFile)
void CommandManager::WriteXML(XMLWriter &xmlFile) const
{
xmlFile.StartTag(wxT("audacitykeyboard"));
xmlFile.WriteAttr(wxT("audacityversion"), AUDACITY_VERSION_STRING);

View File

@@ -241,7 +241,7 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
wxString GetLabelFromName(const wxString &name);
wxString GetPrefixedLabelFromName(const wxString &name);
wxString GetCategoryFromName(const wxString &name);
wxString GetKeyFromName(const wxString &name);
wxString GetKeyFromName(const wxString &name) const;
wxString GetDefaultKeyFromName(const wxString &name);
bool GetEnabled(const wxString &name);
@@ -254,7 +254,7 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
// Loading/Saving
//
void WriteXML(XMLWriter &xmlFile) /* not override */;
void WriteXML(XMLWriter &xmlFile) const /* not override */;
protected:

View File

@@ -34,8 +34,8 @@ class CompareAudioCommand final : public CommandImplementation
{
private:
double mT0, mT1;
WaveTrack *mTrack0;
WaveTrack *mTrack1;
const WaveTrack *mTrack0;
const WaveTrack *mTrack1;
// Update member variables with project selection data (and validate)
bool GetSelection(AudacityProject &proj);