use override

This commit is contained in:
Paul Licameli 2017-10-01 13:28:04 -04:00
parent 9612e3d971
commit 31231a54d2
33 changed files with 100 additions and 97 deletions

View File

@ -65,27 +65,27 @@ public:
{
}
virtual bool HasGroup(const wxString & strName) const
virtual bool HasGroup(const wxString & strName) const override
{
return wxFileConfig::HasGroup(NormalizeName(strName));
}
virtual bool HasEntry(const wxString& strName) const
virtual bool HasEntry(const wxString& strName) const override
{
return wxFileConfig::HasEntry(NormalizeName(strName));
}
virtual bool DoReadString(const wxString & key, wxString *pStr) const
virtual bool DoReadString(const wxString & key, wxString *pStr) const override
{
return wxFileConfig::DoReadString(NormalizeName(key), pStr);
}
virtual bool DoReadLong(const wxString & key, long *pl) const
virtual bool DoReadLong(const wxString & key, long *pl) const override
{
return wxFileConfig::DoReadLong(NormalizeName(key), pl);
}
virtual bool DoReadDouble(const wxString & key, double *pd) const
virtual bool DoReadDouble(const wxString & key, double *pd) const override
{
wxString str;
if (Read(key, &str))
@ -102,17 +102,17 @@ public:
return false;
}
virtual bool DoWriteString(const wxString & key, const wxString & szValue)
virtual bool DoWriteString(const wxString & key, const wxString & szValue) override
{
return wxFileConfig::DoWriteString(NormalizeName(key), szValue);
}
virtual bool DoWriteLong(const wxString & key, long lValue)
virtual bool DoWriteLong(const wxString & key, long lValue) override
{
return wxFileConfig::DoWriteLong(NormalizeName(key), lValue);
}
virtual bool DoWriteDouble(const wxString & key, double value)
virtual bool DoWriteDouble(const wxString & key, double value) override
{
return DoWriteString(key, wxString::Format(wxT("%.12f"), value));
}

View File

@ -54,8 +54,8 @@ class LabelDialog final : public wxDialogWrapper
private:
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
bool Validate();
void FindAllLabels();
void AddLabels(const LabelTrack *t);

View File

@ -39,8 +39,8 @@ class TimeDialog final : public wxDialogWrapper
private:
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnUpdate(wxCommandEvent &event);

View File

@ -78,7 +78,10 @@ private:
wxString GetDisplayDate(wxDateTime & dt);
void PopulateOrExchange(ShuttleGui& S);
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
// no TransferDataFromWindow() because ??
void UpdateDuration(); // Update m_TimeSpan_Duration and ctrl based on m_DateTime_Start and m_DateTime_End.
void UpdateEnd(); // Update m_DateTime_End and ctrls based on m_DateTime_Start and m_TimeSpan_Duration.
ProgressResult WaitForStart();

View File

@ -317,8 +317,8 @@ protected:
virtual void Preview(bool dryOnly);
virtual void PopulateOrExchange(ShuttleGui & S);
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
virtual bool TransferDataToWindow() /* not override */;
virtual bool TransferDataFromWindow() /* not override */;
virtual bool EnableApply(bool enable = true);
virtual bool EnablePreview(bool enable = true);
virtual void EnableDebug(bool enable = true);

View File

@ -365,8 +365,8 @@ public:
bool bAllowTwiddleSettings);
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
const Settings &GetTempSettings() const
{ return mTempSettings; }

View File

@ -146,8 +146,8 @@ public:
bool set_sizer = true);
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// handlers

View File

@ -82,8 +82,8 @@ public:
// Effect implementation
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectPhaser implementation

View File

@ -72,8 +72,8 @@ public:
bool Startup();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
// EffectReverb implementation

View File

@ -64,7 +64,7 @@ public:
ScoreAlignDialog(ScoreAlignParams &params);
~ScoreAlignDialog();
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
private:
enum {

View File

@ -52,8 +52,8 @@ public:
// Effect implementation
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataFromWindow();
bool TransferDataToWindow();
bool TransferDataFromWindow() override;
bool TransferDataToWindow() override;
private:
// EffectToneGen implementation

View File

@ -187,67 +187,67 @@ public:
// EffectClientInterface implementation
wxString GetPath()
wxString GetPath() override
{
return mPath;
}
wxString GetSymbol()
wxString GetSymbol() override
{
return mName;
}
wxString GetName()
wxString GetName() override
{
return GetSymbol();
}
wxString GetVendor()
wxString GetVendor() override
{
return mVendor;
}
wxString GetVersion()
wxString GetVersion() override
{
return mVersion;
}
wxString GetDescription()
wxString GetDescription() override
{
return mDescription;
}
wxString GetFamily()
wxString GetFamily() override
{
return VSTPLUGINTYPE;
}
EffectType GetType()
EffectType GetType() override
{
return mType;
}
bool IsInteractive()
bool IsInteractive() override
{
return mInteractive;
}
bool IsDefault()
bool IsDefault() override
{
return false;
}
bool IsLegacy()
bool IsLegacy() override
{
return false;
}
bool SupportsRealtime()
bool SupportsRealtime() override
{
return mType == EffectTypeProcess;
}
bool SupportsAutomation()
bool SupportsAutomation() override
{
return mAutomatable;
}

View File

@ -213,8 +213,8 @@ private:
bool BuildFancy();
bool BuildPlain();
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() /* not override */;
bool TransferDataFromWindow() /* not override */;
void SetSlider(wxSlider *slider, const LV2Port & ctrl);
void OnTrigger(wxCommandEvent & evt);

View File

@ -48,8 +48,8 @@ public:
virtual ~ExportCLOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnBrowse(wxCommandEvent & event);
@ -284,7 +284,7 @@ public:
ExportCL();
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
ProgressResult Export(AudacityProject *project,
unsigned channels,

View File

@ -122,7 +122,7 @@ public:
/// Creates options panel
///\param format - index of export type
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
/// Check whether or not current project sample rate is compatible with the export codec
bool CheckSampleRate(int rate, int lowrate, int highrate, const int *sampRates);

View File

@ -69,8 +69,8 @@ public:
virtual ~ExportFFmpegAC3Options();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
/// Bit Rates supported by AC3 encoder
static const int iAC3BitRates[];
@ -95,8 +95,8 @@ public:
virtual ~ExportFFmpegAACOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
@ -111,8 +111,8 @@ public:
virtual ~ExportFFmpegAMRNBOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
static int iAMRNBBitRate[];
@ -133,8 +133,8 @@ public:
~ExportFFmpegWMAOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
static const int iWMASampleRates[];
static const int iWMABitRate[];
@ -156,8 +156,8 @@ public:
~ExportFFmpegCustomOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnOpen(wxCommandEvent & evt);

View File

@ -55,8 +55,8 @@ public:
virtual ~ExportFLACOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
};
///
@ -189,7 +189,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,

View File

@ -89,8 +89,8 @@ public:
virtual ~ExportMP2Options();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:
wxArrayString mBitRateNames;
@ -172,7 +172,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,

View File

@ -271,8 +271,8 @@ public:
virtual ~ExportMP3Options();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnSET(wxCommandEvent& evt);
void OnVBR(wxCommandEvent& evt);
@ -1601,7 +1601,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,

View File

@ -50,8 +50,8 @@ public:
virtual ~ExportOGGOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
private:

View File

@ -101,8 +101,8 @@ public:
virtual ~ExportPCMOptions();
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnHeaderChoice(wxCommandEvent & evt);
@ -317,7 +317,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
wxWindow *OptionsCreate(wxWindow *parent, int format) override;
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,

View File

@ -46,9 +46,9 @@ class ControlToolBar final : public ToolBar {
ControlToolBar();
virtual ~ControlToolBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void UpdatePrefs();
void UpdatePrefs() override;
void OnKeyEvent(wxKeyEvent & event);
// msmeyer: These are public, but it's far better to
@ -97,7 +97,7 @@ class ControlToolBar final : public ToolBar {
// Pause - used by AudioIO to pause sound activate recording
void Pause();
void Populate();
void Populate() override;
void Repaint(wxDC *dc) override;
void EnableDisableButtons() override;

View File

@ -29,9 +29,9 @@ class DeviceToolBar final : public ToolBar {
DeviceToolBar();
virtual ~DeviceToolBar();
void Create(wxWindow * parent);
void Create(wxWindow * parent) override;
void UpdatePrefs();
void UpdatePrefs() override;
void DeinitChildren();
void Populate() override;
@ -45,7 +45,7 @@ class DeviceToolBar final : public ToolBar {
/// When the prefs don't exist this value is used.
/// It should be small enough to work on tiny screens
int GetInitialWidth() { return 620; }
int GetInitialWidth() override{ return 620; }
int GetMinToolbarWidth() override { return 200; }
void ShowInputDialog();

View File

@ -76,14 +76,14 @@ class EditToolBar final : public ToolBar {
EditToolBar();
virtual ~EditToolBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void OnButton(wxCommandEvent & event);
void Populate();
void Repaint(wxDC * WXUNUSED(dc)) {};
void EnableDisableButtons();
void UpdatePrefs();
void Populate() override;
void Repaint(wxDC * WXUNUSED(dc)) override {};
void EnableDisableButtons() override;
void UpdatePrefs() override;
private:

View File

@ -36,7 +36,7 @@ class MeterToolBar final : public ToolBar {
MeterToolBar(AudacityProject *project, int type);
virtual ~MeterToolBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void Populate() override;
void ReCreateButtons() override;
@ -47,10 +47,10 @@ class MeterToolBar final : public ToolBar {
void OnSize(wxSizeEvent & event);
bool Expose(bool show) override;
int GetInitialWidth() {return (mWhichMeters ==
int GetInitialWidth() override {return (mWhichMeters ==
(kWithRecordMeter + kWithPlayMeter)) ? 338 : 460;} // Separate bars used to be smaller.
int GetMinToolbarWidth() { return 50; }
wxSize GetDockedSize();
int GetMinToolbarWidth() override { return 50; }
wxSize GetDockedSize() override;
private:
void RegenerateTooltips() override;

View File

@ -29,9 +29,9 @@ class MixerToolBar final : public ToolBar {
MixerToolBar();
virtual ~MixerToolBar();
void Create(wxWindow * parent);
void Create(wxWindow * parent) override;
void UpdatePrefs();
void UpdatePrefs() override;
void UpdateControls();
void SetMixer(wxCommandEvent &event);

View File

@ -43,12 +43,12 @@ public:
ScrubbingToolBar();
virtual ~ScrubbingToolBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void OnButton(wxCommandEvent & event);
void Populate();
void Repaint(wxDC * WXUNUSED(dc)) {};
void Populate() override;
void Repaint(wxDC * WXUNUSED(dc)) override {};
void EnableDisableButtons() override;
void UpdatePrefs() override;

View File

@ -64,7 +64,7 @@ class SelectionBar final : public ToolBar {
SelectionBar();
virtual ~SelectionBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void Populate() override;
void Repaint(wxDC * WXUNUSED(dc)) override {};

View File

@ -34,7 +34,7 @@ public:
SpectralSelectionBar();
virtual ~SpectralSelectionBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void Populate() override;
void Repaint(wxDC * WXUNUSED(dc)) override {};

View File

@ -124,7 +124,7 @@ class ToolBar /* not final */ : public wxPanelWrapper
void SetVisible( bool bVisible );
void SetPositioned(){ mPositioned = true;};
/// Resizable toolbars should implement this.
/// Resizable toolbars should implement these.
// NEW virtuals:
virtual int GetInitialWidth() { return -1; }
virtual int GetMinToolbarWidth() { return GetInitialWidth(); }

View File

@ -51,7 +51,7 @@ class ToolsToolBar final : public ToolBar {
ToolsToolBar();
virtual ~ToolsToolBar();
void UpdatePrefs();
void UpdatePrefs() override;
void OnTool(wxCommandEvent & evt);
@ -62,7 +62,7 @@ class ToolsToolBar final : public ToolBar {
bool IsDown(int tool) const;
int GetDownTool();
void Populate();
void Populate() override;
void Repaint(wxDC * WXUNUSED(dc)) override {};
void EnableDisableButtons() override {};

View File

@ -72,7 +72,7 @@ class TranscriptionToolBar final : public ToolBar {
TranscriptionToolBar();
virtual ~TranscriptionToolBar();
void Create(wxWindow *parent);
void Create(wxWindow *parent) override;
void OnKeyEvent(wxKeyEvent & event);
void OnPlaySpeed(wxCommandEvent & event);

View File

@ -334,8 +334,8 @@ class SliderDialog final : public wxDialogWrapper
float Get();
private:
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnSlider(wxCommandEvent &event);