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

Adjust DecoratedClientImpl to changes in DecoratedClientPrivate

Browse source
This commit is contained in:
Martin Gräßlin 2014-10-23 10:56:43 +02:00
parent c23b3ac0d8
commit 447fed7e37
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
decorations/decoratedclient.cpp
View file

@ -93,33 +93,36 @@ DecoratedClientImpl::DecoratedClientImpl(Client *client, KDecoration2::Decorated
); );
connect(client, &Client::closeableChanged, decoratedClient, &KDecoration2::DecoratedClient::closeableChanged); connect(client, &Client::closeableChanged, decoratedClient, &KDecoration2::DecoratedClient::closeableChanged);
connect(client, &Client::shadeableChanged, decoratedClient, &KDecoration2::DecoratedClient::shadeableChanged); connect(client, &Client::shadeableChanged, decoratedClient, &KDecoration2::DecoratedClient::shadeableChanged);
connect(client, &Client::minimizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::minimizableChanged); connect(client, &Client::minimizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::minimizeableChanged);
connect(client, &Client::maximizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::maximizableChanged); connect(client, &Client::maximizeableChanged, decoratedClient, &KDecoration2::DecoratedClient::maximizeableChanged);
} }
DecoratedClientImpl::~DecoratedClientImpl() = default; DecoratedClientImpl::~DecoratedClientImpl() = default;
#define DELEGATE(type, name) \ #define DELEGATE(type, name, clientName) \
type DecoratedClientImpl::name() const \ type DecoratedClientImpl::name() const \
{ \ { \
return m_client->name(); \ return m_client->clientName(); \
} }
DELEGATE(QString, caption) #define DELEGATE2(type, name) DELEGATE(type, name, name)
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)
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 #undef DELEGATE
#define DELEGATE(type, name, clientName) \ #define DELEGATE(type, name, clientName) \

8
decorations/decoratedclient.h
View file

@ -49,15 +49,15 @@ public:
bool isCloseable() const override; bool isCloseable() const override;
bool isKeepAbove() const override; bool isKeepAbove() const override;
bool isKeepBelow() const override; bool isKeepBelow() const override;
bool isMaximizable() const override; bool isMaximizeable() const override;
bool isMaximized() const override; bool isMaximized() const override;
bool isMaximizedHorizontally() const override; bool isMaximizedHorizontally() const override;
bool isMaximizedVertically() const override; bool isMaximizedVertically() const override;
bool isMinimizable() const override; bool isMinimizeable() const override;
bool isModal() const override; bool isModal() const override;
bool isMovable() const override; bool isMoveable() const override;
bool isOnAllDesktops() const override; bool isOnAllDesktops() const override;
bool isResizable() const override; bool isResizeable() const override;
bool isShadeable() const override; bool isShadeable() const override;
bool isShaded() const override; bool isShaded() const override;
QPalette palette() const override; QPalette palette() const override;