diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-06 19:27:03 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-06 19:27:03 +0000 |
| commit | 8a6f982632b4f4710576685a5647a771384ab29a (patch) | |
| tree | 9ca763e18279d42aa4c7b29530612768db1bbf01 /src/qmmpui | |
| parent | 1b0fef3d25ed94518f4f6b1914a7d7e71aae80c5 (diff) | |
| download | qmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.gz qmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.bz2 qmmp-8a6f982632b4f4710576685a5647a771384ab29a.zip | |
using override keyword
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/qmmpui')
66 files changed, 146 insertions, 146 deletions
diff --git a/src/qmmpui/aboutdialog.cpp b/src/qmmpui/aboutdialog.cpp index 53912b00a..c21633f87 100644 --- a/src/qmmpui/aboutdialog.cpp +++ b/src/qmmpui/aboutdialog.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/qmmpui/addurldialog.cpp b/src/qmmpui/addurldialog.cpp index e121cf51e..91f12cf17 100644 --- a/src/qmmpui/addurldialog.cpp +++ b/src/qmmpui/addurldialog.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/qmmpui/addurldialog_p.h b/src/qmmpui/addurldialog_p.h index 27645ad57..97e7f3367 100644 --- a/src/qmmpui/addurldialog_p.h +++ b/src/qmmpui/addurldialog_p.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 * @@ -46,7 +46,7 @@ private slots: private: AddUrlDialog(QWidget *parent); ~AddUrlDialog(); - void accept(); + void accept() override; void setModel(PlayListModel*); static QPointer<AddUrlDialog> m_instance; PlayListModel *m_model; diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp index c24239007..0d595c649 100644 --- a/src/qmmpui/columneditor.cpp +++ b/src/qmmpui/columneditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2018 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/qmmpui/columneditor_p.h b/src/qmmpui/columneditor_p.h index 60883df0f..7668e0689 100644 --- a/src/qmmpui/columneditor_p.h +++ b/src/qmmpui/columneditor_p.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/qmmpui/commandlinehandler.h b/src/qmmpui/commandlinehandler.h index db733c586..315a39dae 100644 --- a/src/qmmpui/commandlinehandler.h +++ b/src/qmmpui/commandlinehandler.h @@ -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/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index d23ce4768..88f12e1c8 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 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/qmmpui/configdialog.h b/src/qmmpui/configdialog.h index 8b1df9b67..2967104e8 100644 --- a/src/qmmpui/configdialog.h +++ b/src/qmmpui/configdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2018 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/qmmpui/covereditor.cpp b/src/qmmpui/covereditor.cpp index 73676e0d3..b198bb717 100644 --- a/src/qmmpui/covereditor.cpp +++ b/src/qmmpui/covereditor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/covereditor_p.h b/src/qmmpui/covereditor_p.h index 6621865a1..a552a1805 100644 --- a/src/qmmpui/covereditor_p.h +++ b/src/qmmpui/covereditor_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2018 by Ilya Kotov * + * Copyright (C) 2018-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/coverviewer.cpp b/src/qmmpui/coverviewer.cpp index 1b8306f8c..0362714f2 100644 --- a/src/qmmpui/coverviewer.cpp +++ b/src/qmmpui/coverviewer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/coverviewer_p.h b/src/qmmpui/coverviewer_p.h index 28b438d1b..6ae969347 100644 --- a/src/qmmpui/coverviewer_p.h +++ b/src/qmmpui/coverviewer_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -48,7 +48,7 @@ public slots: void clear(); private: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; QPixmap m_pixmap; QString m_lastDir; }; diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index f11ae8e54..37fb98986 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.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/qmmpui/detailsdialog.h b/src/qmmpui/detailsdialog.h index de1fe3a0b..7369de2bb 100644 --- a/src/qmmpui/detailsdialog.h +++ b/src/qmmpui/detailsdialog.h @@ -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 * @@ -63,7 +63,7 @@ private slots: private: Ui::DetailsDialog *m_ui; - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; void updatePage(); void printInfo(); QString formatRow(const QString &key, const QString &value) const; diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index 05804a75c..8d74c0b78 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.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/qmmpui/filedialog.h b/src/qmmpui/filedialog.h index 405fb7db5..63d69c9f3 100644 --- a/src/qmmpui/filedialog.h +++ b/src/qmmpui/filedialog.h @@ -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/qmmpui/filedialogfactory.h b/src/qmmpui/filedialogfactory.h index 32d5bf031..baf40451c 100644 --- a/src/qmmpui/filedialogfactory.h +++ b/src/qmmpui/filedialogfactory.h @@ -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/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index 5650e17e1..49fcdabe6 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.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/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h index 02772f726..d24b3c8b6 100644 --- a/src/qmmpui/fileloader_p.h +++ b/src/qmmpui/fileloader_p.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 * @@ -82,7 +82,7 @@ signals: void newTracksToInsert(PlayListItem *before, QList<PlayListTrack *> tracks); private: - void run(); + void run() override; QList<PlayListTrack*> processFile(const QString &path, QStringList *ignoredPaths = nullptr); void insertPlayList(const QString &fmt, const QByteArray &contents, PlayListItem *before); void insertPlayList(const QString &path, PlayListItem *before); diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp index 420277afd..e47e23ec7 100644 --- a/src/qmmpui/general.cpp +++ b/src/qmmpui/general.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/qmmpui/general.h b/src/qmmpui/general.h index d74dd1004..1cedd2c30 100644 --- a/src/qmmpui/general.h +++ b/src/qmmpui/general.h @@ -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/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h index 7bd2dc5a2..8437a6eb8 100644 --- a/src/qmmpui/generalfactory.h +++ b/src/qmmpui/generalfactory.h @@ -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/qmmpui/groupedcontainer_p.h b/src/qmmpui/groupedcontainer_p.h index 8a21bec9f..98737bd5b 100644 --- a/src/qmmpui/groupedcontainer_p.h +++ b/src/qmmpui/groupedcontainer_p.h @@ -34,35 +34,35 @@ public: virtual ~GroupedContainer(); - void addTrack(PlayListTrack *track); - void addTracks(QList<PlayListTrack *> tracks); - void insertTrack(int index, PlayListTrack *track); - void replaceTracks(QList<PlayListTrack *> tracks); - QList<PlayListGroup *> groups() const; - QList<PlayListTrack *> tracks() const; - QList<PlayListItem *> items() const; - int count() const; - int trackCount() const; - QList<PlayListItem *> mid(int pos, int count) const; - bool isEmpty() const; - bool isSelected(int index) const; - void setSelected(int index, bool selected); - void clearSelection(); - int indexOf(PlayListItem *item) const; - PlayListItem *item(int index) const; - PlayListTrack *track(int index) const; - PlayListGroup *group(int index) const; - bool contains(PlayListItem *item) const; - int indexOfTrack(int index) const; - PlayListTrack *findTrack(int number) const; - void removeTrack(PlayListTrack *track); - void removeTracks(QList<PlayListTrack *> tracks); - bool move(QList<int> indexes, int from, int to); - QList<PlayListTrack *> takeAllTracks(); - void clear(); + void addTrack(PlayListTrack *track) override; + void addTracks(QList<PlayListTrack *> tracks) override; + void insertTrack(int index, PlayListTrack *track) override; + void replaceTracks(QList<PlayListTrack *> tracks) override; + QList<PlayListGroup *> groups() const override; + QList<PlayListTrack *> tracks() const override; + QList<PlayListItem *> items() const override; + int count() const override; + int trackCount() const override; + QList<PlayListItem *> mid(int pos, int count) const override; + bool isEmpty() const override; + bool isSelected(int index) const override; + void setSelected(int index, bool selected) override; + void clearSelection() override; + int indexOf(PlayListItem *item) const override; + PlayListItem *item(int index) const override; + PlayListTrack *track(int index) const override; + PlayListGroup *group(int index) const override; + bool contains(PlayListItem *item) const override; + int indexOfTrack(int index) const override; + PlayListTrack *findTrack(int number) const override; + void removeTrack(PlayListTrack *track) override; + void removeTracks(QList<PlayListTrack *> tracks) override; + bool move(QList<int> indexes, int from, int to) override; + QList<PlayListTrack *> takeAllTracks() override; + void clear() override; - void reverseList(); - void randomizeList(); + void reverseList() override; + void randomizeList() override; private: void updateCache() const; diff --git a/src/qmmpui/jumptotrackdialog.cpp b/src/qmmpui/jumptotrackdialog.cpp index 6b223c087..f80a43049 100644 --- a/src/qmmpui/jumptotrackdialog.cpp +++ b/src/qmmpui/jumptotrackdialog.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/qmmpui/jumptotrackdialog_p.h b/src/qmmpui/jumptotrackdialog_p.h index 6cffc7aee..d2d4e3430 100644 --- a/src/qmmpui/jumptotrackdialog_p.h +++ b/src/qmmpui/jumptotrackdialog_p.h @@ -53,7 +53,7 @@ private slots: void queueUnqueue(const QModelIndex&,const QModelIndex&); private: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) override; QStringListModel* m_listModel; QSortFilterProxyModel* m_proxyModel; PlayListManager *m_pl_manager; diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index f9a6f85ef..a1a5a3f3a 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.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/qmmpui/mediaplayer.h b/src/qmmpui/mediaplayer.h index 4a971cad8..9253861e5 100644 --- a/src/qmmpui/mediaplayer.h +++ b/src/qmmpui/mediaplayer.h @@ -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/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index 5373b0059..38cb607e5 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2018 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/qmmpui/metadataformatter.h b/src/qmmpui/metadataformatter.h index 2645e3fe7..e2ff3d924 100644 --- a/src/qmmpui/metadataformatter.h +++ b/src/qmmpui/metadataformatter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2018 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/qmmpui/metadataformattermenu.cpp b/src/qmmpui/metadataformattermenu.cpp index 11b236e48..d2e5f2b01 100644 --- a/src/qmmpui/metadataformattermenu.cpp +++ b/src/qmmpui/metadataformattermenu.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/metadataformattermenu.h b/src/qmmpui/metadataformattermenu.h index 3c26d4d0c..8a6cab3c6 100644 --- a/src/qmmpui/metadataformattermenu.h +++ b/src/qmmpui/metadataformattermenu.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/normalcontainer_p.h b/src/qmmpui/normalcontainer_p.h index f5d2a238a..35cb72605 100644 --- a/src/qmmpui/normalcontainer_p.h +++ b/src/qmmpui/normalcontainer_p.h @@ -34,34 +34,34 @@ public: NormalContainer(); virtual ~NormalContainer(); - void addTracks(QList<PlayListTrack *> tracks); - void insertTrack(int index, PlayListTrack *track); - void replaceTracks(QList<PlayListTrack *> tracks); - QList<PlayListGroup *> groups() const; - QList<PlayListTrack *> tracks() const; - QList<PlayListItem *> items() const; - int count() const; - int trackCount() const; - QList<PlayListItem *> mid(int pos, int count) const; - bool isEmpty() const; - bool isSelected(int index) const; - void setSelected(int index, bool selected); - void clearSelection(); - int indexOf(PlayListItem *item) const; - PlayListItem *item(int index) const; - PlayListTrack *track(int index) const; - PlayListGroup *group(int index) const; - bool contains(PlayListItem *item) const; - int indexOfTrack(int index) const; - PlayListTrack *findTrack(int number) const; - void removeTrack(PlayListTrack *track); - void removeTracks(QList<PlayListTrack *> tracks); - bool move(QList<int> indexes, int from, int to); - QList<PlayListTrack *> takeAllTracks(); - void clear(); + void addTracks(QList<PlayListTrack *> tracks) override; + void insertTrack(int index, PlayListTrack *track) override; + void replaceTracks(QList<PlayListTrack *> tracks) override; + QList<PlayListGroup *> groups() const override; + QList<PlayListTrack *> tracks() const override; + QList<PlayListItem *> items() const override; + int count() const override; + int trackCount() const override; + QList<PlayListItem *> mid(int pos, int count) const override; + bool isEmpty() const override; + bool isSelected(int index) const override; + void setSelected(int index, bool selected) override; + void clearSelection() override; + int indexOf(PlayListItem *item) const override; + PlayListItem *item(int index) const override; + PlayListTrack *track(int index) const override; + PlayListGroup *group(int index) const override; + bool contains(PlayListItem *item) const override; + int indexOfTrack(int index) const override; + PlayListTrack *findTrack(int number) const override; + void removeTrack(PlayListTrack *track) override; + void removeTracks(QList<PlayListTrack *> tracks) override; + bool move(QList<int> indexes, int from, int to) override; + QList<PlayListTrack *> takeAllTracks() override; + void clear() override; - void reverseList(); - void randomizeList(); + void reverseList() override; + void randomizeList() override; private: QList<PlayListItem *> m_items; diff --git a/src/qmmpui/playlistdownloader.cpp b/src/qmmpui/playlistdownloader.cpp index 16365e43d..6ea9785ef 100644 --- a/src/qmmpui/playlistdownloader.cpp +++ b/src/qmmpui/playlistdownloader.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/qmmpui/playlistdownloader.h b/src/qmmpui/playlistdownloader.h index 3d5dd46dc..1244dcc74 100644 --- a/src/qmmpui/playlistdownloader.h +++ b/src/qmmpui/playlistdownloader.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2018 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/qmmpui/playlistformat.h b/src/qmmpui/playlistformat.h index 74f4b2bdc..d18e32e7e 100644 --- a/src/qmmpui/playlistformat.h +++ b/src/qmmpui/playlistformat.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 * diff --git a/src/qmmpui/playlistgroup.h b/src/qmmpui/playlistgroup.h index 73dc04137..d797403f6 100644 --- a/src/qmmpui/playlistgroup.h +++ b/src/qmmpui/playlistgroup.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 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 * @@ -46,8 +46,8 @@ public: * Returns formatted title of the group. * @param column Number of column (unused). */ - const QString formattedTitle(int column = 0); - const QStringList formattedTitles(); + const QString formattedTitle(int column = 0) override; + const QStringList formattedTitles() override; /*! * Returns \b true if the group contains track \b track. * Otherwise returns \b false. @@ -69,11 +69,11 @@ public: /*! * Returns formatted length of the item. */ - const QString formattedLength() { return QString(); } + const QString formattedLength() override { return QString(); } /*! * Returns \b true. */ - bool isGroup() const; + bool isGroup() const override; private: QList<PlayListTrack *> trackList; //A list of tracks diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp index fe2e8beae..55040aa52 100644 --- a/src/qmmpui/playlistheadermodel.cpp +++ b/src/qmmpui/playlistheadermodel.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/qmmpui/playlistheadermodel.h b/src/qmmpui/playlistheadermodel.h index 9d1303695..119b267a1 100644 --- a/src/qmmpui/playlistheadermodel.h +++ b/src/qmmpui/playlistheadermodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2018 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/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h index 3599c6269..21403beed 100644 --- a/src/qmmpui/playlistitem.h +++ b/src/qmmpui/playlistitem.h @@ -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/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index a468ce6ca..52028e4d2 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.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/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h index c0a675092..b8df71137 100644 --- a/src/qmmpui/playlistmanager.h +++ b/src/qmmpui/playlistmanager.h @@ -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/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 3883f28ad..801df63cc 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.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/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index 0662aa4a0..1b7ebc68e 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.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 * diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index c30c02ab5..55b2499ae 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.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/qmmpui/playlistparser.h b/src/qmmpui/playlistparser.h index 5952e41cf..d84c69ede 100644 --- a/src/qmmpui/playlistparser.h +++ b/src/qmmpui/playlistparser.h @@ -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/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index 8326af7ac..f3141781e 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2014-2017 by Ilya Kotov * + * Copyright (C) 2014-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/playlisttask_p.h b/src/qmmpui/playlisttask_p.h index c40ed18aa..1b2aaca8d 100644 --- a/src/qmmpui/playlisttask_p.h +++ b/src/qmmpui/playlisttask_p.h @@ -58,7 +58,7 @@ public: void removeDuplicates(QList<PlayListTrack *> tracks, PlayListTrack *current_track); void refresh(QList<PlayListTrack *> tracks, PlayListTrack *current_track); - void run(); + void run() override; TaskType type() const; bool isChanged(PlayListContainer *container); diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp index a6c01cb01..f3bf49d50 100644 --- a/src/qmmpui/playlisttrack.cpp +++ b/src/qmmpui/playlisttrack.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/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h index 775652c0b..2cb0655c1 100644 --- a/src/qmmpui/playlisttrack.h +++ b/src/qmmpui/playlisttrack.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 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 * @@ -61,15 +61,15 @@ public: * Returns formatted title of the item. * @param column Number of column. */ - const QString formattedTitle(int column); + const QString formattedTitle(int column) override; /*! * Returns the list of the formatted titles for all columns. */ - const QStringList formattedTitles(); + const QStringList formattedTitles() override; /*! * Returns formatted length of the item. */ - const QString formattedLength(); + const QString formattedLength() override; /*! * Updates current metadata. * @param info Track information. @@ -86,16 +86,16 @@ public: /*! * Returns \b false. */ - bool isGroup() const; + bool isGroup() const override; /*! * Sets the index of the track. */ - void setTrackIndex(int track_index); + void setTrackIndex(int track_index) override; /*! * Returns the index of the track. * Default implementation returns -1. */ - int trackIndex() const; + int trackIndex() const override; /*! * Prepares for usage. * Increases reference counter. diff --git a/src/qmmpui/playstate_p.h b/src/qmmpui/playstate_p.h index aa546d4bc..22e619875 100644 --- a/src/qmmpui/playstate_p.h +++ b/src/qmmpui/playstate_p.h @@ -77,9 +77,9 @@ protected: class NormalPlayState : public PlayState { public: - virtual bool next(); - virtual bool previous(); - virtual int nextIndex(); + virtual bool next() override; + virtual bool previous() override; + virtual int nextIndex() override; NormalPlayState(PlayListModel* model); }; @@ -90,12 +90,12 @@ public: class ShufflePlayState : public PlayState { public: - virtual bool next(); - virtual bool previous(); - virtual int nextIndex(); - virtual void prepare(); + virtual bool next() override; + virtual bool previous() override; + virtual int nextIndex() override; + virtual void prepare() override; ShufflePlayState(PlayListModel* model); - virtual void resetState(); + virtual void resetState() override; private: /// Current shuffled index. diff --git a/src/qmmpui/pluginitem.cpp b/src/qmmpui/pluginitem.cpp index 611b37f44..f84e2b9db 100644 --- a/src/qmmpui/pluginitem.cpp +++ b/src/qmmpui/pluginitem.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/qmmpui/qmmpui_export.h b/src/qmmpui/qmmpui_export.h index f8f7faadd..e71215ea7 100644 --- a/src/qmmpui/qmmpui_export.h +++ b/src/qmmpui/qmmpui_export.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2017-2018 by Ilya Kotov * + * Copyright (C) 2017-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp index 126dcb650..2ced6521e 100644 --- a/src/qmmpui/qmmpuiplugincache.cpp +++ b/src/qmmpui/qmmpuiplugincache.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 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/qmmpui/qmmpuiplugincache_p.h b/src/qmmpui/qmmpuiplugincache_p.h index e961463db..68b59a775 100644 --- a/src/qmmpui/qmmpuiplugincache_p.h +++ b/src/qmmpui/qmmpuiplugincache_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2018 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/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h index fb137358c..644d74064 100644 --- a/src/qmmpui/qmmpuisettings.h +++ b/src/qmmpui/qmmpuisettings.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2018 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/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp index a4f51846a..44d62d7da 100644 --- a/src/qmmpui/qtfiledialog.cpp +++ b/src/qmmpui/qtfiledialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2017 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/qmmpui/qtfiledialog_p.h b/src/qmmpui/qtfiledialog_p.h index a6f555647..1431bd3af 100644 --- a/src/qmmpui/qtfiledialog_p.h +++ b/src/qmmpui/qtfiledialog_p.h @@ -33,10 +33,10 @@ class QtFileDialogFactory : public QObject, public FileDialogFactory Q_INTERFACES(FileDialogFactory) public: QtFileDialogFactory(){} - FileDialog* create(); - FileDialogProperties properties() const; - void showAbout(QWidget*); - QString translation() const; + FileDialog* create() override; + FileDialogProperties properties() const override; + void showAbout(QWidget*) override; + QString translation() const override; virtual ~QtFileDialogFactory() { ; @@ -51,7 +51,7 @@ public: protected: QStringList exec(QWidget *parent, const QString &dir, Mode mode, const QString &caption, const QString &filter, - QString *selectedFilter); + QString *selectedFilter) override; }; #endif diff --git a/src/qmmpui/radioitemdelegate.cpp b/src/qmmpui/radioitemdelegate.cpp index 2021936e1..bb12ad360 100644 --- a/src/qmmpui/radioitemdelegate.cpp +++ b/src/qmmpui/radioitemdelegate.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2018 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/qmmpui/radioitemdelegate_p.h b/src/qmmpui/radioitemdelegate_p.h index b99e13472..12c14bfab 100644 --- a/src/qmmpui/radioitemdelegate_p.h +++ b/src/qmmpui/radioitemdelegate_p.h @@ -35,10 +35,10 @@ class RadioItemDelegate : public QStyledItemDelegate public: explicit RadioItemDelegate(QObject *parent = nullptr); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index); + const QStyleOptionViewItem &option, const QModelIndex &index) override; bool hasRadioButton(const QModelIndex &index) const; }; diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp index ca4b41ba0..40b1a7499 100644 --- a/src/qmmpui/templateeditor.cpp +++ b/src/qmmpui/templateeditor.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/qmmpui/templateeditor.h b/src/qmmpui/templateeditor.h index 51dc453a0..564bf27cc 100644 --- a/src/qmmpui/templateeditor.h +++ b/src/qmmpui/templateeditor.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2018 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/qmmpui/uifactory.h b/src/qmmpui/uifactory.h index 88a1f9af3..aacab168b 100644 --- a/src/qmmpui/uifactory.h +++ b/src/qmmpui/uifactory.h @@ -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/qmmpui/uihelper.h b/src/qmmpui/uihelper.h index 6594e1adb..ff8521271 100644 --- a/src/qmmpui/uihelper.h +++ b/src/qmmpui/uihelper.h @@ -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/qmmpui/uiloader.cpp b/src/qmmpui/uiloader.cpp index b144e6c40..cca8616a9 100644 --- a/src/qmmpui/uiloader.cpp +++ b/src/qmmpui/uiloader.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/qmmpui/uiloader.h b/src/qmmpui/uiloader.h index bcacdbe05..2ba4ab44c 100644 --- a/src/qmmpui/uiloader.h +++ b/src/qmmpui/uiloader.h @@ -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/qmmpui/winfileassocpage_p.h b/src/qmmpui/winfileassocpage_p.h index 9ba234084..4722d1fce 100644 --- a/src/qmmpui/winfileassocpage_p.h +++ b/src/qmmpui/winfileassocpage_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2014-2018 by Ilya Kotov * + * Copyright (C) 2014-2019 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * |