From afd52c188ab0ddb2feda7517200d91dfcd0d12fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= Date: Wed, 2 Aug 2017 07:10:42 +0200 Subject: [PATCH] Drop the stripped parameter from AbstractClient::caption Summary: The parameter is not used anywhere in KWin. Only the default value was used. So let's drop this. Test Plan: Compiles Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D7059 --- abstract_client.h | 2 +- client.cpp | 4 ++-- client.h | 2 +- shell_client.cpp | 3 +-- shell_client.h | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/abstract_client.h b/abstract_client.h index d46e459e22..10e359b50c 100644 --- a/abstract_client.h +++ b/abstract_client.h @@ -343,7 +343,7 @@ public: } virtual void updateMouseGrab(); - virtual QString caption(bool full = true, bool stripped = false) const = 0; + virtual QString caption(bool full = true) const = 0; virtual bool isCloseable() const = 0; // TODO: remove boolean trap virtual bool isShown(bool shaded_is_shown) const = 0; diff --git a/client.cpp b/client.cpp index d3df0e1c08..9a89312550 100644 --- a/client.cpp +++ b/client.cpp @@ -1527,9 +1527,9 @@ void Client::fetchIconicName() /** * \reimp */ -QString Client::caption(bool full, bool stripped) const +QString Client::caption(bool full) const { - QString cap = stripped ? cap_deco : cap_normal; + QString cap = cap_normal; if (full) { cap += cap_suffix; if (unresponsive()) { diff --git a/client.h b/client.h index 1c4f6a9737..e3ed7173f2 100644 --- a/client.h +++ b/client.h @@ -219,7 +219,7 @@ public: void setBlockingCompositing(bool block); inline bool isBlockingCompositing() { return blocks_compositing; } - QString caption(bool full = true, bool stripped = false) const override; + QString caption(bool full = true) const override; using AbstractClient::keyPressEvent; void keyPressEvent(uint key_code, xcb_timestamp_t time); // FRAME ?? diff --git a/shell_client.cpp b/shell_client.cpp index 2e0d318e4c..f5fab5338d 100644 --- a/shell_client.cpp +++ b/shell_client.cpp @@ -554,10 +554,9 @@ void ShellClient::blockActivityUpdates(bool b) Q_UNUSED(b) } -QString ShellClient::caption(bool full, bool stripped) const +QString ShellClient::caption(bool full) const { Q_UNUSED(full) - Q_UNUSED(stripped) return m_caption; } diff --git a/shell_client.h b/shell_client.h index 2afb4b6fe3..f4fc852319 100644 --- a/shell_client.h +++ b/shell_client.h @@ -63,7 +63,7 @@ public: } void blockActivityUpdates(bool b = true) override; - QString caption(bool full = true, bool stripped = false) const override; + QString caption(bool full = true) const override; void closeWindow() override; AbstractClient *findModal(bool allow_itself = false) override; bool isCloseable() const override;