From f2162a1005328a4921367cc52b767f7629944330 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Wed, 4 Sep 2019 10:29:40 +0200 Subject: [PATCH] Qt: fix compilation for enabled_protocols_model. clang complains, gcc doesn't. Error: In file included from ../ui/qt/enabled_protocols_dialog.cpp:10: In file included from ../ui/qt/enabled_protocols_dialog.h:15: ../ui/qt/models/enabled_protocols_model.h:121:18: error: 'filterAcceptsRow' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; Change-Id: Ifbba736158a841752da27349925a3b55556728ca Reviewed-on: https://code.wireshark.org/review/34447 Petri-Dish: Dario Lombardo Reviewed-by: Alexis La Goutte --- ui/qt/models/enabled_protocols_model.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/qt/models/enabled_protocols_model.h b/ui/qt/models/enabled_protocols_model.h index f1dd386c17..d43584b8ba 100644 --- a/ui/qt/models/enabled_protocols_model.h +++ b/ui/qt/models/enabled_protocols_model.h @@ -118,7 +118,7 @@ public: explicit EnabledProtocolsProxyModel(QObject * parent = Q_NULLPTR); - virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; virtual Qt::ItemFlags flags(const QModelIndex &index) const override; void setFilter(const QString& filter, EnabledProtocolsProxyModel::SearchType type, @@ -127,7 +127,7 @@ public: void setItemsEnable(EnabledProtocolsProxyModel::EnableType enable, QModelIndex parent = QModelIndex()); protected: - bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const; + bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override; private: EnabledProtocolsProxyModel::SearchType type_;