From 4c9744fe8e0443af2ae4c16bab2ed348d431121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 2 Dec 2014 13:50:26 +0100 Subject: [PATCH] Drop dependency on kdecoration.h --- client.cpp | 1 + client.h | 3 ++- events.cpp | 4 ++++ input.cpp | 3 +++ rules.h | 2 +- tabbox/tabbox.cpp | 1 + useractions.cpp | 2 +- 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client.cpp b/client.cpp index 5ee7bd54ff..8022c7eca0 100644 --- a/client.cpp +++ b/client.cpp @@ -50,6 +50,7 @@ along with this program. If not, see . // Qt #include #include +#include #include #include #include diff --git a/client.h b/client.h index 5230b66a35..cf6dbb1dbe 100644 --- a/client.h +++ b/client.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define KWIN_CLIENT_H // kwin -#include #include "options.h" #include "rules.h" #include "tabgroup.h" @@ -31,6 +30,8 @@ along with this program. If not, see . #include "xcbutils.h" // Qt #include +#include +#include #include #include // X diff --git a/events.cpp b/events.cpp index da854ef2f6..48ab1c9a17 100644 --- a/events.cpp +++ b/events.cpp @@ -48,8 +48,12 @@ along with this program. If not, see . #include #include +#include +#include +#include #include #include +#include #include diff --git a/input.cpp b/input.cpp index 7ff1588076..84c10e92cd 100644 --- a/input.cpp +++ b/input.cpp @@ -32,6 +32,9 @@ along with this program. If not, see . #if HAVE_INPUT #include "libinput/connection.h" #endif +// Qt +#include +#include // KDE #include // TODO: remove xtest diff --git a/rules.h b/rules.h index ff6d9d16f1..eb1a077736 100644 --- a/rules.h +++ b/rules.h @@ -24,10 +24,10 @@ along with this program. If not, see . #include #include +#include #include #include "placement.h" -#include #include "options.h" #include "utils.h" diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp index 3060bd6604..03d47ce354 100644 --- a/tabbox/tabbox.cpp +++ b/tabbox/tabbox.cpp @@ -45,6 +45,7 @@ along with this program. If not, see . // Qt #include #include +#include // KDE #include #include diff --git a/useractions.cpp b/useractions.cpp index 2a3b138382..05b7746e68 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -736,7 +736,7 @@ void UserActionsMenu::slotWindowOperation(QAction *action) helperDialog(type, c); // need to delay performing the window operation as we need to have the // user actions menu closed before we destroy the decoration. Otherwise Qt crashes - qRegisterMetaType(); + qRegisterMetaType(); QMetaObject::invokeMethod(workspace(), "performWindowOperation", Qt::QueuedConnection, Q_ARG(KWin::Client*, c.data()),