Use override consistently

parent 26cb4200
......@@ -46,8 +46,8 @@ public:
explicit AdjustSizeButton( QWidget *parent );
private:
virtual void timerEvent( QTimerEvent* ) Q_DECL_OVERRIDE;
virtual bool eventFilter( QObject*, QEvent* ) Q_DECL_OVERRIDE;
void timerEvent( QTimerEvent* ) override;
bool eventFilter( QObject*, QEvent* ) override;
inline void move()
{
......
......@@ -52,7 +52,7 @@ public slots:
protected:
Base(QWidget*, uint = 7);
~Base() { delete m_fht; }
~Base() override { delete m_fht; }
int resizeExponent(int);
int resizeForBands(int);
......@@ -85,8 +85,8 @@ protected:
QPixmap *canvas() { return &m_canvas; }
void eraseCanvas() { m_canvas.fill(Qt::transparent); }
void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE;
void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE;
void paintEvent( QPaintEvent* ) override;
void resizeEvent( QResizeEvent* ) override;
protected slots:
......
......@@ -38,7 +38,7 @@ class BlockAnalyzer : public Analyzer::Base2D
{
public:
explicit BlockAnalyzer( QWidget* );
~BlockAnalyzer();
~BlockAnalyzer() override;
// Signed ints because most of what we compare them against are ints
static const int HEIGHT = 2;
......@@ -49,10 +49,10 @@ public:
static const int FADE_SIZE = 90;
protected:
virtual void transform( QVector<float>& ) Q_DECL_OVERRIDE;
virtual void analyze( const QVector<float>& ) Q_DECL_OVERRIDE;
virtual void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE;
virtual void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE;
void transform( QVector<float>& ) override;
void analyze( const QVector<float>& ) override;
void paintEvent( QPaintEvent* ) override;
void resizeEvent( QResizeEvent* ) override;
void paletteChange( const QPalette& );
void drawBackground();
......
......@@ -35,7 +35,7 @@ class AudioView2 : public QWidget
public:
explicit AudioView2(QWidget *parent = 0);
~AudioView2();
~AudioView2() override;
void setupAnalyzer();
......@@ -44,7 +44,7 @@ public slots:
void update();
protected:
void changeEvent(QEvent *e) Q_DECL_OVERRIDE;
void changeEvent(QEvent *e) override;
private:
Ui::AudioView2 *ui;
......
......@@ -35,8 +35,8 @@ class FullScreenToolBarHandler : QObject
Q_OBJECT
public:
explicit FullScreenToolBarHandler(KMainWindow *parent );
bool eventFilter( QObject *o, QEvent *e ) Q_DECL_OVERRIDE;
void timerEvent( QTimerEvent* ) Q_DECL_OVERRIDE;
bool eventFilter( QObject *o, QEvent *e ) override;
void timerEvent( QTimerEvent* ) override;
private:
int m_timer_id; // 0 when timer is not running
QPoint m_home;
......
......@@ -56,7 +56,7 @@ class MainWindow : public KXmlGuiWindow
Q_OBJECT
MainWindow();
~MainWindow();
~MainWindow() override;
static MainWindow *s_instance;
......@@ -110,9 +110,9 @@ private:
QMenu *menu( const char *name );
virtual void dragEnterEvent( QDragEnterEvent* ) Q_DECL_OVERRIDE;
virtual void dropEvent( QDropEvent* ) Q_DECL_OVERRIDE;
virtual void keyPressEvent( QKeyEvent* ) Q_DECL_OVERRIDE;
void dragEnterEvent( QDragEnterEvent* ) override;
void dropEvent( QDropEvent* ) override;
void keyPressEvent( QKeyEvent* ) override;
void inhibitPowerSave();
void releasePowerSave();
......@@ -152,8 +152,8 @@ private:
Q_DISABLE_COPY(MainWindow)
protected:
void closeEvent( QCloseEvent * event ) Q_DECL_OVERRIDE;
void wheelEvent ( QWheelEvent * event ) Q_DECL_OVERRIDE;
void closeEvent( QCloseEvent * event ) override;
void wheelEvent ( QWheelEvent * event ) override;
};
}
......
......@@ -43,12 +43,12 @@ class Part : public KParts::ReadOnlyPart
public:
Part(QWidget* parentWidget, QObject* parent, const QList<QVariant>& /*args*/ );
virtual bool closeUrl() Q_DECL_OVERRIDE;
bool closeUrl() override;
static KAboutData *createAboutData();
public slots:
virtual bool openUrl( const QUrl& ) Q_DECL_OVERRIDE;
bool openUrl( const QUrl& ) override;
private slots:
void engineStateChanged( Phonon::State state );
......
......@@ -28,7 +28,7 @@
class MouseOverToolBar : public KToolBar
{
virtual bool eventFilter( QObject*, QEvent* ) Q_DECL_OVERRIDE;
bool eventFilter( QObject*, QEvent* ) override;
public:
explicit MouseOverToolBar( QWidget *parent );
......
......@@ -32,7 +32,7 @@ class PlayerApplication : public QApplication
Q_OBJECT
public:
PlayerApplication(int &argc, char **argv);
virtual ~PlayerApplication();
~PlayerApplication() override;
void newInstance(bool playDisc = false, const QList<QUrl> &uris = QList<QUrl>());
public slots:
......
......@@ -31,9 +31,9 @@ class RecentlyPlayedList : public QListWidget
Q_OBJECT
public:
explicit RecentlyPlayedList(QWidget*);
virtual ~RecentlyPlayedList();
~RecentlyPlayedList() override;
private:
virtual void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE;
void contextMenuEvent(QContextMenuEvent*) override;
KConfigGroup* configGroup;
public slots:
void loadEntries();
......
......@@ -28,8 +28,8 @@ class TimeLabel : public QLabel
Q_OBJECT
public:
explicit TimeLabel( QWidget *parent );
virtual ~TimeLabel();
void mousePressEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
~TimeLabel() override;
void mousePressEvent( QMouseEvent * ) override;
void updateTime();
enum TimeFormats { SHOW_REMAINING, SHOW_COMPLETED };
public slots:
......
......@@ -85,7 +85,7 @@ private:
public:
explicit VideoWindow( QWidget *parent );
~VideoWindow();
~VideoWindow() override;
bool init();
......@@ -157,10 +157,10 @@ public slots:
bool canGoNext() const;
protected:
virtual bool event( QEvent* e ) Q_DECL_OVERRIDE;
virtual void contextMenuEvent( QContextMenuEvent * event ) Q_DECL_OVERRIDE;
virtual void mouseDoubleClickEvent( QMouseEvent* ) Q_DECL_OVERRIDE;
virtual QSize sizeHint() const Q_DECL_OVERRIDE;
bool event( QEvent* e ) override;
void contextMenuEvent( QContextMenuEvent * event ) override;
void mouseDoubleClickEvent( QMouseEvent* ) override;
QSize sizeHint() const override;
Phonon::State state( Phonon::State state ) const;
void setSubtitle( int channel );
void setAudioChannel( int channel );
......
......@@ -45,7 +45,7 @@ class MediaPlayer2 : public QDBusAbstractAdaptor
public:
explicit MediaPlayer2(QObject* parent);
~MediaPlayer2();
~MediaPlayer2() override;
bool CanQuit() const;
bool CanRaise() const;
......
......@@ -49,7 +49,7 @@ class MediaPlayer2Player : public QDBusAbstractAdaptor
public:
explicit MediaPlayer2Player(QObject* parent);
~MediaPlayer2Player();
~MediaPlayer2Player() override;
QString PlaybackStatus() const;
QString LoopStatus() const;
......
......@@ -30,7 +30,7 @@ class Mpris2 : public QObject
public:
explicit Mpris2(QObject* parent);
~Mpris2();
~Mpris2() override;
static void signalPropertiesChange(const QObject* adaptor, const QVariantMap& properties);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment