diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp index d6ba5cfd1c..519d94f8e3 100644 --- a/decorations/decoratedclient.cpp +++ b/decorations/decoratedclient.cpp @@ -93,33 +93,36 @@ DecoratedClientImpl::DecoratedClientImpl(Client *client, KDecoration2::Decorated ); connect(client, &Client::closeableChanged, decoratedClient, &KDecoration2::DecoratedClient::closeableChanged); connect(client, &Client::shadeableChanged, decoratedClient, &KDecoration2::DecoratedClient::shadeableChanged); - connect(client, &Client::minimizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::minimizableChanged); - connect(client, &Client::maximizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::maximizableChanged); + connect(client, &Client::minimizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::minimizeableChanged); + connect(client, &Client::maximizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::maximizeableChanged); } DecoratedClientImpl::~DecoratedClientImpl() = default; -#define DELEGATE(type, name) \ +#define DELEGATE(type, name, clientName) \ type DecoratedClientImpl::name() const \ { \ - return m_client->name(); \ + return m_client->clientName(); \ } -DELEGATE(QString, caption) -DELEGATE(bool, isActive) -DELEGATE(bool, isCloseable) -DELEGATE(bool, isMaximizable) -DELEGATE(bool, isMinimizable) -DELEGATE(bool, isModal) -DELEGATE(bool, isMovable) -DELEGATE(bool, isResizable) -DELEGATE(bool, isShadeable) -DELEGATE(bool, providesContextHelp) -DELEGATE(int, desktop) -DELEGATE(bool, isOnAllDesktops) -DELEGATE(QPalette, palette) -DELEGATE(QIcon, icon) +#define DELEGATE2(type, name) DELEGATE(type, name, name) +DELEGATE2(QString, caption) +DELEGATE2(bool, isActive) +DELEGATE2(bool, isCloseable) +DELEGATE(bool, isMaximizeable, isMaximizable) +DELEGATE(bool, isMinimizeable, isMinimizable) +DELEGATE2(bool, isModal) +DELEGATE(bool, isMoveable, isMovable) +DELEGATE(bool, isResizeable, isResizable) +DELEGATE2(bool, isShadeable) +DELEGATE2(bool, providesContextHelp) +DELEGATE2(int, desktop) +DELEGATE2(bool, isOnAllDesktops) +DELEGATE2(QPalette, palette) +DELEGATE2(QIcon, icon) + +#undef DELEGATE2 #undef DELEGATE #define DELEGATE(type, name, clientName) \ diff --git a/decorations/decoratedclient.h b/decorations/decoratedclient.h index 65951a0e16..7a8b3afee5 100644 --- a/decorations/decoratedclient.h +++ b/decorations/decoratedclient.h @@ -49,15 +49,15 @@ public: bool isCloseable() const override; bool isKeepAbove() const override; bool isKeepBelow() const override; - bool isMaximizable() const override; + bool isMaximizeable() const override; bool isMaximized() const override; bool isMaximizedHorizontally() const override; bool isMaximizedVertically() const override; - bool isMinimizable() const override; + bool isMinimizeable() const override; bool isModal() const override; - bool isMovable() const override; + bool isMoveable() const override; bool isOnAllDesktops() const override; - bool isResizable() const override; + bool isResizeable() const override; bool isShadeable() const override; bool isShaded() const override; QPalette palette() const override;