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

Drop no longer needed XLib includes from KWin

Browse source
This commit is contained in:
Martin Gräßlin 2013-08-20 10:29:20 +02:00
parent e21225fa47
commit 37334f400a
9 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -34,8 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Qt // Qt
#include <QPixmap> #include <QPixmap>
// X // X
#include <X11/Xutil.h>
#include <fixx11h.h>
#include <xcb/sync.h> #include <xcb/sync.h>
// TODO: Cleanup the order of things in this .h file // TODO: Cleanup the order of things in this .h file

4
effects/blur/blur.cpp
View file

@ -23,8 +23,6 @@
// KConfigSkeleton // KConfigSkeleton
#include "blurconfig.h" #include "blurconfig.h"
#include <X11/Xatom.h>
#include <QMatrix4x4> #include <QMatrix4x4>
#include <QLinkedList> #include <QLinkedList>
#include <KDebug> #include <KDebug>
@ -102,7 +100,7 @@ void BlurEffect::updateBlurRegion(EffectWindow *w) const
{ {
QRegion region; QRegion region;
const QByteArray value = w->readProperty(net_wm_blur_region, XA_CARDINAL, 32); const QByteArray value = w->readProperty(net_wm_blur_region, XCB_ATOM_CARDINAL, 32);
if (value.size() > 0 && !(value.size() % (4 * sizeof(unsigned long)))) { if (value.size() > 0 && !(value.size() % (4 * sizeof(unsigned long)))) {
const unsigned long *cardinals = reinterpret_cast<const unsigned long*>(value.constData()); const unsigned long *cardinals = reinterpret_cast<const unsigned long*>(value.constData());
for (unsigned int i = 0; i < value.size() / sizeof(unsigned long);) { for (unsigned int i = 0; i < value.size() / sizeof(unsigned long);) {

6
events.cpp
View file

@ -25,8 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <config-X11.h>
#include "client.h" #include "client.h"
#include "cursor.h" #include "cursor.h"
#include "decorations.h" #include "decorations.h"
@ -53,10 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kkeyserver.h> #include <kkeyserver.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xrandr.h>
#include <X11/Xatom.h>
#include <QX11Info>
#include <xcb/sync.h> #include <xcb/sync.h>
#include <xcb/xcb_icccm.h> #include <xcb/xcb_icccm.h>

2
libkwineffects/kwineffects.cpp
View file

@ -42,8 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <assert.h> #include <assert.h>
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
#include <X11/extensions/Xrender.h>
#include <X11/extensions/Xfixes.h>
#include <xcb/xfixes.h> #include <xcb/xfixes.h>
#endif #endif

2
scene_opengl.cpp
View file

@ -56,8 +56,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// normally only few of them are enabled // normally only few of them are enabled
//#define CHECK_GL_ERROR //#define CHECK_GL_ERROR
#include <X11/extensions/Xcomposite.h>
#include <qpainter.h> #include <qpainter.h>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusConnectionInterface> #include <QDBusConnectionInterface>

1
useractions.cpp
View file

@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KProcess> #include <KDE/KProcess>
#include <KDE/KToolInvocation> #include <KDE/KToolInvocation>
#include <X11/extensions/Xrandr.h>
#ifndef KWIN_NO_XF86VM #ifndef KWIN_NO_XF86VM
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#endif #endif

1
utils.cpp
View file

@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "utils.h" #include "utils.h"
#include <X11/Xatom.h>
#include <QWidget> #include <QWidget>
#ifndef KCMRULES #ifndef KCMRULES

3
utils.h
View file

@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QPoint> #include <QPoint>
#include <QRect> #include <QRect>
#include <QScopedPointer> #include <QScopedPointer>
// X
#include <X11/Xlib.h>
#include <fixx11h.h>
// system // system
#include <limits.h> #include <limits.h>

2
workspace.h
View file

@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Qt // Qt
#include <QTimer> #include <QTimer>
#include <QVector> #include <QVector>
// X
#include <X11/Xlib.h>
// std // std
#include <functional> #include <functional>