From 2b531227a8d0f30d2a63e3fc14383026bb7e5fef Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 4 Feb 2020 15:18:26 +0100 Subject: [PATCH] modernize: use override --- src/Splitter.h | 2 +- src/TrayIcon.h | 8 ++++---- src/dialogs/ReadReceipts.h | 2 +- src/dialogs/RoomSettings.h | 2 +- src/emoji/ItemDelegate.h | 2 +- src/install-debian.txt | 24 ------------------------ src/ui/FlatButton.h | 4 ++-- src/ui/LoadingIndicator.h | 2 +- src/ui/RaisedButton.h | 2 +- src/ui/TextLabel.h | 2 +- 10 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 src/install-debian.txt diff --git a/src/Splitter.h b/src/Splitter.h index 36c9f4fb..7bde89de 100644 --- a/src/Splitter.h +++ b/src/Splitter.h @@ -37,7 +37,7 @@ class Splitter : public QSplitter Q_OBJECT public: explicit Splitter(QWidget *parent = nullptr); - ~Splitter(); + ~Splitter() override; void restoreSizes(int fallback); diff --git a/src/TrayIcon.h b/src/TrayIcon.h index 6cb26b87..24ac81da 100644 --- a/src/TrayIcon.h +++ b/src/TrayIcon.h @@ -30,10 +30,10 @@ class MsgCountComposedIcon : public QIconEngine public: MsgCountComposedIcon(const QString &filename); - virtual void paint(QPainter *p, const QRect &rect, QIcon::Mode mode, QIcon::State state); - virtual QIconEngine *clone() const; - virtual QList availableSizes(QIcon::Mode mode, QIcon::State state) const; - virtual QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state); + void paint(QPainter *p, const QRect &rect, QIcon::Mode mode, QIcon::State state) override; + QIconEngine *clone() const override; + QList availableSizes(QIcon::Mode mode, QIcon::State state) const override; + QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; int msgCount = 0; diff --git a/src/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h index 8e1b6b75..e298af0a 100644 --- a/src/dialogs/ReadReceipts.h +++ b/src/dialogs/ReadReceipts.h @@ -22,7 +22,7 @@ public: const QString &room_id); protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; private: QString dateFormat(const QDateTime &then) const; diff --git a/src/dialogs/RoomSettings.h b/src/dialogs/RoomSettings.h index d870c9f2..e41c866c 100644 --- a/src/dialogs/RoomSettings.h +++ b/src/dialogs/RoomSettings.h @@ -35,7 +35,7 @@ signals: void clicked(); protected: - bool eventFilter(QObject *obj, QEvent *event) + bool eventFilter(QObject *obj, QEvent *event) override { if (event->type() == QEvent::MouseButtonRelease) { emit clicked(); diff --git a/src/emoji/ItemDelegate.h b/src/emoji/ItemDelegate.h index e0456308..d6b9b9d7 100644 --- a/src/emoji/ItemDelegate.h +++ b/src/emoji/ItemDelegate.h @@ -31,7 +31,7 @@ class ItemDelegate : public QStyledItemDelegate public: explicit ItemDelegate(QObject *parent = nullptr); - ~ItemDelegate(); + ~ItemDelegate() override; void paint(QPainter *painter, const QStyleOptionViewItem &option, diff --git a/src/install-debian.txt b/src/install-debian.txt deleted file mode 100644 index 68387665..00000000 --- a/src/install-debian.txt +++ /dev/null @@ -1,24 +0,0 @@ -sudo apt install cmake -sudo apt install gcc make automake -sudo apt install qt5-default -sudo apt install liblmdb-dev -sudo apt install qttools5-dev-tools -sudo apt install qttools5-dev-tools -sudo apt install qttools5 -sudo apt install qt5-qmltooling-plugins qml-module-qtgstreamer -sudo apt install libqt5webview5-dev -sudo apt install libqt5quickcontrols2-5 -sudo apt install qtquickcontrols2-5-dev -sudo apt install libssl-dev -sudo apt install qml-module-qtgraphicaleffects -sudo apt install qml-module-qtquick-controls2 -sudo apt install qml-module-qtquick-layouts -sudo apt install qml-module-qtmultimedia -sudo apt install qml-module-qt-labs-settings qml-module-qt-labs-sharedimage -sudo apt install qttools5-dev -sudo apt install libqt5svg5-dev -sudo apt install qt5multimedia -sudo apt install libqt5multimedia5 -sudo apt install libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5multimediawidgets5 -sudo apt install qt5ct -sudo apt install qtmultimedia5-dev diff --git a/src/ui/FlatButton.h b/src/ui/FlatButton.h index 764df6e9..3749a0d9 100644 --- a/src/ui/FlatButton.h +++ b/src/ui/FlatButton.h @@ -18,7 +18,7 @@ class FlatButtonStateMachine : public QStateMachine public: explicit FlatButtonStateMachine(FlatButton *parent); - ~FlatButtonStateMachine(); + ~FlatButtonStateMachine() override; void setOverlayOpacity(qreal opacity); void setCheckedOverlayProgress(qreal opacity); @@ -100,7 +100,7 @@ public: ui::Role role, QWidget *parent = nullptr, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset); - ~FlatButton(); + ~FlatButton() override; void applyPreset(ui::ButtonPreset preset); diff --git a/src/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h index e72a8c48..678ef611 100644 --- a/src/ui/LoadingIndicator.h +++ b/src/ui/LoadingIndicator.h @@ -14,7 +14,7 @@ class LoadingIndicator : public QWidget public: LoadingIndicator(QWidget *parent = nullptr); - void paintEvent(QPaintEvent *e); + void paintEvent(QPaintEvent *e) override; void start(); void stop(); diff --git a/src/ui/RaisedButton.h b/src/ui/RaisedButton.h index 74543262..47ef1acd 100644 --- a/src/ui/RaisedButton.h +++ b/src/ui/RaisedButton.h @@ -13,7 +13,7 @@ class RaisedButton : public FlatButton public: explicit RaisedButton(QWidget *parent = nullptr); explicit RaisedButton(const QString &text, QWidget *parent = nullptr); - ~RaisedButton(); + ~RaisedButton() override; protected: bool event(QEvent *event) override; diff --git a/src/ui/TextLabel.h b/src/ui/TextLabel.h index 1470d64e..56778dcc 100644 --- a/src/ui/TextLabel.h +++ b/src/ui/TextLabel.h @@ -22,7 +22,7 @@ signals: void contextMenuIsOpening(); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; }; class TextLabel : public QTextBrowser