C++11 inheritance updates

Add `override` and remove `virtual` where applicable
This commit is contained in:
David CARLIER
2019-10-31 19:05:33 +00:00
committed by Lukas W
parent 46f5433732
commit dac59a5fa0
133 changed files with 578 additions and 579 deletions

View File

@@ -80,10 +80,10 @@ public:
static DeviceInfoCollection getAvailableDevices();
private:
virtual void startProcessing();
virtual void stopProcessing();
virtual void applyQualitySettings();
virtual void run();
void startProcessing() override;
void stopProcessing() override;
void applyQualitySettings() override;
void run() override;
int setHWParams( const ch_cnt_t _channels, snd_pcm_access_t _access );
int setSWParams();

View File

@@ -46,7 +46,7 @@ public:
AudioAlsaSetupWidget( QWidget * _parent );
virtual ~AudioAlsaSetupWidget();
virtual void saveSettings();
void saveSettings() override;
public slots:
void onCurrentIndexChanged(int index);

View File

@@ -64,11 +64,11 @@ public:
{
}
virtual void saveSettings()
void saveSettings() override
{
}
virtual void show()
void show() override
{
parentWidget()->hide();
QWidget::show();
@@ -78,17 +78,17 @@ public:
private:
virtual void startProcessing()
void startProcessing() override
{
start();
}
virtual void stopProcessing()
void stopProcessing() override
{
stopProcessingThread( this );
}
virtual void run()
void run() override
{
MicroTimer timer;
while( true )

View File

@@ -58,7 +58,7 @@ public:
protected:
virtual void writeBuffer( const surroundSampleFrame * /* _buf*/,
const fpp_t /*_frames*/,
const float /*_master_gain*/ );
const float /*_master_gain*/ ) override;
private:
void flushRemainingBuffers();

View File

@@ -59,7 +59,7 @@ public:
private:
virtual void writeBuffer( const surroundSampleFrame * _ab,
const fpp_t _frames,
const float _master_gain );
const float _master_gain ) override;
bool startEncoding();
void finishEncoding();

View File

@@ -56,7 +56,7 @@ public:
private:
virtual void writeBuffer( const surroundSampleFrame * _ab,
const fpp_t _frames,
float _master_gain );
float _master_gain ) override;
bool startEncoding();
void finishEncoding();

View File

@@ -60,7 +60,7 @@ public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings();
void saveSettings() override;
private:
QLineEdit * m_device;
@@ -70,10 +70,10 @@ public:
private:
virtual void startProcessing();
virtual void stopProcessing();
virtual void applyQualitySettings();
virtual void run();
void startProcessing() override;
void stopProcessing() override;
void applyQualitySettings() override;
void run() override;
int m_audioFD;

View File

@@ -100,8 +100,8 @@ public:
bool processEffects();
// ThreadableJob stuff
virtual void doProcessing();
virtual bool requiresProcessing() const
void doProcessing() override;
bool requiresProcessing() const override
{
return true;
}

View File

@@ -62,7 +62,7 @@ public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings();
void saveSettings() override;
private:
QLineEdit * m_device;
@@ -80,10 +80,10 @@ public:
private:
virtual void startProcessing();
virtual void stopProcessing();
virtual void applyQualitySettings();
virtual void run();
void startProcessing() override;
void stopProcessing() override;
void applyQualitySettings() override;
void run() override;
volatile bool m_quit;

View File

@@ -48,7 +48,7 @@ public:
private:
virtual void writeBuffer( const surroundSampleFrame * _ab,
const fpp_t _frames,
const float _master_gain );
const float _master_gain ) override;
typedef QList<QPair<sampleFrame *, fpp_t> > BufferList;
BufferList m_buffers;

View File

@@ -60,9 +60,9 @@ public:
{
public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
~setupWidget() override;
virtual void saveSettings();
void saveSettings() override;
private:
QLineEdit * m_device;
@@ -71,9 +71,9 @@ public:
private:
virtual void startProcessing();
virtual void stopProcessing();
virtual void applyQualitySettings();
void startProcessing() override;
void stopProcessing() override;
void applyQualitySettings() override;
static void sdlAudioCallback( void * _udata, Uint8 * _buf, int _len );
void sdlAudioCallback( Uint8 * _buf, int _len );

View File

@@ -58,7 +58,7 @@ public:
setupWidget( QWidget * _parent );
virtual ~setupWidget();
virtual void saveSettings( void );
void saveSettings( void ) override;
private:
QLineEdit * m_device;
@@ -66,10 +66,10 @@ public:
} ;
private:
virtual void startProcessing( void );
virtual void stopProcessing( void );
virtual void applyQualitySettings( void );
virtual void run( void );
void startProcessing( void ) override;
void stopProcessing( void ) override;
void applyQualitySettings( void ) override;
void run( void ) override;
struct sio_hdl *m_hdl;
struct sio_par m_par;

View File

@@ -48,7 +48,7 @@ public:
model()->setJournalling( _on );
}
virtual void modelChanged();
void modelChanged() override;
public slots:
@@ -62,9 +62,9 @@ public slots:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
private:
@@ -92,7 +92,7 @@ public:
void activateButton( AutomatableButton * _btn );
virtual void modelChanged();
void modelChanged() override;
private slots:

View File

@@ -255,7 +255,7 @@ public:
specified DOM element using <name> as attribute/node name */
virtual void loadSettings( const QDomElement& element, const QString& name );
virtual QString nodeName() const
QString nodeName() const override
{
return "automatablemodel";
}
@@ -337,12 +337,12 @@ private:
static bool mustQuoteName(const QString &name);
virtual void saveSettings( QDomDocument& doc, QDomElement& element )
void saveSettings( QDomDocument& doc, QDomElement& element ) override
{
saveSettings( doc, element, "value" );
}
virtual void loadSettings( const QDomElement& element )
void loadSettings( const QDomElement& element ) override
{
loadSettings( element, "value" );
}

View File

@@ -49,7 +49,7 @@ public:
return castModel<AutomatableModel>();
}
virtual void setModel( Model* model, bool isOldModelValid = true );
void setModel( Model* model, bool isOldModelValid = true ) override;
template<typename T>
inline T value() const

View File

@@ -51,12 +51,12 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void wheelEvent( QWheelEvent * _me );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void wheelEvent( QWheelEvent * _me ) override;
virtual void modelChanged();
void modelChanged() override;
private:

View File

@@ -73,9 +73,9 @@ public:
return m_pattern != nullptr;
}
virtual void saveSettings(QDomDocument & doc, QDomElement & parent);
virtual void loadSettings(const QDomElement & parent);
QString nodeName() const
void saveSettings(QDomDocument & doc, QDomElement & parent) override;
void loadSettings(const QDomElement & parent) override;
QString nodeName() const override
{
return "automationeditor";
}
@@ -114,14 +114,14 @@ public slots:
protected:
typedef AutomationPattern::timeMap timeMap;
virtual void keyPressEvent(QKeyEvent * ke);
virtual void leaveEvent(QEvent * e);
virtual void mousePressEvent(QMouseEvent * mouseEvent);
virtual void mouseReleaseEvent(QMouseEvent * mouseEvent);
virtual void mouseMoveEvent(QMouseEvent * mouseEvent);
virtual void paintEvent(QPaintEvent * pe);
virtual void resizeEvent(QResizeEvent * re);
virtual void wheelEvent(QWheelEvent * we);
void keyPressEvent(QKeyEvent * ke) override;
void leaveEvent(QEvent * e) override;
void mousePressEvent(QMouseEvent * mouseEvent) override;
void mouseReleaseEvent(QMouseEvent * mouseEvent) override;
void mouseMoveEvent(QMouseEvent * mouseEvent) override;
void paintEvent(QPaintEvent * pe) override;
void resizeEvent(QResizeEvent * re) override;
void wheelEvent(QWheelEvent * we) override;
float getLevel( int y );
int xCoordOfTick( int tick );
@@ -282,14 +282,14 @@ public:
void setCurrentPattern(AutomationPattern* pattern);
const AutomationPattern* currentPattern();
virtual void dropEvent( QDropEvent * _de );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
void dropEvent( QDropEvent * _de ) override;
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void open(AutomationPattern* pattern);
AutomationEditor* m_editor;
QSize sizeHint() const;
QSize sizeHint() const override;
public slots:
void clearCurrentPattern();
@@ -298,11 +298,11 @@ signals:
void currentPatternChanged();
protected:
virtual void focusInEvent(QFocusEvent * event);
void focusInEvent(QFocusEvent * event) override;
protected slots:
void play();
void stop();
void play() override;
void stop() override;
private slots:
void updateWindowTitle();

View File

@@ -140,13 +140,13 @@ public:
const QString name() const;
// settings-management
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
static const QString classNodeName() { return "automationpattern"; }
QString nodeName() const { return classNodeName(); }
QString nodeName() const override { return classNodeName(); }
virtual TrackContentObjectView * createView( TrackView * _tv );
TrackContentObjectView * createView( TrackView * _tv ) override;
static bool isAutomated( const AutomatableModel * _m );

View File

@@ -44,7 +44,7 @@ public:
public slots:
/// Opens this view's pattern in the global automation editor
void openInAutomationEditor();
virtual void update();
void update() override;
protected slots:
@@ -56,11 +56,11 @@ protected slots:
void flipX();
protected:
virtual void constructContextMenu( QMenu * );
virtual void mouseDoubleClickEvent(QMouseEvent * me );
virtual void paintEvent( QPaintEvent * pe );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
void constructContextMenu( QMenu * ) override;
void mouseDoubleClickEvent(QMouseEvent * me ) override;
void paintEvent( QPaintEvent * pe ) override;
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
private:

View File

@@ -38,19 +38,19 @@ public:
virtual ~AutomationTrack() = default;
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
virtual QString nodeName() const
QString nodeName() const override
{
return "automationtrack";
}
virtual TrackView * createView( TrackContainerView* );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
TrackView * createView( TrackContainerView* ) override;
TrackContentObject * createTCO( const MidiTime & _pos ) override;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void loadTrackSpecificSettings( const QDomElement & _this );
QDomElement & _parent ) override;
void loadTrackSpecificSettings( const QDomElement & _this ) override;
private:
friend class AutomationTrackView;
@@ -65,8 +65,8 @@ public:
AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
virtual ~AutomationTrackView() = default;
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
} ;

View File

@@ -42,7 +42,7 @@ public:
BBEditor( BBTrackContainer * _tc );
~BBEditor();
QSize sizeHint() const;
QSize sizeHint() const override;
const BBTrackContainerView* trackContainerView() const {
return m_trackContainerView;
@@ -54,8 +54,8 @@ public:
void removeBBView( int bb );
public slots:
void play();
void stop();
void play() override;
void stop() override;
private:
BBTrackContainerView* m_trackContainerView;
@@ -70,15 +70,15 @@ class BBTrackContainerView : public TrackContainerView
public:
BBTrackContainerView(BBTrackContainer* tc);
bool fixedTCOs() const
bool fixedTCOs() const override
{
return true;
}
void removeBBView(int bb);
void saveSettings(QDomDocument& doc, QDomElement& element);
void loadSettings(const QDomElement& element);
void saveSettings(QDomDocument& doc, QDomElement& element) override;
void loadSettings(const QDomElement& element) override;
public slots:
void addSteps();
@@ -88,7 +88,7 @@ public slots:
void addAutomationTrack();
protected slots:
void dropEvent(QDropEvent * de );
void dropEvent(QDropEvent * de ) override;
void updatePosition();
private:

View File

@@ -43,9 +43,9 @@ public:
BBTCO( Track * _track );
virtual ~BBTCO() = default;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName() const
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline QString nodeName() const override
{
return( "bbtco" );
}
@@ -72,7 +72,7 @@ public:
int bbTrackIndex();
virtual TrackContentObjectView * createView( TrackView * _tv );
TrackContentObjectView * createView( TrackView * _tv ) override;
private:
QColor m_color;
@@ -99,7 +99,7 @@ public:
void setColor( QColor _new_color );
public slots:
virtual void update();
void update() override;
protected slots:
void openInBBEditor();
@@ -110,9 +110,9 @@ protected slots:
protected:
virtual void paintEvent( QPaintEvent * pe );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
virtual void constructContextMenu( QMenu * );
void paintEvent( QPaintEvent * pe ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
void constructContextMenu( QMenu * ) override;
private:
@@ -133,13 +133,13 @@ public:
virtual ~BBTrack();
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
virtual TrackView * createView( TrackContainerView* tcv );
virtual TrackContentObject * createTCO( const MidiTime & _pos );
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
TrackView * createView( TrackContainerView* tcv ) override;
TrackContentObject * createTCO( const MidiTime & _pos ) override;
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void loadTrackSpecificSettings( const QDomElement & _this );
QDomElement & _parent ) override;
void loadTrackSpecificSettings( const QDomElement & _this ) override;
static BBTrack * findBBTrack( int _bb_num );
static void swapBBTracks( Track * _track1, Track * _track2 );
@@ -184,7 +184,7 @@ public:
}
protected:
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return( "bbtrack" );
}
@@ -211,7 +211,7 @@ public:
BBTrackView( BBTrack* bbt, TrackContainerView* tcv );
virtual ~BBTrackView();
virtual bool close();
bool close() override;
const BBTrack * getBBTrack() const
{

View File

@@ -41,9 +41,9 @@ public:
virtual bool play( MidiTime _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
virtual void updateAfterTrackAdd() override;
void updateAfterTrackAdd() override;
inline virtual QString nodeName() const override
inline QString nodeName() const override
{
return "bbtrackcontainer";
}

View File

@@ -43,7 +43,7 @@ public:
protected:
virtual void paintEvent( QPaintEvent * _ev );
void paintEvent( QPaintEvent * _ev ) override;
protected slots:

View File

@@ -57,10 +57,10 @@ public slots:
protected:
virtual void contextMenuEvent( QContextMenuEvent* event );
virtual void mousePressEvent( QMouseEvent* event );
virtual void paintEvent( QPaintEvent* event );
virtual void wheelEvent( QWheelEvent* event );
void contextMenuEvent( QContextMenuEvent* event ) override;
void mousePressEvent( QMouseEvent* event ) override;
void paintEvent( QPaintEvent* event ) override;
void wheelEvent( QWheelEvent* event ) override;
private:

View File

@@ -101,9 +101,9 @@ public:
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName() const;
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
QString nodeName() const override;
static Controller * create( ControllerTypes _tt, Model * _parent );
static Controller * create( const QDomElement & _this,

View File

@@ -85,15 +85,15 @@ public:
static void finalizeConnections();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
static inline const QString classNodeName()
{
return "connection";
}
virtual QString nodeName() const
QString nodeName() const override
{
return classNodeName();
}

View File

@@ -47,7 +47,7 @@ signals:
protected:
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
} ;

View File

@@ -47,10 +47,10 @@ public:
ControllerRackView();
virtual ~ControllerRackView();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "ControllerRackView";
}
@@ -62,7 +62,7 @@ public slots:
void onControllerRemoved( Controller * );
protected:
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
private slots:
void addController();

View File

@@ -68,9 +68,9 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void modelChanged();
virtual void mouseDoubleClickEvent( QMouseEvent * event );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void modelChanged() override;
void mouseDoubleClickEvent( QMouseEvent * event ) override;
private:

View File

@@ -43,17 +43,17 @@ public:
{
}
virtual float defaultValue() const
float defaultValue() const override
{
return 0;
}
virtual QString displayName() const
QString displayName() const override
{
return tr( "Note detuning" );
}
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "detuning";
}

View File

@@ -53,25 +53,25 @@ public:
{
}
virtual int controlCount()
int controlCount() override
{
return 0;
}
virtual void saveSettings( QDomDocument &, QDomElement & )
void saveSettings( QDomDocument &, QDomElement & ) override
{
}
virtual void loadSettings( const QDomElement & )
void loadSettings( const QDomElement & ) override
{
}
virtual QString nodeName() const
QString nodeName() const override
{
return "DummyControls";
}
virtual EffectControlDialog * createView()
EffectControlDialog * createView() override
{
return new DummyEffectControlDialog( this );
}
@@ -95,12 +95,12 @@ public:
{
}
virtual EffectControls * controls()
EffectControls * controls() override
{
return &m_controls;
}
bool processAudioBuffer( sampleFrame *, const fpp_t )
bool processAudioBuffer( sampleFrame *, const fpp_t ) override
{
return false;
}

View File

@@ -47,26 +47,26 @@ public:
{
}
virtual void playNote( NotePlayHandle *, sampleFrame * buffer )
void playNote( NotePlayHandle *, sampleFrame * buffer ) override
{
memset( buffer, 0, sizeof( sampleFrame ) *
Engine::mixer()->framesPerPeriod() );
}
virtual void saveSettings( QDomDocument &, QDomElement & )
void saveSettings( QDomDocument &, QDomElement & ) override
{
}
virtual void loadSettings( const QDomElement & )
void loadSettings( const QDomElement & ) override
{
}
virtual QString nodeName() const
QString nodeName() const override
{
return "dummyinstrument";
}
virtual PluginView * instantiateView( QWidget * _parent )
PluginView * instantiateView( QWidget * _parent ) override
{
return new InstrumentViewFixedSize( this, _parent );
}

View File

@@ -42,22 +42,22 @@ public:
{
}
virtual void saveSettings( QDomDocument &, QDomElement & )
void saveSettings( QDomDocument &, QDomElement & ) override
{
}
virtual void loadSettings( const QDomElement & )
void loadSettings( const QDomElement & ) override
{
}
virtual QString nodeName() const
QString nodeName() const override
{
return "DummyPlugin";
}
protected:
virtual PluginView * instantiateView( QWidget * _parent )
PluginView * instantiateView( QWidget * _parent ) override
{
return new PluginView( this, _parent );
}

View File

@@ -47,7 +47,7 @@ protected:
DropToolBar * addDropToolBar(Qt::ToolBarArea whereToAdd, QString const & windowTitle);
DropToolBar * addDropToolBar(QWidget * parent, Qt::ToolBarArea whereToAdd, QString const & windowTitle);
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
protected slots:
virtual void play() {}
virtual void record() {}
@@ -92,8 +92,8 @@ signals:
void dropped(QDropEvent* event);
protected:
void dragEnterEvent(QDragEnterEvent* event);
void dropEvent(QDropEvent* event);
void dragEnterEvent(QDragEnterEvent* event) override;
void dropEvent(QDropEvent* event) override;
};

View File

@@ -47,10 +47,10 @@ public:
const Descriptor::SubPluginFeatures::Key * _key );
virtual ~Effect();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "effect";
}
@@ -170,7 +170,7 @@ protected:
*/
void checkGate( double _out_sum );
virtual PluginView * instantiateView( QWidget * );
PluginView * instantiateView( QWidget * ) override;
// some effects might not be capable of higher sample-rates so they can
// sample it down before processing and back after processing

View File

@@ -40,10 +40,10 @@ public:
EffectChain( Model * _parent );
virtual ~EffectChain();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "fxchain";
}

View File

@@ -48,7 +48,7 @@ signals:
protected:
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
EffectControls * m_effectControls;

View File

@@ -60,7 +60,7 @@ private slots:
private:
virtual void modelChanged();
void modelChanged() override;
inline EffectChain* fxChain()
{

View File

@@ -73,9 +73,9 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void modelChanged();
void contextMenuEvent( QContextMenuEvent * _me ) override;
void paintEvent( QPaintEvent * _pe ) override;
void modelChanged() override;
private:

View File

@@ -91,9 +91,9 @@ public:
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName() const
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
QString nodeName() const override
{
return "el";
}

View File

@@ -52,12 +52,12 @@ public:
protected:
virtual void modelChanged();
void modelChanged() override;
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void paintEvent( QPaintEvent * _pe ) override;
protected slots:

View File

@@ -44,15 +44,15 @@ public:
int tempo, int masterPitch, const QString &filename ) = 0;
protected:
virtual void saveSettings( QDomDocument &, QDomElement & )
void saveSettings( QDomDocument &, QDomElement & ) override
{
}
virtual void loadSettings( const QDomElement & )
void loadSettings( const QDomElement & ) override
{
}
virtual QString nodeName() const
QString nodeName() const override
{
return "import_filter";
}

View File

@@ -41,14 +41,14 @@ public:
ExportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
protected:
virtual void reject( void );
virtual void closeEvent( QCloseEvent * _ce );
void reject( void ) override;
void closeEvent( QCloseEvent * _ce ) override;
private slots:
void startBtnClicked( void );
void updateTitleBar( int );
void accept();
void accept() override;
void startExport();
void onFileFormatChanged(int);

View File

@@ -50,8 +50,8 @@ public slots:
protected:
virtual void customEvent( QEvent * );
virtual void paintEvent( QPaintEvent * _pe );
void customEvent( QEvent * ) override;
void paintEvent( QPaintEvent * _pe ) override;
private:

View File

@@ -109,13 +109,13 @@ public:
}
private:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void mousePressEvent( QMouseEvent *ev );
virtual void mouseDoubleClickEvent( QMouseEvent* mouseEvent );
virtual void mouseMoveEvent( QMouseEvent *ev );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void wheelEvent( QWheelEvent *ev );
virtual void paintEvent( QPaintEvent *ev );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void mousePressEvent( QMouseEvent *ev ) override;
void mouseDoubleClickEvent( QMouseEvent* mouseEvent ) override;
void mouseMoveEvent( QMouseEvent *ev ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void wheelEvent( QWheelEvent *ev ) override;
void paintEvent( QPaintEvent *ev ) override;
inline bool clips(float const & value) const { return value >= 1.0f; }

View File

@@ -61,7 +61,7 @@ private slots:
void giveFocusToFilter();
private:
virtual void keyPressEvent( QKeyEvent * ke );
void keyPressEvent( QKeyEvent * ke ) override;
void addItems( const QString & path );
@@ -93,10 +93,10 @@ public:
protected:
virtual void contextMenuEvent( QContextMenuEvent * e );
virtual void mousePressEvent( QMouseEvent * me );
virtual void mouseMoveEvent( QMouseEvent * me );
virtual void mouseReleaseEvent( QMouseEvent * me );
void contextMenuEvent( QContextMenuEvent * e ) override;
void mousePressEvent( QMouseEvent * me ) override;
void mouseMoveEvent( QMouseEvent * me ) override;
void mouseReleaseEvent( QMouseEvent * me ) override;
private:

View File

@@ -51,10 +51,10 @@ public:
FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex);
~FxLine();
virtual void paintEvent( QPaintEvent * );
virtual void mousePressEvent( QMouseEvent * );
virtual void mouseDoubleClickEvent( QMouseEvent * );
virtual void contextMenuEvent( QContextMenuEvent * );
void paintEvent( QPaintEvent * ) override;
void mousePressEvent( QMouseEvent * ) override;
void mouseDoubleClickEvent( QMouseEvent * ) override;
void contextMenuEvent( QContextMenuEvent * ) override;
inline int channelIndex() { return m_channelIndex; }
void setChannelIndex(int index);
@@ -79,7 +79,7 @@ public:
static const int FxLineHeight;
bool eventFilter (QObject *dist, QEvent *event);
bool eventFilter (QObject *dist, QEvent *event) override;
private:
void drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis );

View File

@@ -42,8 +42,8 @@ public:
void setTrackView(TrackView * tv);
protected:
virtual void mouseDoubleClickEvent(QMouseEvent* event);
virtual void contextMenuEvent(QContextMenuEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event) override;
void contextMenuEvent(QContextMenuEvent* event) override;
private:
TrackView * m_tv;

View File

@@ -67,7 +67,7 @@ class FxChannel : public ThreadableJob
// pointers to other channels that send to this one
FxRouteVector m_receives;
virtual bool requiresProcessing() const { return true; }
bool requiresProcessing() const override { return true; }
void unmuteForSolo();
@@ -76,7 +76,7 @@ class FxChannel : public ThreadableJob
void processed();
private:
virtual void doProcessing();
void doProcessing() override;
};
@@ -133,10 +133,10 @@ public:
void prepareMasterMix();
void masterMix( sampleFrame * _buf );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
virtual QString nodeName() const
QString nodeName() const override
{
return "fxmixer";
}

View File

@@ -64,10 +64,10 @@ public:
FxMixerView();
virtual ~FxMixerView();
virtual void keyPressEvent(QKeyEvent * e);
void keyPressEvent(QKeyEvent * e) override;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
inline FxLine * currentFxLine()
{
@@ -110,7 +110,7 @@ public slots:
int addNewChannel();
protected:
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
private slots:
void updateFaders();

View File

@@ -87,19 +87,19 @@ public:
signals:
void drawn();
protected:
virtual void paintEvent( QPaintEvent * _pe );
virtual void dropEvent( QDropEvent * _de );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseMoveEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
void paintEvent( QPaintEvent * _pe ) override;
void dropEvent( QDropEvent * _de ) override;
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseMoveEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
protected slots:
void updateGraph( int _startPos, int _endPos );
void updateGraph();
private:
virtual void modelChanged();
void modelChanged() override;
void changeSampleAt( int _x, int _y );
void drawLineAt( int _x, int _y, int _lastx );

View File

@@ -42,7 +42,7 @@ public:
GroupBox( const QString & _caption, QWidget * _parent = NULL );
virtual ~GroupBox();
virtual void modelChanged();
void modelChanged() override;
PixmapButton * ledButton()
{
@@ -56,8 +56,8 @@ public:
protected:
virtual void mousePressEvent( QMouseEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
void mousePressEvent( QMouseEvent * _me ) override;
void paintEvent( QPaintEvent * _pe ) override;
private:

View File

@@ -89,15 +89,15 @@ protected:
m_file.ungetChar( _ch );
}
virtual void saveSettings( QDomDocument &, QDomElement & )
void saveSettings( QDomDocument &, QDomElement & ) override
{
}
virtual void loadSettings( const QDomElement & )
void loadSettings( const QDomElement & ) override
{
}
virtual QString nodeName() const
QString nodeName() const override
{
return "import_filter";
}

View File

@@ -79,8 +79,8 @@ public:
return m_autoPattern;
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
private:

View File

@@ -110,7 +110,7 @@ public:
return true;
}
virtual QString fullDisplayName() const;
QString fullDisplayName() const override;
// --------------------------------------------------------------------
// provided functions:

View File

@@ -49,7 +49,7 @@ public:
private:
virtual void modelChanged();
void modelChanged() override;
InstrumentFunctionNoteStacking * m_cc;
@@ -72,7 +72,7 @@ public:
private:
virtual void modelChanged();
void modelChanged() override;
InstrumentFunctionArpeggio * m_a;
GroupBox * m_arpGroupBox;

View File

@@ -54,10 +54,10 @@ public:
void processNote( NotePlayHandle* n );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "chordcreator";
}
@@ -176,10 +176,10 @@ public:
void processNote( NotePlayHandle* n );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "arpeggiator";
}

View File

@@ -47,7 +47,7 @@ public:
private:
virtual void modelChanged();
void modelChanged() override;
GroupBox * m_midiInputGroupBox;
LcdSpinBox * m_inputChannelSpinBox;

View File

@@ -40,7 +40,7 @@ public:
}
virtual void play( sampleFrame * _working_buffer )
void play( sampleFrame * _working_buffer ) override
{
// ensure that all our nph's have been processed first
ConstNotePlayHandleList nphv = NotePlayHandle::nphsOfInstrumentTrack( m_instrument->instrumentTrack(), true );
@@ -65,12 +65,12 @@ public:
m_instrument->play( _working_buffer );
}
virtual bool isFinished() const
bool isFinished() const override
{
return false;
}
virtual bool isFromTrack( const Track* _track ) const
bool isFromTrack( const Track* _track ) const override
{
return m_instrument->isFromTrack( _track );
}

View File

@@ -57,9 +57,9 @@ public:
float volumeLevel( NotePlayHandle * _n, const f_cnt_t _frame );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName() const
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline QString nodeName() const override
{
return "eldata";
}

View File

@@ -50,7 +50,7 @@ public:
private:
virtual void modelChanged();
void modelChanged() override;
InstrumentSoundShaping * m_ss;

View File

@@ -80,8 +80,8 @@ public:
MidiEvent applyMasterKey( const MidiEvent& event );
virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 );
virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 );
void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) override;
void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime(), f_cnt_t offset = 0 ) override;
// silence all running notes played by this track
void silenceAllNotes( bool removeIPH = false );
@@ -111,7 +111,7 @@ public:
void deleteNotePluginData( NotePlayHandle * _n );
// name-stuff
virtual void setName( const QString & _new_name );
void setName( const QString & _new_name ) override;
// translate given key of a note-event to absolute key (i.e.
// add global master-pitch and base-note of this instrument track)
@@ -131,18 +131,18 @@ public:
// play everything in given frame-range - creates note-play-handles
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
const f_cnt_t _frame_base, int _tco_num = -1 ) override;
// create new view for me
virtual TrackView * createView( TrackContainerView* tcv );
TrackView * createView( TrackContainerView* tcv ) override;
// create new track-content-object = pattern
virtual TrackContentObject * createTCO( const MidiTime & _pos );
TrackContentObject * createTCO( const MidiTime & _pos ) override;
// called by track
virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
virtual void loadTrackSpecificSettings( const QDomElement & _this );
QDomElement & _parent ) override;
void loadTrackSpecificSettings( const QDomElement & _this ) override;
using Track::setJournalling;
@@ -225,7 +225,7 @@ signals:
protected:
virtual QString nodeName() const
QString nodeName() const override
{
return "instrumenttrack";
}
@@ -317,12 +317,12 @@ public:
static void cleanupWindowCache();
// Create a menu for assigning/creating channels for this track
QMenu * createFxMenu( QString title, QString newFxLabel );
QMenu * createFxMenu( QString title, QString newFxLabel ) override;
protected:
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
private slots:
@@ -404,8 +404,8 @@ public:
static void dragEnterEventGeneric( QDragEnterEvent * _dee );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
public slots:
@@ -417,11 +417,11 @@ public slots:
protected:
// capture close-events for toggling instrument-track-button
virtual void closeEvent( QCloseEvent * _ce );
virtual void focusInEvent( QFocusEvent * _fe );
void closeEvent( QCloseEvent * _ce ) override;
void focusInEvent( QFocusEvent * _fe ) override;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
protected slots:
@@ -430,7 +430,7 @@ protected slots:
void viewPrevInstrument();
private:
virtual void modelChanged();
void modelChanged() override;
void viewInstrumentInDirection(int d);
//! adjust size of any child widget of the main tab
//! required to keep the old look when using a variable sized tab widget

View File

@@ -59,9 +59,9 @@ public:
void addJournalCheckPoint();
virtual QDomElement saveState( QDomDocument & _doc,
QDomElement & _parent );
QDomElement & _parent ) override;
virtual void restoreState( const QDomElement & _this );
void restoreState( const QDomElement & _this ) override;
inline bool isJournalling() const
{

View File

@@ -124,16 +124,16 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
virtual void focusOutEvent( QFocusEvent * _fe );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void mouseMoveEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
virtual void paintEvent( QPaintEvent * _me );
virtual void wheelEvent( QWheelEvent * _me );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void dragEnterEvent( QDragEnterEvent * _dee ) override;
void dropEvent( QDropEvent * _de ) override;
void focusOutEvent( QFocusEvent * _fe ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void mouseMoveEvent( QMouseEvent * _me ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
void paintEvent( QPaintEvent * _me ) override;
void wheelEvent( QWheelEvent * _me ) override;
virtual float getValue( const QPoint & _p );
@@ -145,7 +145,7 @@ private slots:
private:
QString displayValue() const;
virtual void doConnections();
void doConnections() override;
QLineF calculateLine( const QPointF & _mid, float _radius,
float _innerRadius = 1) const;

View File

@@ -74,7 +74,7 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent, const QString & _name );
virtual void loadSettings( const QDomElement & _this, const QString & _name );
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "port";
}
@@ -92,13 +92,13 @@ protected slots:
void linkStateChanged();
protected:
virtual void saveSettings( QDomDocument& doc, QDomElement& element )
void saveSettings( QDomDocument& doc, QDomElement& element ) override
{
Q_UNUSED(doc)
Q_UNUSED(element)
}
virtual void loadSettings( const QDomElement& element )
void loadSettings( const QDomElement& element ) override
{
Q_UNUSED(element)
}

View File

@@ -40,7 +40,7 @@ public:
virtual ~LcdSpinBox() = default;
virtual void modelChanged()
void modelChanged() override
{
ModelView::modelChanged();
update();
@@ -65,12 +65,12 @@ public slots:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseMoveEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void wheelEvent( QWheelEvent * _we );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
void contextMenuEvent( QContextMenuEvent * _me ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseMoveEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void wheelEvent( QWheelEvent * _we ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
private:
bool m_mouseMoving;

View File

@@ -71,7 +71,7 @@ public slots:
protected:
virtual void paintEvent( QPaintEvent * pe );
void paintEvent( QPaintEvent * pe ) override;
virtual void updateSize();

View File

@@ -64,7 +64,7 @@ public:
Q_PROPERTY( QString text READ text WRITE setText )
protected:
virtual void paintEvent( QPaintEvent * _pe );
void paintEvent( QPaintEvent * _pe ) override;
private:

View File

@@ -49,18 +49,18 @@ public:
virtual ~LfoController();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName() const;
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
QString nodeName() const override;
public slots:
virtual ControllerDialog * createDialog( QWidget * _parent );
ControllerDialog * createDialog( QWidget * _parent ) override;
protected:
// The internal per-controller value updating function
virtual void updateValueBuffer();
void updateValueBuffer() override;
FloatModel m_baseModel;
TempoSyncKnobModel m_speedModel;
@@ -98,8 +98,8 @@ public:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void modelChanged();
void contextMenuEvent( QContextMenuEvent * _me ) override;
void modelChanged() override;
LfoController * m_lfo;

View File

@@ -67,21 +67,21 @@ public:
{
}
virtual QPalette standardPalette( void ) const;
QPalette standardPalette( void ) const override;
virtual void drawComplexControl(
ComplexControl control,
const QStyleOptionComplex * option,
QPainter *painter,
const QWidget *widget ) const;
const QWidget *widget ) const override;
virtual void drawPrimitive( PrimitiveElement element,
const QStyleOption *option,
QPainter *painter,
const QWidget *widget = 0 ) const;
const QWidget *widget = 0 ) const override;
virtual int pixelMetric( PixelMetric metric,
const QStyleOption * option = 0,
const QWidget * widget = 0 ) const;
const QWidget * widget = 0 ) const override;
static QPalette * s_palette;

View File

@@ -42,7 +42,7 @@ class MainApplication : public QApplication
{
public:
MainApplication(int& argc, char** argv);
bool event(QEvent* event);
bool event(QEvent* event) override;
#ifdef LMMS_BUILD_WIN32
bool winEventFilter(MSG* msg, long* result);
bool nativeEventFilter(const QByteArray& eventType, void* message,

View File

@@ -176,11 +176,11 @@ private slots:
void onExportProjectMidi();
protected:
virtual void closeEvent( QCloseEvent * _ce );
virtual void focusOutEvent( QFocusEvent * _fe );
virtual void keyPressEvent( QKeyEvent * _ke );
virtual void keyReleaseEvent( QKeyEvent * _ke );
virtual void timerEvent( QTimerEvent * _ev );
void closeEvent( QCloseEvent * _ce ) override;
void focusOutEvent( QFocusEvent * _fe ) override;
void keyPressEvent( QKeyEvent * _ke ) override;
void keyReleaseEvent( QKeyEvent * _ke ) override;
void timerEvent( QTimerEvent * _ev ) override;
private:

View File

@@ -40,7 +40,7 @@ public:
MeterDialog( QWidget * _parent, bool _simple = false );
virtual ~MeterDialog();
virtual void modelChanged();
void modelChanged() override;
private:

View File

@@ -62,8 +62,8 @@ public:
protected:
virtual void sendByte( const unsigned char c );
virtual void run();
void sendByte( const unsigned char c ) override;
void run() override;
private:

View File

@@ -67,44 +67,44 @@ public:
virtual void processOutEvent( const MidiEvent & _me,
const MidiTime & _time,
const MidiPort * _port );
const MidiPort * _port ) override;
virtual void applyPortMode( MidiPort * _port );
virtual void applyPortName( MidiPort * _port );
void applyPortMode( MidiPort * _port ) override;
void applyPortName( MidiPort * _port ) override;
virtual void removePort( MidiPort * _port );
void removePort( MidiPort * _port ) override;
// list seq-ports from ALSA
virtual QStringList readablePorts() const
QStringList readablePorts() const override
{
return m_readablePorts;
}
virtual QStringList writablePorts() const
QStringList writablePorts() const override
{
return m_writablePorts;
}
// return name of port which specified MIDI event came from
virtual QString sourcePortName( const MidiEvent & ) const;
QString sourcePortName( const MidiEvent & ) const override;
// (un)subscribe given MidiPort to/from destination-port
virtual void subscribeReadablePort( MidiPort * _port,
const QString & _dest,
bool _subscribe = true );
bool _subscribe = true ) override;
virtual void subscribeWritablePort( MidiPort * _port,
const QString & _dest,
bool _subscribe = true );
bool _subscribe = true ) override;
virtual void connectRPChanged( QObject * _receiver,
const char * _member )
const char * _member ) override
{
connect( this, SIGNAL( readablePortsChanged() ),
_receiver, _member );
}
virtual void connectWPChanged( QObject * _receiver,
const char * _member )
const char * _member ) override
{
connect( this, SIGNAL( writablePortsChanged() ),
_receiver, _member );
@@ -117,7 +117,7 @@ private slots:
private:
virtual void run();
void run() override;
#ifdef LMMS_HAVE_ALSA
QMutex m_seqMutex;

View File

@@ -124,7 +124,7 @@ public:
virtual ~MidiClientRaw();
// we are raw-clients for sure!
virtual bool isRaw() const
bool isRaw() const override
{
return true;
}
@@ -141,7 +141,7 @@ protected:
private:
// this does MIDI-event-process
void processParsedEvent();
virtual void processOutEvent( const MidiEvent& event, const MidiTime& time, const MidiPort* port );
void processOutEvent( const MidiEvent& event, const MidiTime& time, const MidiPort* port ) override;
// small helper function returning length of a certain event - this
// is necessary for parsing raw-MIDI-data

View File

@@ -44,30 +44,30 @@ public:
virtual ~MidiController();
virtual void processInEvent( const MidiEvent & _me,
const MidiTime & _time, f_cnt_t offset = 0 );
const MidiTime & _time, f_cnt_t offset = 0 ) override;
virtual void processOutEvent( const MidiEvent& _me,
const MidiTime & _time, f_cnt_t offset = 0 )
const MidiTime & _time, f_cnt_t offset = 0 ) override
{
// No output yet
}
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName() const;
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
QString nodeName() const override;
// Used by controllerConnectionDialog to copy
void subscribeReadablePorts( const MidiPort::Map & _map );
public slots:
virtual ControllerDialog * createDialog( QWidget * _parent );
ControllerDialog * createDialog( QWidget * _parent ) override;
void updateName();
protected:
// The internal per-controller get-value function
virtual void updateValueBuffer();
void updateValueBuffer() override;
MidiPort m_midiPort;

View File

@@ -56,7 +56,7 @@ public:
protected:
virtual void sendByte( const unsigned char )
void sendByte( const unsigned char ) override
{
}

View File

@@ -58,8 +58,8 @@ public:
}
protected:
virtual void sendByte( const unsigned char c );
virtual void run();
void sendByte( const unsigned char c ) override;
void run() override;
private:

View File

@@ -103,10 +103,10 @@ public:
void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
virtual void saveSettings( QDomDocument& doc, QDomElement& thisElement );
virtual void loadSettings( const QDomElement& thisElement );
void saveSettings( QDomDocument& doc, QDomElement& thisElement ) override;
void loadSettings( const QDomElement& thisElement ) override;
virtual QString nodeName() const
QString nodeName() const override
{
return "midiport";
}

View File

@@ -51,7 +51,7 @@ protected slots:
private:
virtual void modelChanged();
void modelChanged() override;
MidiPort::Modes m_mode;

View File

@@ -59,8 +59,8 @@ public:
protected:
virtual void sendByte(const unsigned char c);
virtual void run(void);
void sendByte(const unsigned char c) override;
void run(void) override;
private:
struct mio_hdl *m_hdl;

View File

@@ -345,7 +345,7 @@ private:
fifo * m_fifo;
volatile bool m_writing;
virtual void run();
void run() override;
void write( surroundSampleFrame * buffer );

View File

@@ -106,7 +106,7 @@ public:
private:
virtual void run();
void run() override;
static JobQueue globalJobQueue;
static QWaitCondition * queueReadyWaitCond;

View File

@@ -61,7 +61,7 @@ signals:
protected:
virtual void mousePressEvent( QMouseEvent * _me );
void mousePressEvent( QMouseEvent * _me ) override;
private:

View File

@@ -200,7 +200,7 @@ public:
return "note";
}
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return classNodeName();
}
@@ -218,8 +218,8 @@ public:
protected:
virtual void saveSettings( QDomDocument & doc, QDomElement & parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & doc, QDomElement & parent ) override;
void loadSettings( const QDomElement & _this ) override;
private:

View File

@@ -74,8 +74,8 @@ public:
return p;
}
virtual void setVolume( volume_t volume );
virtual void setPanning( panning_t panning );
void setVolume( volume_t volume ) override;
void setPanning( panning_t panning ) override;
int midiKey() const;
int midiChannel() const
@@ -105,10 +105,10 @@ public:
}
/*! Renders one chunk using the attached instrument into the buffer */
virtual void play( sampleFrame* buffer );
void play( sampleFrame* buffer ) override;
/*! Returns whether playback of note is finished and thus handle can be deleted */
virtual bool isFinished() const
bool isFinished() const override
{
return m_released && framesLeft() <= 0;
}
@@ -120,7 +120,7 @@ public:
fpp_t framesLeftForCurrentPeriod() const;
/*! Returns whether the play handle plays on a certain track */
virtual bool isFromTrack( const Track* _track ) const;
bool isFromTrack( const Track* _track ) const override;
/*! Releases the note (and plays release frames */
void noteOff( const f_cnt_t offset = 0 );

View File

@@ -94,9 +94,9 @@ public:
Pattern * nextPattern() const;
// settings-management
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName() const
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline QString nodeName() const override
{
return "pattern";
}
@@ -109,7 +109,7 @@ public:
bool empty();
virtual TrackContentObjectView * createView( TrackView * _tv );
TrackContentObjectView * createView( TrackView * _tv ) override;
using Model::dataChanged;
@@ -182,7 +182,7 @@ public:
void setMutedNoteBorderColor(QColor const & color) { m_mutedNoteBorderColor = color; }
public slots:
virtual void update();
void update() override;
protected slots:
@@ -194,11 +194,11 @@ protected slots:
protected:
virtual void constructContextMenu( QMenu * );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
virtual void paintEvent( QPaintEvent * pe );
virtual void wheelEvent( QWheelEvent * _we );
void constructContextMenu( QMenu * ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
void paintEvent( QPaintEvent * pe ) override;
void wheelEvent( QWheelEvent * _we ) override;
private:

View File

@@ -46,9 +46,9 @@ public:
virtual ~PeakController();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName() const;
void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
void loadSettings( const QDomElement & _this ) override;
QString nodeName() const override;
static void initGetControllerBySetting();
static PeakController * getControllerBySetting( const QDomElement & _this );
@@ -57,13 +57,13 @@ public:
public slots:
virtual ControllerDialog * createDialog( QWidget * _parent );
ControllerDialog * createDialog( QWidget * _parent ) override;
void handleDestroyedEffect( );
void updateCoeffs();
protected:
// The internal per-controller get-value function
virtual void updateValueBuffer();
void updateValueBuffer() override;
PeakControllerEffect * m_peakEffect;
@@ -91,9 +91,9 @@ public:
virtual ~PeakControllerDialog();
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void modelChanged();
void contextMenuEvent( QContextMenuEvent * _me ) override;
void paintEvent( QPaintEvent * _pe ) override;
void modelChanged() override;
PeakController * m_peakController;

View File

@@ -167,17 +167,17 @@ public:
protected:
virtual void keyPressEvent( QKeyEvent * ke );
virtual void keyReleaseEvent( QKeyEvent * ke );
virtual void leaveEvent( QEvent * e );
virtual void mousePressEvent( QMouseEvent * me );
virtual void mouseDoubleClickEvent( QMouseEvent * me );
virtual void mouseReleaseEvent( QMouseEvent * me );
virtual void mouseMoveEvent( QMouseEvent * me );
virtual void paintEvent( QPaintEvent * pe );
virtual void resizeEvent( QResizeEvent * re );
virtual void wheelEvent( QWheelEvent * we );
virtual void focusOutEvent( QFocusEvent * );
void keyPressEvent( QKeyEvent * ke ) override;
void keyReleaseEvent( QKeyEvent * ke ) override;
void leaveEvent( QEvent * e ) override;
void mousePressEvent( QMouseEvent * me ) override;
void mouseDoubleClickEvent( QMouseEvent * me ) override;
void mouseReleaseEvent( QMouseEvent * me ) override;
void mouseMoveEvent( QMouseEvent * me ) override;
void paintEvent( QPaintEvent * pe ) override;
void resizeEvent( QResizeEvent * re ) override;
void wheelEvent( QWheelEvent * we ) override;
void focusOutEvent( QFocusEvent * ) override;
int getKey( int y ) const;
static void drawNoteRect( QPainter & p, int x, int y,
@@ -460,11 +460,11 @@ public:
int quantization() const;
void play();
void stop();
void record();
void recordAccompany();
void toggleStepRecording();
void play() override;
void stop() override;
void record() override;
void recordAccompany() override;
void toggleStepRecording() override;
void stopRecording();
bool isRecording() const;
@@ -474,15 +474,15 @@ public:
using SerializingObject::saveState;
using SerializingObject::restoreState;
virtual void saveSettings(QDomDocument & doc, QDomElement & de );
virtual void loadSettings( const QDomElement & de );
void saveSettings(QDomDocument & doc, QDomElement & de ) override;
void loadSettings( const QDomElement & de ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "pianoroll";
}
QSize sizeHint() const;
QSize sizeHint() const override;
signals:
void currentPatternChanged();
@@ -494,7 +494,7 @@ private slots:
private:
void patternRenamed();
void focusInEvent(QFocusEvent * event);
void focusInEvent(QFocusEvent * event) override;
void stopStepRecording();
void updateStepRecordingIcon();

View File

@@ -44,19 +44,19 @@ public:
public:
virtual void keyPressEvent( QKeyEvent * ke );
virtual void keyReleaseEvent( QKeyEvent * ke );
void keyPressEvent( QKeyEvent * ke ) override;
void keyReleaseEvent( QKeyEvent * ke ) override;
protected:
virtual void modelChanged();
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * );
virtual void mousePressEvent( QMouseEvent * me );
virtual void mouseReleaseEvent( QMouseEvent * me );
virtual void mouseMoveEvent( QMouseEvent * me );
virtual void focusOutEvent( QFocusEvent * _fe );
virtual void resizeEvent( QResizeEvent * _event );
void modelChanged() override;
void contextMenuEvent( QContextMenuEvent * _me ) override;
void paintEvent( QPaintEvent * ) override;
void mousePressEvent( QMouseEvent * me ) override;
void mouseReleaseEvent( QMouseEvent * me ) override;
void mouseMoveEvent( QMouseEvent * me ) override;
void focusOutEvent( QFocusEvent * _fe ) override;
void resizeEvent( QResizeEvent * _event ) override;
private:

View File

@@ -42,17 +42,17 @@ public:
void setActiveGraphic( const QPixmap & _pm );
void setInactiveGraphic( const QPixmap & _pm, bool _update = true );
QSize sizeHint() const;
QSize sizeHint() const override;
signals:
void doubleClicked();
protected:
virtual void paintEvent( QPaintEvent * _pe );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
void paintEvent( QPaintEvent * _pe ) override;
void mousePressEvent( QMouseEvent * _me ) override;
void mouseReleaseEvent( QMouseEvent * _me ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
private:

View File

@@ -87,9 +87,9 @@ public:
}
// required for ThreadableJob
virtual void doProcessing();
void doProcessing() override;
virtual bool requiresProcessing() const
bool requiresProcessing() const override
{
return !isFinished();
}

View File

@@ -239,7 +239,7 @@ public:
virtual ~Plugin();
//! Return display-name out of sub plugin or descriptor
virtual QString displayName() const;
QString displayName() const override;
//! Return logo out of sub plugin or descriptor
const PixmapLoader *logo() const;

View File

@@ -38,15 +38,15 @@ public:
PresetPreviewPlayHandle( const QString& presetFile, bool loadByPlugin = false, DataFile *dataFile = 0 );
virtual ~PresetPreviewPlayHandle();
virtual inline bool affinityMatters() const
inline bool affinityMatters() const override
{
return true;
}
virtual void play( sampleFrame* buffer );
virtual bool isFinished() const;
void play( sampleFrame* buffer ) override;
bool isFinished() const override;
virtual bool isFromTrack( const Track * _track ) const;
bool isFromTrack( const Track * _track ) const override;
static void init();
static void cleanup();

View File

@@ -47,17 +47,17 @@ public:
void clear();
void setText( const QString & _text );
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
inline virtual QString nodeName() const
inline QString nodeName() const override
{
return "projectnotes";
}
protected:
virtual void closeEvent( QCloseEvent * _ce );
void closeEvent( QCloseEvent * _ce ) override;
void setupActions();

View File

@@ -86,7 +86,7 @@ signals:
private:
virtual void run();
void run() override;
AudioFileDevice * m_fileDev;
Mixer::qualitySettings m_qualitySettings;

View File

@@ -766,7 +766,7 @@ public:
}
private:
virtual void run();
void run() override;
RemotePlugin * m_plugin;
volatile bool m_quit;
@@ -803,7 +803,7 @@ public:
m_failed = waitForMessage( IdInitDone, _busyWaiting ).id != IdInitDone;
}
virtual bool processMessage( const message & _m );
bool processMessage( const message & _m ) override;
bool process( const sampleFrame * _in_buf, sampleFrame * _out_buf );

View File

@@ -42,8 +42,8 @@ public:
protected:
void keyPressEvent( QKeyEvent * _ke );
virtual void resizeEvent(QResizeEvent * event);
void keyPressEvent( QKeyEvent * _ke ) override;
void resizeEvent(QResizeEvent * event) override;
protected slots:

Some files were not shown because too many files have changed in this diff Show More