From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 4 Sep 2018 22:37:25 +0000 (+0200)
Subject: clang-tidy: Avoid warnings for calling virtual methods from ctor
X-Git-Tag: 0.13-rc2~42
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=03f61d2ab68356bd74f6f014651c823e79678cbd

clang-tidy: Avoid warnings for calling virtual methods from ctor

MessageFilter and its derivatives call their idString() method
during construction in order to access their settings. This is fine,
but causes (legitimate) warnings in static analysis.

Make the scope explicit when calling idString() to avoid the warning,
and make it clear to readers that we're not interested in the derived
version.
---

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index 67a873af..578f340e 100644
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -63,7 +63,7 @@ void MessageFilter::init()
     _messageTypeFilter = defaultSettings.messageFilter();
     defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
 
-    BufferSettings mySettings(idString());
+    BufferSettings mySettings(MessageFilter::idString());
     if (mySettings.hasFilter())
         _messageTypeFilter = mySettings.messageFilter();
     mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
diff --git a/src/client/messagefilter.h b/src/client/messagefilter.h
index 81fa3ff6..61091f14 100644
--- a/src/client/messagefilter.h
+++ b/src/client/messagefilter.h
@@ -40,12 +40,14 @@ protected:
 public:
     MessageFilter(MessageModel *, const QList<BufferId> &buffers = QList<BufferId>(), QObject *parent = 0);
 
-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
     virtual QString idString() const;
-    inline bool isSingleBufferFilter() const { return _validBuffers.count() == 1; }
+
+    bool isSingleBufferFilter() const { return _validBuffers.count() == 1; }
     BufferId singleBufferId() const { return *(_validBuffers.constBegin()); }
-    inline bool containsBuffer(const BufferId &id) const { return _validBuffers.contains(id); }
-    inline QSet<BufferId> containedBuffers() const { return _validBuffers; }
+    bool containsBuffer(const BufferId &id) const { return _validBuffers.contains(id); }
+    QSet<BufferId> containedBuffers() const { return _validBuffers; }
+
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
 public slots:
     void messageTypeFilterChanged();
diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index 45cc6c01..c1dcf138 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -38,7 +38,7 @@ ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
     // and ChatMonitorSettingsPage::defaults() to match
 
     // Chat Monitor specific configuration
-    ChatViewSettings viewSettings(idString());
+    ChatViewSettings viewSettings(ChatMonitorFilter::idString());
     _showFields = viewSettings.value("ShowFields", AllFields).toInt();
     _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
     viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
diff --git a/src/qtui/chatmonitorfilter.h b/src/qtui/chatmonitorfilter.h
index beba9bc0..a3344d02 100644
--- a/src/qtui/chatmonitorfilter.h
+++ b/src/qtui/chatmonitorfilter.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CHATMONITORFILTER_H_
-#define CHATMONITORFILTER_H_
+#pragma once
 
 #include <QDateTime>
 
@@ -79,6 +78,3 @@ private:
     bool _includeRead;
     bool _showSenderBrackets;   /// If true, show brackets around sender names
 };
-
-
-#endif