diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-12 22:57:13 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-12 22:57:13 +0000 |
| commit | 364641b8e0279758d236af39abd138d379328a19 (patch) | |
| tree | 8cb239129fc2884a53150d212f69d7dbd7c0d8bd | |
| parent | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (diff) | |
| download | tdebase-364641b8e0279758d236af39abd138d379328a19.tar.gz tdebase-364641b8e0279758d236af39abd138d379328a19.zip | |
[kdebase/kwin] avoid a conflict between Qt and X11
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1214094 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kwin/activation.cpp | 8 | ||||
| -rw-r--r-- | kwin/useractions.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kwin/activation.cpp b/kwin/activation.cpp index c0f578634..2cd836555 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -16,16 +16,16 @@ License. See the file "COPYING" for the exact licensing terms. */ -#include "client.h" -#include "workspace.h" - -#include <fixx11h.h> #include <tqpopupmenu.h> #include <kxerrorhandler.h> #include <kstartupinfo.h> #include <kstringhandler.h> #include <klocale.h> +#include "client.h" +#include "workspace.h" +#include <fixx11h.h> + #include "notifications.h" #include "atoms.h" #include "group.h" diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index e825ac846..2821658c2 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -17,10 +17,6 @@ License. See the file "COPYING" for the exact licensing terms. */ -#include "client.h" -#include "workspace.h" - -#include <fixx11h.h> #include <tqhbox.h> #include <tqpushbutton.h> #include <tqslider.h> @@ -34,6 +30,10 @@ License. See the file "COPYING" for the exact licensing terms. #include <kapplication.h> #include <tqregexp.h> +#include "client.h" +#include "workspace.h" +#include <fixx11h.h> + #include "killwindow.h" #include "tabbox.h" |