diff options
Diffstat (limited to 'src/plugins/Ui')
87 files changed, 249 insertions, 249 deletions
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 03d900624..5e7eb8977 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 by Ilya Kotov * + * Copyright (C) 2010-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h index a33b0fed2..4bbad8615 100644 --- a/src/plugins/Ui/qsui/actionmanager.h +++ b/src/plugins/Ui/qsui/actionmanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 by Ilya Kotov * + * Copyright (C) 2010-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/colorwidget.h b/src/plugins/Ui/qsui/colorwidget.h index 1f8049ef5..95e0b4f25 100644 --- a/src/plugins/Ui/qsui/colorwidget.h +++ b/src/plugins/Ui/qsui/colorwidget.h @@ -40,7 +40,7 @@ public slots: void setColor (QString); private: - void mousePressEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; QString m_colorName; diff --git a/src/plugins/Ui/qsui/coverwidget.cpp b/src/plugins/Ui/qsui/coverwidget.cpp index afe948207..23712a4a9 100644 --- a/src/plugins/Ui/qsui/coverwidget.cpp +++ b/src/plugins/Ui/qsui/coverwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/coverwidget.h b/src/plugins/Ui/qsui/coverwidget.h index e66dfad35..95d7895c3 100644 --- a/src/plugins/Ui/qsui/coverwidget.h +++ b/src/plugins/Ui/qsui/coverwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -43,7 +43,7 @@ private slots: void saveAs(); private: - void paintEvent (QPaintEvent *); + void paintEvent (QPaintEvent *) override; QPixmap m_pixmap; }; diff --git a/src/plugins/Ui/qsui/elidinglabel.h b/src/plugins/Ui/qsui/elidinglabel.h index f348bcfc1..fc3a342a9 100644 --- a/src/plugins/Ui/qsui/elidinglabel.h +++ b/src/plugins/Ui/qsui/elidinglabel.h @@ -48,7 +48,7 @@ public: void setElideMode(const Qt::TextElideMode &elideMode); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: Qt::TextElideMode m_elideMode; diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp index fa017bb17..099b85e62 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.cpp +++ b/src/plugins/Ui/qsui/filesystembrowser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -41,7 +41,7 @@ public: protected: virtual bool filterAcceptsRow( - int source_row, const QModelIndex &source_parent) const{ + int source_row, const QModelIndex &source_parent) const override { QFileSystemModel *sm = qobject_cast<QFileSystemModel*>(sourceModel()); if (source_parent == sm->index(sm->rootPath())) { return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); diff --git a/src/plugins/Ui/qsui/filesystembrowser.h b/src/plugins/Ui/qsui/filesystembrowser.h index 1a01cfcad..82e7684f7 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.h +++ b/src/plugins/Ui/qsui/filesystembrowser.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2017 by Ilya Kotov * + * Copyright (C) 2013-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/keyboardmanager.cpp b/src/plugins/Ui/qsui/keyboardmanager.cpp index b1c447258..cdf581f25 100644 --- a/src/plugins/Ui/qsui/keyboardmanager.cpp +++ b/src/plugins/Ui/qsui/keyboardmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp index 0841b5062..2ace2d171 100644 --- a/src/plugins/Ui/qsui/listwidget.cpp +++ b/src/plugins/Ui/qsui/listwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h index 1ac01cddf..a5155f883 100644 --- a/src/plugins/Ui/qsui/listwidget.h +++ b/src/plugins/Ui/qsui/listwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -79,21 +79,21 @@ signals: void positionChanged(int, int); //current position, maximum value protected: - void paintEvent(QPaintEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void resizeEvent(QResizeEvent *); - void wheelEvent(QWheelEvent *); - void showEvent(QShowEvent *); + void paintEvent(QPaintEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + void wheelEvent(QWheelEvent *) override; + void showEvent(QShowEvent *) override; int indexAt(int)const; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *); - void dragMoveEvent(QDragMoveEvent *event); - void contextMenuEvent (QContextMenuEvent * event); - bool event (QEvent *e); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void contextMenuEvent (QContextMenuEvent * event) override; + bool event (QEvent *e) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp index 000965152..81f68d568 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp +++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.h b/src/plugins/Ui/qsui/listwidgetdrawer.h index bb91b88b2..77412db45 100644 --- a/src/plugins/Ui/qsui/listwidgetdrawer.h +++ b/src/plugins/Ui/qsui/listwidgetdrawer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp index c413dfbb3..27e0a6290 100644 --- a/src/plugins/Ui/qsui/logo.cpp +++ b/src/plugins/Ui/qsui/logo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/logo.h b/src/plugins/Ui/qsui/logo.h index d8a478125..aff70a77a 100644 --- a/src/plugins/Ui/qsui/logo.h +++ b/src/plugins/Ui/qsui/logo.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -42,15 +42,15 @@ public: virtual ~Logo(); public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void updateLetters(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; void processPreset1(); void processPreset2(); void processPreset3(); diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index fe1932269..4f4cf750f 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h index 90d9a9174..4193a5652 100644 --- a/src/plugins/Ui/qsui/mainwindow.h +++ b/src/plugins/Ui/qsui/mainwindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -94,8 +94,8 @@ private slots: void restoreWindowTitle(); private: - void closeEvent(QCloseEvent *); - void hideEvent(QHideEvent *); + void closeEvent(QCloseEvent *) override; + void hideEvent(QHideEvent *) override; void createWidgets(); void createActions(); void writeSettings(); diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h index 5f5d38df9..98d613a13 100644 --- a/src/plugins/Ui/qsui/playlistbrowser.h +++ b/src/plugins/Ui/qsui/playlistbrowser.h @@ -48,7 +48,7 @@ private slots: void updateCurrentRow(QModelIndex index, QModelIndex); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; QLineEdit *m_lineEdit; QListView *m_listView; PlayListManager *m_pl_manager; diff --git a/src/plugins/Ui/qsui/playlistheader.h b/src/plugins/Ui/qsui/playlistheader.h index fa5cafb71..7b8d68a95 100644 --- a/src/plugins/Ui/qsui/playlistheader.h +++ b/src/plugins/Ui/qsui/playlistheader.h @@ -71,12 +71,12 @@ private slots: void onColumnRemoved(); private: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *e); - void contextMenuEvent(QContextMenuEvent *e); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void paintEvent(QPaintEvent *) override; int findColumn(QPoint pos); void initStyleOption(QStyleOptionHeader *opt); int size(int index) const; @@ -85,8 +85,8 @@ private: void adjustColumn(int index); int autoResizeColumn() const; void writeSettings(); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; enum DataKey { diff --git a/src/plugins/Ui/qsui/popupsettings.cpp b/src/plugins/Ui/qsui/popupsettings.cpp index 0775db71e..acbaf9f1a 100644 --- a/src/plugins/Ui/qsui/popupsettings.cpp +++ b/src/plugins/Ui/qsui/popupsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h index 3be5c6daa..f4016ad3c 100644 --- a/src/plugins/Ui/qsui/popupsettings.h +++ b/src/plugins/Ui/qsui/popupsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -35,7 +35,7 @@ public: public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_resetButton_clicked(); diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp index ae145a2cc..86ebae570 100644 --- a/src/plugins/Ui/qsui/popupwidget.cpp +++ b/src/plugins/Ui/qsui/popupwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2018 by Ilya Kotov * + * Copyright (C) 2008-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/popupwidget.h b/src/plugins/Ui/qsui/popupwidget.h index 00f3751f1..656da06fa 100644 --- a/src/plugins/Ui/qsui/popupwidget.h +++ b/src/plugins/Ui/qsui/popupwidget.h @@ -46,8 +46,8 @@ public: const QString url() const; protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void mouseMoveEvent (QMouseEvent *); + virtual void mousePressEvent (QMouseEvent *) override; + virtual void mouseMoveEvent (QMouseEvent *) override; private slots: void loadCover(); diff --git a/src/plugins/Ui/qsui/positionslider.h b/src/plugins/Ui/qsui/positionslider.h index ebb3db302..0b5ed59ef 100644 --- a/src/plugins/Ui/qsui/positionslider.h +++ b/src/plugins/Ui/qsui/positionslider.h @@ -37,9 +37,9 @@ public: virtual ~PositionSlider(){} protected: - virtual void mousePressEvent (QMouseEvent *event); - virtual void mouseReleaseEvent (QMouseEvent *event); - virtual void wheelEvent(QWheelEvent *event); + virtual void mousePressEvent (QMouseEvent *event) override; + virtual void mouseReleaseEvent (QMouseEvent *event) override; + virtual void wheelEvent(QWheelEvent *event) override; private slots: void onSliderMoved(int pos); diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp index e510c6bc7..e86174d16 100644 --- a/src/plugins/Ui/qsui/qsuianalyzer.cpp +++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2017 by Ilya Kotov * + * Copyright (C) 2012-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/qsuianalyzer.h b/src/plugins/Ui/qsui/qsuianalyzer.h index b75e9569a..52c50c9f9 100644 --- a/src/plugins/Ui/qsui/qsuianalyzer.h +++ b/src/plugins/Ui/qsui/qsuianalyzer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2017 by Ilya Kotov * + * Copyright (C) 2012-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -40,11 +40,11 @@ public: void setCover(const QPixmap &pixmap); void clear(); void clearCover(); - QSize sizeHint() const; + QSize sizeHint() const override; public slots: - void start(); - void stop(); + void start() override; + void stop() override; void readSettings(); private slots: @@ -52,11 +52,11 @@ private slots: void writeSettings(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void hideEvent(QHideEvent *); - void showEvent(QShowEvent *); - void resizeEvent(QResizeEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void hideEvent(QHideEvent *) override; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; void process(); void draw(QPainter *p); void createMenu(); diff --git a/src/plugins/Ui/qsui/qsuifactory.h b/src/plugins/Ui/qsui/qsuifactory.h index 259dfa6b7..b74374750 100644 --- a/src/plugins/Ui/qsui/qsuifactory.h +++ b/src/plugins/Ui/qsui/qsuifactory.h @@ -32,10 +32,10 @@ class QSUIFactory : public QObject, public UiFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: - UiProperties properties() const; - QObject *create(); - void showAbout(QWidget *parent); - QString translation() const; + UiProperties properties() const override; + QObject *create() override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp index 1b0523f58..6a64fb328 100644 --- a/src/plugins/Ui/qsui/qsuisettings.cpp +++ b/src/plugins/Ui/qsui/qsuisettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h index 26a7935e4..905959786 100644 --- a/src/plugins/Ui/qsui/qsuisettings.h +++ b/src/plugins/Ui/qsui/qsuisettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -47,7 +47,7 @@ private slots: void addWindowTitleString(const QString &str); private: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; void loadFonts(); void createActions(); void readSettings(); diff --git a/src/plugins/Ui/qsui/qsuitabbar.h b/src/plugins/Ui/qsui/qsuitabbar.h index 955e73c81..f04c8e26a 100644 --- a/src/plugins/Ui/qsui/qsuitabbar.h +++ b/src/plugins/Ui/qsui/qsuitabbar.h @@ -33,7 +33,7 @@ public: explicit QSUiTabBar(QWidget *parent = nullptr); private: - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(QMouseEvent *e) override; }; diff --git a/src/plugins/Ui/qsui/qsuitabwidget.h b/src/plugins/Ui/qsui/qsuitabwidget.h index 85988e7a4..53b84fc00 100644 --- a/src/plugins/Ui/qsui/qsuitabwidget.h +++ b/src/plugins/Ui/qsui/qsuitabwidget.h @@ -71,14 +71,14 @@ private slots: private: void initStyleOption(QStyleOptionTabWidgetFrame *option) const; void setUpLayout(); - void showEvent(QShowEvent *); - void resizeEvent(QResizeEvent *e); - void paintEvent(QPaintEvent *); + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *) override; void setTabBar(QTabBar *); - void changeEvent(QEvent *ev); - bool event(QEvent *ev); - void mousePressEvent(QMouseEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); + void changeEvent(QEvent *ev) override; + bool event(QEvent *ev) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; void tabInserted(int index); void tabRemoved(int index); diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h index 5d9a13469..f270b93d6 100644 --- a/src/plugins/Ui/qsui/shortcutdialog.h +++ b/src/plugins/Ui/qsui/shortcutdialog.h @@ -39,7 +39,7 @@ public: const QString key(); protected: - virtual void keyPressEvent (QKeyEvent *event); + virtual void keyPressEvent (QKeyEvent *event) override; private: Ui::ShortcutDialog m_ui; diff --git a/src/plugins/Ui/qsui/toolbareditor.h b/src/plugins/Ui/qsui/toolbareditor.h index 25eff0da4..db79f487e 100644 --- a/src/plugins/Ui/qsui/toolbareditor.h +++ b/src/plugins/Ui/qsui/toolbareditor.h @@ -44,7 +44,7 @@ public: ~ToolBarEditor(); public slots: - void accept(); + void accept() override; private slots: void on_addToolButton_clicked(); diff --git a/src/plugins/Ui/qsui/volumeslider.h b/src/plugins/Ui/qsui/volumeslider.h index 344c08000..15de1c4a7 100644 --- a/src/plugins/Ui/qsui/volumeslider.h +++ b/src/plugins/Ui/qsui/volumeslider.h @@ -37,9 +37,9 @@ public: virtual ~VolumeSlider(){} protected: - virtual void mousePressEvent (QMouseEvent *event); - virtual void mouseReleaseEvent (QMouseEvent *event); - virtual void wheelEvent(QWheelEvent *event); + virtual void mousePressEvent (QMouseEvent *event) override; + virtual void mouseReleaseEvent (QMouseEvent *event) override; + virtual void wheelEvent(QWheelEvent *event) override; private slots: void onSliderMoved(int pos); diff --git a/src/plugins/Ui/skinned/balancebar.h b/src/plugins/Ui/skinned/balancebar.h index 23628163f..8ee130ebd 100644 --- a/src/plugins/Ui/skinned/balancebar.h +++ b/src/plugins/Ui/skinned/balancebar.h @@ -59,9 +59,9 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/button.h b/src/plugins/Ui/skinned/button.h index d72bfb020..5d687c2fb 100644 --- a/src/plugins/Ui/skinned/button.h +++ b/src/plugins/Ui/skinned/button.h @@ -49,9 +49,9 @@ private: uint name_cursor; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp index ef12f595e..2ae37d308 100644 --- a/src/plugins/Ui/skinned/display.cpp +++ b/src/plugins/Ui/skinned/display.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h index 796630bb8..25c7bdc83 100644 --- a/src/plugins/Ui/skinned/display.h +++ b/src/plugins/Ui/skinned/display.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -74,8 +74,8 @@ signals: void shuffleToggled(bool); protected: - void wheelEvent(QWheelEvent *); - void mousePressEvent(QMouseEvent*); + void wheelEvent(QWheelEvent *) override; + void mousePressEvent(QMouseEvent*) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index 0cd867493..7f8c291f1 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/eqslider.cpp b/src/plugins/Ui/skinned/eqslider.cpp index 41c824517..ed2b0d0db 100644 --- a/src/plugins/Ui/skinned/eqslider.cpp +++ b/src/plugins/Ui/skinned/eqslider.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/eqslider.h b/src/plugins/Ui/skinned/eqslider.h index eb1d53116..0ca38c380 100644 --- a/src/plugins/Ui/skinned/eqslider.h +++ b/src/plugins/Ui/skinned/eqslider.h @@ -59,10 +59,10 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void wheelEvent(QWheelEvent *); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void wheelEvent(QWheelEvent *) override; }; diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h index 1db1af2ab..6e56ab72e 100644 --- a/src/plugins/Ui/skinned/eqtitlebar.h +++ b/src/plugins/Ui/skinned/eqtitlebar.h @@ -61,10 +61,10 @@ private: ShadedBar* m_balanceBar; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent (QMouseEvent *); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent (QMouseEvent *) override; }; #endif diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp index f9cabdfc1..6785960fb 100644 --- a/src/plugins/Ui/skinned/eqwidget.cpp +++ b/src/plugins/Ui/skinned/eqwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h index b05c608b4..0fe79b895 100644 --- a/src/plugins/Ui/skinned/eqwidget.h +++ b/src/plugins/Ui/skinned/eqwidget.h @@ -77,11 +77,11 @@ private: void updateMask(); EQPreset *findPreset(const QString &name); //events - void keyPressEvent (QKeyEvent *); - void changeEvent(QEvent*); - void closeEvent(QCloseEvent*); + void keyPressEvent (QKeyEvent *) override; + void changeEvent(QEvent*) override; + void closeEvent(QCloseEvent*) override; #ifdef QMMP_WS_X11 - bool event (QEvent *event); + bool event (QEvent *event) override; #endif Skin *m_skin; diff --git a/src/plugins/Ui/skinned/horizontalslider.h b/src/plugins/Ui/skinned/horizontalslider.h index 19ddfae8d..3933d4a31 100644 --- a/src/plugins/Ui/skinned/horizontalslider.h +++ b/src/plugins/Ui/skinned/horizontalslider.h @@ -46,9 +46,9 @@ private slots: void updateSkin(); private: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void paintEvent(QPaintEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; int convert(int) const; // value = convert(position); int sliderSize() const; diff --git a/src/plugins/Ui/skinned/hotkeyeditor.cpp b/src/plugins/Ui/skinned/hotkeyeditor.cpp index 403866ae0..638e667bb 100644 --- a/src/plugins/Ui/skinned/hotkeyeditor.cpp +++ b/src/plugins/Ui/skinned/hotkeyeditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2018 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index dc2c2d41d..67f1111dd 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h index 9f4b95bc7..36026e9f9 100644 --- a/src/plugins/Ui/skinned/listwidget.h +++ b/src/plugins/Ui/skinned/listwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -77,20 +77,20 @@ signals: void positionChanged(int, int); //current position, maximum value protected: - void paintEvent(QPaintEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void resizeEvent(QResizeEvent *); - void wheelEvent(QWheelEvent *); + void paintEvent(QPaintEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + void wheelEvent(QWheelEvent *) override; int indexAt(int)const; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *); - void dragMoveEvent(QDragMoveEvent *event); - void contextMenuEvent (QContextMenuEvent * event); - bool event (QEvent *e); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void contextMenuEvent (QContextMenuEvent * event) override; + bool event (QEvent *e) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp index 7293dc8a0..2f34cfee8 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp +++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h index 4ae907d74..dca6b4502 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.h +++ b/src/plugins/Ui/skinned/listwidgetdrawer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2017 by Ilya Kotov * + * Copyright (C) 2015-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp index 05b2855c9..6f24a432f 100644 --- a/src/plugins/Ui/skinned/mainvisual.cpp +++ b/src/plugins/Ui/skinned/mainvisual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/mainvisual.h b/src/plugins/Ui/skinned/mainvisual.h index e5b5e300e..0924dc310 100644 --- a/src/plugins/Ui/skinned/mainvisual.h +++ b/src/plugins/Ui/skinned/mainvisual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -51,16 +51,16 @@ public: static MainVisual *instance(); void setVisual(VisualBase *newvis); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; protected: - virtual void hideEvent (QHideEvent *); - virtual void showEvent (QShowEvent *); - virtual void mousePressEvent (QMouseEvent *); + virtual void hideEvent (QHideEvent *) override; + virtual void showEvent (QShowEvent *) override; + virtual void mousePressEvent (QMouseEvent *) override; public slots: - void start(); - void stop(); + void start() override; + void stop() override; private slots: void timeout(); @@ -103,10 +103,10 @@ public: Analyzer(); virtual ~Analyzer(); - void clear(); - bool process(float *l); - void draw(QPainter *p); - const QString name() + void clear() override; + bool process(float *l) override; + void draw(QPainter *p) override; + const QString name() override { return "Analyzer"; } @@ -128,10 +128,10 @@ class Scope : public VisualBase public: Scope(); virtual ~Scope(); - void clear(); - bool process(float *l); - void draw(QPainter *p); - const QString name() + void clear() override; + bool process(float *l) override; + void draw(QPainter *p) override; + const QString name() override { return "Scope"; } diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 2074bdc9b..ae4092390 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h index cf4f1bb9b..176009958 100644 --- a/src/plugins/Ui/skinned/mainwindow.h +++ b/src/plugins/Ui/skinned/mainwindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -91,10 +91,10 @@ private slots: private: //events - void closeEvent (QCloseEvent *); - void hideEvent (QHideEvent *); - void changeEvent (QEvent *event); - void keyPressEvent (QKeyEvent* ); + void closeEvent (QCloseEvent *) override; + void hideEvent (QHideEvent *) override; + void changeEvent (QEvent *event) override; + void keyPressEvent (QKeyEvent* ) override; void readSettings(); diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h index 9b37feec7..246ec9105 100644 --- a/src/plugins/Ui/skinned/pixmapwidget.h +++ b/src/plugins/Ui/skinned/pixmapwidget.h @@ -38,8 +38,8 @@ public: virtual void setPixmap(const QPixmap &pixmap, bool fixed_size = false); protected: - void paintEvent ( QPaintEvent * event ); - virtual void mousePressEvent(QMouseEvent*); + void paintEvent ( QPaintEvent * event ) override; + virtual void mousePressEvent(QMouseEvent*) override; signals: void mouseClicked(); diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 8f280907e..9bcbc7746 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2018 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h index 67570da88..9835a8e3a 100644 --- a/src/plugins/Ui/skinned/playlist.h +++ b/src/plugins/Ui/skinned/playlist.h @@ -94,16 +94,16 @@ class PlayList : public QWidget void createMenus(); void createActions(); //events - void paintEvent (QPaintEvent *); - void resizeEvent (QResizeEvent *); - void mouseMoveEvent (QMouseEvent *); - void mousePressEvent (QMouseEvent *); - void mouseReleaseEvent (QMouseEvent *); - void changeEvent (QEvent*); - void closeEvent (QCloseEvent*); - void keyPressEvent (QKeyEvent*); + void paintEvent (QPaintEvent *) override; + void resizeEvent (QResizeEvent *) override; + void mouseMoveEvent (QMouseEvent *) override; + void mousePressEvent (QMouseEvent *) override; + void mouseReleaseEvent (QMouseEvent *) override; + void changeEvent (QEvent*) override; + void closeEvent (QCloseEvent*) override; + void keyPressEvent (QKeyEvent*) override; #ifdef QMMP_WS_X11 - bool event (QEvent *event); + bool event (QEvent *event) override; #endif QMenu *m_addMenu; QMenu *m_subMenu; diff --git a/src/plugins/Ui/skinned/playlistbrowser.h b/src/plugins/Ui/skinned/playlistbrowser.h index 5cfe21508..d0a3b2ff0 100644 --- a/src/plugins/Ui/skinned/playlistbrowser.h +++ b/src/plugins/Ui/skinned/playlistbrowser.h @@ -51,7 +51,7 @@ private slots: void on_upButton_clicked(); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; Ui::PlayListBrowser m_ui; PlayListManager *m_pl_manager; QStandardItemModel* m_listModel; diff --git a/src/plugins/Ui/skinned/playlistcontrol.h b/src/plugins/Ui/skinned/playlistcontrol.h index d661f09a8..4af6bdd90 100644 --- a/src/plugins/Ui/skinned/playlistcontrol.h +++ b/src/plugins/Ui/skinned/playlistcontrol.h @@ -49,7 +49,7 @@ private slots: void updateSkin(); private: - void mouseReleaseEvent(QMouseEvent*); + void mouseReleaseEvent(QMouseEvent*) override; int m_ratio; Skin* m_skin; }; diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h index f5622b955..ce0d8564c 100644 --- a/src/plugins/Ui/skinned/playlistheader.h +++ b/src/plugins/Ui/skinned/playlistheader.h @@ -72,12 +72,12 @@ private slots: void onColumnRemoved(); private: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *e); - void contextMenuEvent(QContextMenuEvent *e); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void paintEvent(QPaintEvent *) override; void loadColors(); void adjustColumn(int index); int autoResizeColumn() const; diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp index 37ac13eb5..5c526e8bc 100644 --- a/src/plugins/Ui/skinned/playlistselector.cpp +++ b/src/plugins/Ui/skinned/playlistselector.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h index 63d000e8f..7b140759a 100644 --- a/src/plugins/Ui/skinned/playlistselector.h +++ b/src/plugins/Ui/skinned/playlistselector.h @@ -49,12 +49,12 @@ private slots: void updateSkin(); private: - void paintEvent(QPaintEvent *); - void mousePressEvent (QMouseEvent *e); - void mouseReleaseEvent (QMouseEvent *e); - void mouseDoubleClickEvent (QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent (QResizeEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent (QMouseEvent *e) override; + void mouseReleaseEvent (QMouseEvent *e) override; + void mouseDoubleClickEvent (QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent (QResizeEvent *) override; void updateOffsets(); void loadColors(); void drawButtons(); diff --git a/src/plugins/Ui/skinned/playlistslider.h b/src/plugins/Ui/skinned/playlistslider.h index 8e3b267ca..83aaad957 100644 --- a/src/plugins/Ui/skinned/playlistslider.h +++ b/src/plugins/Ui/skinned/playlistslider.h @@ -52,10 +52,10 @@ private: int convert(int); // value = convert(position); protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void paintEvent(QPaintEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp index 3450a5bc5..282454e30 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.cpp +++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h index 6e2a48cf5..b470dd808 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.h +++ b/src/plugins/Ui/skinned/playlisttitlebar.h @@ -72,11 +72,11 @@ private: MetaDataFormatter m_formatter; protected: - void resizeEvent(QResizeEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent(QMouseEvent*); + void resizeEvent(QResizeEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent(QMouseEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/popupsettings.cpp b/src/plugins/Ui/skinned/popupsettings.cpp index e57e3624a..c7bafc73d 100644 --- a/src/plugins/Ui/skinned/popupsettings.cpp +++ b/src/plugins/Ui/skinned/popupsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h index b79f1609b..e3e543194 100644 --- a/src/plugins/Ui/skinned/popupsettings.h +++ b/src/plugins/Ui/skinned/popupsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,7 +34,7 @@ public: ~PopupSettings(); public slots: - virtual void accept(); + virtual void accept() override; private slots: void on_resetButton_clicked(); diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp index 5bb25afc4..154410129 100644 --- a/src/plugins/Ui/skinned/popupwidget.cpp +++ b/src/plugins/Ui/skinned/popupwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2018 by Ilya Kotov * + * Copyright (C) 2008-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/popupwidget.h b/src/plugins/Ui/skinned/popupwidget.h index 84d00d4f4..27e6eef19 100644 --- a/src/plugins/Ui/skinned/popupwidget.h +++ b/src/plugins/Ui/skinned/popupwidget.h @@ -46,8 +46,8 @@ public: const QString url() const; protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void mouseMoveEvent (QMouseEvent *); + virtual void mousePressEvent (QMouseEvent *) override; + virtual void mouseMoveEvent (QMouseEvent *) override; private slots: void loadCover(); diff --git a/src/plugins/Ui/skinned/positionbar.cpp b/src/plugins/Ui/skinned/positionbar.cpp index f5527d402..280bfbfc1 100644 --- a/src/plugins/Ui/skinned/positionbar.cpp +++ b/src/plugins/Ui/skinned/positionbar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2018 by Ilya Kotov * + * Copyright (C) 2009-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/positionbar.h b/src/plugins/Ui/skinned/positionbar.h index 2b0261fb9..9456aaea6 100644 --- a/src/plugins/Ui/skinned/positionbar.h +++ b/src/plugins/Ui/skinned/positionbar.h @@ -51,10 +51,10 @@ private slots: void updateSkin(); private: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void wheelEvent(QWheelEvent *e); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void wheelEvent(QWheelEvent *e) override; Skin *m_skin; bool m_moving; qint64 press_pos; diff --git a/src/plugins/Ui/skinned/shadedbar.h b/src/plugins/Ui/skinned/shadedbar.h index 1a5f96fd3..e4ebb6b7f 100644 --- a/src/plugins/Ui/skinned/shadedbar.h +++ b/src/plugins/Ui/skinned/shadedbar.h @@ -67,10 +67,10 @@ private: int m_ratio; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void paintEvent(QPaintEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void paintEvent(QPaintEvent*) override; }; #endif diff --git a/src/plugins/Ui/skinned/shadedvisual.cpp b/src/plugins/Ui/skinned/shadedvisual.cpp index 82be005ea..4fc1acc82 100644 --- a/src/plugins/Ui/skinned/shadedvisual.cpp +++ b/src/plugins/Ui/skinned/shadedvisual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h index a74c6f693..a6fba4fb9 100644 --- a/src/plugins/Ui/skinned/shadedvisual.h +++ b/src/plugins/Ui/skinned/shadedvisual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2017 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -41,17 +41,17 @@ public: public slots: void timeout(); - void start(); - void stop(); + void start() override; + void stop() override; private slots: void updateSkin(); private: void clear(); - void paintEvent (QPaintEvent *); - void hideEvent (QHideEvent *); - void showEvent (QShowEvent *); + void paintEvent (QPaintEvent *) override; + void hideEvent (QHideEvent *) override; + void showEvent (QShowEvent *) override; void process (); void draw (QPainter *); diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h index 5d9a13469..f270b93d6 100644 --- a/src/plugins/Ui/skinned/shortcutdialog.h +++ b/src/plugins/Ui/skinned/shortcutdialog.h @@ -39,7 +39,7 @@ public: const QString key(); protected: - virtual void keyPressEvent (QKeyEvent *event); + virtual void keyPressEvent (QKeyEvent *event) override; private: Ui::ShortcutDialog m_ui; diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index cc619a7bc..f379955fb 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 by Ilya Kotov * + * Copyright (C) 2007-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * Based on Promoe, an XMMS2 Client * diff --git a/src/plugins/Ui/skinned/skinnedfactory.cpp b/src/plugins/Ui/skinned/skinnedfactory.cpp index e56500772..db71da43e 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.cpp +++ b/src/plugins/Ui/skinned/skinnedfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2018 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/skinnedfactory.h b/src/plugins/Ui/skinned/skinnedfactory.h index 8133314e0..c72872a5c 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.h +++ b/src/plugins/Ui/skinned/skinnedfactory.h @@ -32,10 +32,10 @@ class SkinnedFactory : public QObject, public UiFactory Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: - UiProperties properties() const; - QObject *create(); - void showAbout(QWidget *parent); - QString translation() const; + UiProperties properties() const override; + QObject *create() override; + void showAbout(QWidget *parent) override; + QString translation() const override; }; #endif diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 953205680..6bc10c20e 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h index 4f2c0c757..aa06d1e2f 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.h +++ b/src/plugins/Ui/skinned/skinnedsettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2017 by Ilya Kotov * + * Copyright (C) 2011-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -50,7 +50,7 @@ private slots: private: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; void loadFonts(); void findSkins(const QString &path); void createActions(); diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp index 9167cc0fa..fe911ecd4 100644 --- a/src/plugins/Ui/skinned/textscroller.cpp +++ b/src/plugins/Ui/skinned/textscroller.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h index 2785b18ba..9389c0e8b 100644 --- a/src/plugins/Ui/skinned/textscroller.h +++ b/src/plugins/Ui/skinned/textscroller.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -55,13 +55,13 @@ private slots: void clearText(); private: - void hideEvent(QHideEvent *); - void showEvent(QShowEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseDoubleClickEvent(QMouseEvent *); + void hideEvent(QHideEvent *) override; + void showEvent(QShowEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; void preparePixmap(const QString &text, bool scrollable = false); QString m_defautText; QString m_bufferText; diff --git a/src/plugins/Ui/skinned/timeindicator.h b/src/plugins/Ui/skinned/timeindicator.h index 82ca728fd..83918e9cb 100644 --- a/src/plugins/Ui/skinned/timeindicator.h +++ b/src/plugins/Ui/skinned/timeindicator.h @@ -81,9 +81,9 @@ public: ~TimeIndicator(); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); + virtual void mousePressEvent(QMouseEvent*) override; + virtual void mouseMoveEvent(QMouseEvent*) override; + virtual void mouseReleaseEvent(QMouseEvent*) override; private slots: void modelChanged(); diff --git a/src/plugins/Ui/skinned/titlebar.h b/src/plugins/Ui/skinned/titlebar.h index 284ee12d1..8d768a376 100644 --- a/src/plugins/Ui/skinned/titlebar.h +++ b/src/plugins/Ui/skinned/titlebar.h @@ -73,10 +73,10 @@ private: void updatePositions(); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseDoubleClickEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseDoubleClickEvent(QMouseEvent*) override; }; diff --git a/src/plugins/Ui/skinned/titlebarcontrol.h b/src/plugins/Ui/skinned/titlebarcontrol.h index 46c3a7975..2905009d0 100644 --- a/src/plugins/Ui/skinned/titlebarcontrol.h +++ b/src/plugins/Ui/skinned/titlebarcontrol.h @@ -43,9 +43,9 @@ signals: void ejectClicked(); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; private slots: void updateSkin(); diff --git a/src/plugins/Ui/skinned/togglebutton.h b/src/plugins/Ui/skinned/togglebutton.h index ab4d2e1ee..b46fd4fbc 100644 --- a/src/plugins/Ui/skinned/togglebutton.h +++ b/src/plugins/Ui/skinned/togglebutton.h @@ -53,9 +53,9 @@ private: bool m_on; protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; diff --git a/src/plugins/Ui/skinned/volumebar.h b/src/plugins/Ui/skinned/volumebar.h index 7e8d83ecd..7a5db65cb 100644 --- a/src/plugins/Ui/skinned/volumebar.h +++ b/src/plugins/Ui/skinned/volumebar.h @@ -68,9 +68,9 @@ private: void draw(bool pressed = true); protected: - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; #endif |