From de04ff82a730b291596c7ee1677ca6fae8bd2489 Mon Sep 17 00:00:00 2001 From: Vilgot Fredenberg Date: Sun, 4 Oct 2020 12:47:23 +0200 Subject: [PATCH] Clean up compiler warnings (#2027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following compiler warning ../src/common/NetworkResult.hpp: In constructor ‘chatterino::NetworkResult::NetworkResult(const QByteArray&, int)’: ../src/common/NetworkResult.hpp:28:16: warning: ‘chatterino::NetworkResult::data_’ will be initialized after [-Wreorder] 28 | QByteArray data_; | ^~~~~ ../src/common/NetworkResult.hpp:27:9: warning: ‘int chatterino::NetworkResult::status_’ [-Wreorder] 27 | int status_; | ^~~~~~~ ../src/common/NetworkResult.cpp:9:1: warning: when initialized here [-Wreorder] 9 | NetworkResult::NetworkResult(const QByteArray &data, int status) * Clang compiler warnings Fixes every instance of the following error: In file included from ../src/widgets/settingspages/CommandPage.cpp:12: In file included from ../src/controllers/commands/CommandModel.hpp:5: ../src/common/SignalVectorModel.hpp:242:10: warning: 'moveRows' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, ^ ../src/controllers/commands/CommandModel.hpp:12:29: note: in instantiation of template class 'chatterino::SignalVectorModel' requested here class CommandModel : public SignalVectorModel --- src/common/NetworkResult.hpp | 2 +- src/common/SignalVectorModel.hpp | 5 +++-- src/providers/twitch/TwitchMessageBuilder.hpp | 2 +- src/widgets/dialogs/switcher/NewTabItem.hpp | 4 ++-- src/widgets/dialogs/switcher/SwitchSplitItem.hpp | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/common/NetworkResult.hpp b/src/common/NetworkResult.hpp index 4fcc13b3..a0dae545 100644 --- a/src/common/NetworkResult.hpp +++ b/src/common/NetworkResult.hpp @@ -24,8 +24,8 @@ public: static constexpr int timedoutStatus = -2; private: - int status_; QByteArray data_; + int status_; }; } // namespace chatterino diff --git a/src/common/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp index 8f670545..a122a2e6 100644 --- a/src/common/SignalVectorModel.hpp +++ b/src/common/SignalVectorModel.hpp @@ -240,7 +240,8 @@ public: } bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, - const QModelIndex &destinationParent, int destinationChild) + const QModelIndex &destinationParent, + int destinationChild) override { if (count != 1) { @@ -287,7 +288,7 @@ public: return {"chatterino_row_id"}; } - QMimeData *mimeData(const QModelIndexList &list) const + QMimeData *mimeData(const QModelIndexList &list) const override { if (list.length() == 1) { diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp index 0da21344..6df45fed 100644 --- a/src/providers/twitch/TwitchMessageBuilder.hpp +++ b/src/providers/twitch/TwitchMessageBuilder.hpp @@ -66,7 +66,7 @@ private: void appendTwitchEmote(const QString &emote, std::vector &vec, std::vector &correctPositions); - Outcome tryAppendEmote(const EmoteName &name); + Outcome tryAppendEmote(const EmoteName &name) override; void addWords(const QStringList &words, const std::vector &twitchEmotes); diff --git a/src/widgets/dialogs/switcher/NewTabItem.hpp b/src/widgets/dialogs/switcher/NewTabItem.hpp index 152105ad..a527201b 100644 --- a/src/widgets/dialogs/switcher/NewTabItem.hpp +++ b/src/widgets/dialogs/switcher/NewTabItem.hpp @@ -20,8 +20,8 @@ public: */ virtual void action() override; - virtual void paint(QPainter *painter, const QRect &rect) const; - virtual QSize sizeHint(const QRect &rect) const; + virtual void paint(QPainter *painter, const QRect &rect) const override; + virtual QSize sizeHint(const QRect &rect) const override; private: static constexpr const char *TEXT_FORMAT = "Open channel \"%1\" in new tab"; diff --git a/src/widgets/dialogs/switcher/SwitchSplitItem.hpp b/src/widgets/dialogs/switcher/SwitchSplitItem.hpp index 22e653a7..abcf119a 100644 --- a/src/widgets/dialogs/switcher/SwitchSplitItem.hpp +++ b/src/widgets/dialogs/switcher/SwitchSplitItem.hpp @@ -18,8 +18,8 @@ public: virtual void action() override; - virtual void paint(QPainter *painter, const QRect &rect) const; - virtual QSize sizeHint(const QRect &rect) const; + virtual void paint(QPainter *painter, const QRect &rect) const override; + virtual QSize sizeHint(const QRect &rect) const override; private: Split *split_{};