yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make AbstractClient::caption no longer a virtual method

Browse source 
Summary:
The implementation can now be shared, it doesn't differ anymore between
X11 (Client) and Wayland (ShellClient). So instead of code duplication a
shared implementation in AbstractClient.

Test Plan: X11 and ShellClient tests still pass

Reviewers: #kwin, #plasma

Subscribers: plasma-devel, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D7426
This commit is contained in:
Martin Flöser 2017-08-20 09:24:10 +02:00
parent 6685288d48
commit a7b29e09ce
6 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
abstract_client.cpp
View file

@ -1766,4 +1766,17 @@ AbstractClient *AbstractClient::findClientWithSameCaption() const
return workspace()->findAbstractClient(fetchNameInternalPredicate); return workspace()->findAbstractClient(fetchNameInternalPredicate);
} }
QString AbstractClient::caption(bool full) const
{
QString cap = captionNormal();
if (full) {
cap += captionSuffix();
if (unresponsive()) {
cap += QLatin1String(" ");
cap += i18nc("Application is not responding, appended to window title", "(Not Responding)");
}
}
return cap;
}
} }

2
abstract_client.h
View file

@ -348,7 +348,7 @@ public:
* @see captionNormal * @see captionNormal
* @see captionSuffix * @see captionSuffix
**/ **/
virtual QString caption(bool full = true) const = 0; QString caption(bool full = true) const;
/** /**
* @returns The caption as set by the AbstractClient without any suffix. * @returns The caption as set by the AbstractClient without any suffix.
* @see caption * @see caption

16
client.cpp
View file

@ -1513,22 +1513,6 @@ void Client::fetchIconicName()
} }
} }
/**
* \reimp
*/
QString Client::caption(bool full) const
{
QString cap = cap_normal;
if (full) {
cap += cap_suffix;
if (unresponsive()) {
cap += QLatin1String(" ");
cap += i18nc("Application is not responding, appended to window title", "(Not Responding)");
}
}
return cap;
}
bool Client::tabTo(Client *other, bool behind, bool activate) bool Client::tabTo(Client *other, bool behind, bool activate)
{ {
Q_ASSERT(other && other != this); Q_ASSERT(other && other != this);

1
client.h
View file

@ -219,7 +219,6 @@ public:
void setBlockingCompositing(bool block); void setBlockingCompositing(bool block);
inline bool isBlockingCompositing() { return blocks_compositing; } inline bool isBlockingCompositing() { return blocks_compositing; }
QString caption(bool full = true) const override;
QString captionNormal() const override { QString captionNormal() const override {
return cap_normal; return cap_normal;
} }

9
shell_client.cpp
View file

@ -566,15 +566,6 @@ void ShellClient::blockActivityUpdates(bool b)
Q_UNUSED(b) Q_UNUSED(b)
} }
QString ShellClient::caption(bool full) const
{
QString caption = m_caption;
if (full) {
caption += m_captionSuffix;
}
return caption;
}
void ShellClient::updateCaption() void ShellClient::updateCaption()
{ {
const QString oldSuffix = m_captionSuffix; const QString oldSuffix = m_captionSuffix;

1
shell_client.h
View file

@ -63,7 +63,6 @@ public:
} }
void blockActivityUpdates(bool b = true) override; void blockActivityUpdates(bool b = true) override;
QString caption(bool full = true) const override;
QString captionNormal() const override { QString captionNormal() const override {
return m_caption; return m_caption;
} }