From f841a9e4622388bbb3f5312ef64fe69f61ef3b9a Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 17 Jun 2019 09:42:12 +0200
Subject: [PATCH] Avoid overloading superclass method

IOutputPane has an updateFilter method now, so rename the one in the
TODO output pane.

Change-Id: I0e6291372c83373b82d0d9911feffe032df8af5e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/todo/todooutputpane.cpp | 10 +++++-----
 src/plugins/todo/todooutputpane.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp
index 8abab12696d..9f8a528124a 100644
--- a/src/plugins/todo/todooutputpane.cpp
+++ b/src/plugins/todo/todooutputpane.cpp
@@ -91,7 +91,7 @@ int TodoOutputPane::priorityInStatusBar() const
 
 void TodoOutputPane::clearContents()
 {
-    clearFilter();
+    clearKeywordFilter();
 }
 
 void TodoOutputPane::visibilityChanged(bool visible)
@@ -190,7 +190,7 @@ void TodoOutputPane::updateTodoCount()
     emit setBadgeNumber(m_todoTreeView->model()->rowCount());
 }
 
-void TodoOutputPane::updateFilter()
+void TodoOutputPane::updateKeywordFilter()
 {
     QStringList keywords;
     for (const QToolButton *btn: qAsConst(m_filterButtons)) {
@@ -208,12 +208,12 @@ void TodoOutputPane::updateFilter()
     updateTodoCount();
 }
 
-void TodoOutputPane::clearFilter()
+void TodoOutputPane::clearKeywordFilter()
 {
     for (QToolButton *btn: qAsConst(m_filterButtons))
         btn->setChecked(false);
 
-    updateFilter();
+    updateKeywordFilter();
 }
 
 void TodoOutputPane::createTreeView()
@@ -282,7 +282,7 @@ void TodoOutputPane::createScopeButtons()
         QToolButton *button = createCheckableToolButton(keyword.name, tooltip.arg(keyword.name), toolBarIcon(keyword.iconType));
         button->setProperty(Constants::FILTER_KEYWORD_NAME, keyword.name);
         button->setToolButtonStyle(Qt::ToolButtonIconOnly);
-        connect(button, &QToolButton::clicked, this, &TodoOutputPane::updateFilter);
+        connect(button, &QToolButton::clicked, this, &TodoOutputPane::updateKeywordFilter);
 
         m_filterButtons.append(button);
     }
diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h
index 0c99d0a04af..78b0aff45d4 100644
--- a/src/plugins/todo/todooutputpane.h
+++ b/src/plugins/todo/todooutputpane.h
@@ -80,8 +80,8 @@ private:
     void scopeButtonClicked(QAbstractButton *button);
     void todoTreeViewClicked(const QModelIndex &index);
     void updateTodoCount();
-    void updateFilter();
-    void clearFilter();
+    void updateKeywordFilter();
+    void clearKeywordFilter();
 
     void createTreeView();
     void freeTreeView();