Strip module path from all Qt #include <>

Done with: fixqt4headers.pl --strip-modules REVIEW: 109176
2013-02-26 09:00:51 +01:00 · 2013-02-26 09:00:51 +01:00 · 32b6ef42b9
parent b01f5684c5
commit 32b6ef42b9
83 changed files with 137 additions and 137 deletions
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeItem>
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>

 #include <KConfig>
 #include <KConfigGroup>
--- a/clients/aurorae/src/lib/auroraetheme.cpp
+++ b/clients/aurorae/src/lib/auroraetheme.cpp
@ -21,7 +21,7 @@
 #include "auroraetheme.h"
 #include "themeconfig.h"
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 // KDE
 #include <KDE/KConfig>
 #include <KDE/KConfigGroup>
--- a/clients/aurorae/src/lib/auroraetheme.h
+++ b/clients/aurorae/src/lib/auroraetheme.h
@ -23,7 +23,7 @@

 // #include "libaurorae_export.h"

-#include <QtCore/QObject>
+#include <QObject>
 #include <kdecoration.h>

 class KConfig;
--- a/clients/oxygen/config/oxygenanimationconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
@ -29,9 +29,9 @@
 #include "oxygenanimationconfigitem.h"
 #include "oxygengenericanimationconfigitem.h"

-#include <QtGui/QButtonGroup>
+#include <QButtonGroup>
 #include <QtGui/QHoverEvent>
-#include <QtCore/QTextStream>
+#include <QTextStream>
 #include <KLocale>

 namespace Oxygen
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@ -35,7 +35,7 @@
 #include "oxygenutil.h"
 #include "../oxygenexceptionlist.h"

-#include <QtCore/QTextStream>
+#include <QTextStream>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>

--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@ -28,9 +28,9 @@

 #include <kdeversion.h>

-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QGroupBox>
 #include <KLocale>
 #include <KTabWidget>

--- a/clients/oxygen/config/oxygenconfigwidget.h
+++ b/clients/oxygen/config/oxygenconfigwidget.h
@ -31,9 +31,9 @@
 #include "../oxygendecorationdefines.h"

 #include <KComboBox>
-#include <QtGui/QWidget>
-#include <QtGui/QCheckBox>
-#include <QtCore/QVector>
+#include <QWidget>
+#include <QCheckBox>
+#include <QVector>

 namespace Oxygen
 {
--- a/clients/oxygen/config/oxygendetectwidget.cpp
+++ b/clients/oxygen/config/oxygendetectwidget.cpp
@ -31,9 +31,9 @@
 #include "oxygendetectwidget.moc"

 #include <cassert>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QLayout>
-#include <QtGui/QGroupBox>
+#include <QButtonGroup>
+#include <QLayout>
+#include <QGroupBox>
 #include <QtGui/QMouseEvent>
 #include <KLocale>

--- a/clients/oxygen/config/oxygendetectwidget.h
+++ b/clients/oxygen/config/oxygendetectwidget.h
@ -34,10 +34,10 @@
 #include "ui_oxygendetectwidget.h"

 #include <KDialog>
-#include <QtCore/QEvent>
-#include <QtCore/QByteArray>
-#include <QtGui/QCheckBox>
-#include <QtGui/QLabel>
+#include <QEvent>
+#include <QByteArray>
+#include <QCheckBox>
+#include <QLabel>

 #include <kwindowsystem.h>

--- a/clients/oxygen/config/oxygenexceptiondialog.h
+++ b/clients/oxygen/config/oxygenexceptiondialog.h
@ -31,8 +31,8 @@
 #include <KDialog>
 #include <KLineEdit>
 #include <KComboBox>
-#include <QtGui/QCheckBox>
-#include <QtCore/QMap>
+#include <QCheckBox>
+#include <QMap>

 namespace Oxygen
 {
--- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp
+++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
@ -27,7 +27,7 @@
 #include "oxygenexceptionlistwidget.moc"
 #include "oxygenexceptiondialog.h"

-#include <QtCore/QPointer>
+#include <QPointer>
 #include <KLocale>
 #include <KMessageBox>

--- a/clients/oxygen/demo/oxygenshadowdemodialog.cpp
+++ b/clients/oxygen/demo/oxygenshadowdemodialog.cpp
@ -27,7 +27,7 @@
 #include "oxygenshadowdemodialog.h"
 #include "oxygenshadowdemodialog.moc"

-#include <QtGui/QDialogButtonBox>
+#include <QDialogButtonBox>
 #include <QtDBus/QDBusConnection>

 #include <KPushButton>
--- a/clients/oxygen/demo/oxygenshadowdemodialog.h
+++ b/clients/oxygen/demo/oxygenshadowdemodialog.h
@ -32,7 +32,7 @@
 #include "oxygenshadowcache.h"

 #include <KDialog>
-#include <QtGui/QCheckBox>
+#include <QCheckBox>

 namespace Oxygen
 {
--- a/clients/oxygen/demo/oxygenshadowdemowidget.h
+++ b/clients/oxygen/demo/oxygenshadowdemowidget.h
@ -30,7 +30,7 @@
 #include "oxygentileset.h"
 #include "oxygenhelper.h"

-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QPixmap>
 #include <cassert>
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@ -39,12 +39,12 @@
 #include <KDebug>
 #include <KStyle>

-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
+#include <QApplication>
+#include <QLabel>
 #include <QtGui/QPainter>
 #include <QtGui/QBitmap>
 #include <QtGui/QX11Info>
-#include <QtCore/QObjectList>
+#include <QObjectList>

 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@ -37,9 +37,9 @@
 #include "oxygentitleanimationdata.h"

 #include <kcommondecoration.h>
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimerEvent>
+#include <QBasicTimer>
+#include <QTextStream>
+#include <QTimerEvent>

 #include <X11/Xdefs.h>

--- a/clients/oxygen/oxygenclientgroupitemdata.h
+++ b/clients/oxygen/oxygenclientgroupitemdata.h
@ -30,9 +30,9 @@
 #include "oxygenbutton.h"
 #include "oxygenanimation.h"

-#include <QtCore/QList>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QRect>
+#include <QList>
+#include <QWeakPointer>
+#include <QRect>

 namespace Oxygen
 {
--- a/clients/oxygen/oxygendecorationdefines.h
+++ b/clients/oxygen/oxygendecorationdefines.h
@ -27,8 +27,8 @@

 #include "oxygenconfiguration.h"

-#include <QtCore/QSharedPointer>
-#include <QtCore/QList>
+#include <QSharedPointer>
+#include <QList>

 namespace Oxygen
 {
--- a/clients/oxygen/oxygenexceptionlist.cpp
+++ b/clients/oxygen/oxygenexceptionlist.cpp
@ -27,7 +27,7 @@
 #include "oxygenexceptionlist.h"
 #include "oxygenutil.h"

-#include <QtCore/QTextStream>
+#include <QTextStream>

 namespace Oxygen
 {
--- a/clients/oxygen/oxygenfactory.h
+++ b/clients/oxygen/oxygenfactory.h
@ -32,7 +32,7 @@
 #include "oxygendecohelper.h"
 #include "oxygenshadowcache.h"

-#include <QtCore/QObject>
+#include <QObject>
 #include <kdecorationfactory.h>
 #include <kdeversion.h>

--- a/clients/oxygen/oxygensizegrip.cpp
+++ b/clients/oxygen/oxygensizegrip.cpp
@ -32,7 +32,7 @@
 #include <cassert>
 #include <QtGui/QPainter>
 #include <QtGui/QPolygon>
-#include <QtCore/QTimer>
+#include <QTimer>

 #include <QtGui/QX11Info>
 #include <X11/Xlib.h>
--- a/clients/oxygen/oxygensizegrip.h
+++ b/clients/oxygen/oxygensizegrip.h
@ -27,7 +27,7 @@
 // IN THE SOFTWARE.
 //////////////////////////////////////////////////////////////////////////////

-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QMouseEvent>

--- a/clients/oxygen/oxygentitleanimationdata.h
+++ b/clients/oxygen/oxygentitleanimationdata.h
@ -30,10 +30,10 @@
 #include "oxygenanimation.h"

 #include <cassert>
-#include <QtCore/QObject>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTimerEvent>
+#include <QObject>
+#include <QWeakPointer>
+#include <QBasicTimer>
+#include <QTimerEvent>
 #include <QtGui/QPixmap>


--- a/composite.cpp
+++ b/composite.cpp
@ -41,8 +41,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <stdio.h>

-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QFutureWatcher>
+#include <QtConcurrentRun>
+#include <QFutureWatcher>
 #include <QMenu>
 #include <QTimerEvent>
 #include <QDateTime>
--- a/composite.h
+++ b/composite.h
@ -22,10 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_COMPOSITE_H
 #define KWIN_COMPOSITE_H

-#include <QtCore/QObject>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QTimer>
-#include <QtCore/QBasicTimer>
+#include <QObject>
+#include <QElapsedTimer>
+#include <QTimer>
+#include <QBasicTimer>
 #include <QRegion>

 class KSelectionOwner;
--- a/dbusinterface.h
+++ b/dbusinterface.h
@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_DBUS_INTERFACE_H
 #define KWIN_DBUS_INTERFACE_H

-#include <QtCore/QObject>
+#include <QObject>
 #include <QtDBus/QtDBus>
 class QByteArray;
 template<class T> class QList;
--- a/effects.cpp
+++ b/effects.cpp
@ -44,8 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwinglutils.h"

 #include <QFile>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QtConcurrentRun>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
 #include <QDBusServiceWatcher>
 #include <QDBusPendingCallWatcher>

--- a/effects/dashboard/dashboard.h
+++ b/effects/dashboard/dashboard.h
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_DASHBOARD_H

 #include <kwineffects.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QGraphicsView>
 #include <QGraphicsItem>
 #include <Plasma/WindowEffects>
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMouseEvent>
 #include <kglobalsettings.h>
 #include <QtGui/QPainter>
-#include <QtGui/QGraphicsLinearLayout>
+#include <QGraphicsLinearLayout>
 #include <QtGui/QVector2D>
 #include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
--- a/effects/desktopgrid/desktopgrid.h
+++ b/effects/desktopgrid/desktopgrid.h
@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 #include <kshortcut.h>
 #include <QObject>
-#include <QtCore/QTimeLine>
-#include <QtGui/QGraphicsView>
+#include <QTimeLine>
+#include <QGraphicsView>

 namespace Plasma
 {
--- a/effects/diminactive/diminactive.h
+++ b/effects/diminactive/diminactive.h
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 // Include with base class for effects.
 #include <kwineffects.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>


 namespace KWin
--- a/effects/dimscreen/dimscreen.h
+++ b/effects/dimscreen/dimscreen.h
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_DIMSCREEN_H

 #include <kwineffects.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 namespace KWin
 {
--- a/effects/glide/glide.cpp
+++ b/effects/glide/glide.cpp
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KConfigSkeleton
 #include "glideconfig.h"

-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 // Effect is based on fade effect by Philip Falkner

--- a/effects/magiclamp/magiclamp.cpp
+++ b/effects/magiclamp/magiclamp.cpp
@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <kwinconfig.h>
 #include <kconfiggroup.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QtDebug>

 namespace KWin
--- a/effects/minimizeanimation/minimizeanimation.cpp
+++ b/effects/minimizeanimation/minimizeanimation.cpp
@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/

 #include "minimizeanimation.h"
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QtGui/QVector2D>

 namespace KWin
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <QMouseEvent>
 #include <QtGui/QPainter>
-#include <QtGui/QGraphicsLinearLayout>
+#include <QGraphicsLinearLayout>
 #include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
 #include <Plasma/Theme>
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <kwineffects.h>
 #include <kshortcut.h>
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>

 class QTimer;
 namespace Plasma
--- a/effects/scalein/scalein.cpp
+++ b/effects/scalein/scalein.cpp
@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/

 #include "scalein.h"
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QtGui/QVector2D>

 namespace KWin
--- a/effects/screenshot/screenshot.cpp
+++ b/effects/screenshot/screenshot.cpp
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDE/KDebug>
 #include <KDE/KTemporaryFile>
 #include <QtDBus/QDBusConnection>
-#include <QtCore/QVarLengthArray>
+#include <QVarLengthArray>
 #include <QtGui/QPainter>
 #include <QMatrix4x4>
 #include <xcb/xcb_image.h>
--- a/effects/sheet/sheet.cpp
+++ b/effects/sheet/sheet.cpp
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sheet.h"

 #include <kconfiggroup.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QGraphicsRotation>
 #include <QVector3D>

--- a/effects/showfps/showfps.h
+++ b/effects/showfps/showfps.h
@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SHOWFPS_H
 #define KWIN_SHOWFPS_H

-#include <QtCore/QTime>
+#include <QTime>

 #include <kwineffects.h>

--- a/effects/slide/slide.h
+++ b/effects/slide/slide.h
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <kwineffects.h>
 #include <QObject>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 namespace KWin
 {
--- a/effects/slidingpopups/slidingpopups.cpp
+++ b/effects/slidingpopups/slidingpopups.cpp
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <kdebug.h>
 #include <KDE/KConfigGroup>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 namespace KWin
 {
--- a/effects/snaphelper/snaphelper.h
+++ b/effects/snaphelper/snaphelper.h
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_SNAPHELPER_H

 #include <kwineffects.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 namespace KWin
 {
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "startupfeedback.h"
 // Qt
-#include <QtCore/QSize>
+#include <QSize>
 #include <QtGui/QPainter>
 // KDE
 #include <KDE/KConfigGroup>
--- a/effects/translucency/translucency.h
+++ b/effects/translucency/translucency.h
@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_TRANSLUCENCY_H

 #include <kwineffects.h>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>

 namespace KWin
 {
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KConfigSkeleton
 #include "zoomconfig.h"

-#include <QtGui/QApplication>
-#include <QtGui/QStyle>
+#include <QApplication>
+#include <QStyle>
 #include <QtGui/QVector2D>
 #include <QtDBus/QDBusConnection>
 #include <kaction.h>
--- a/effects/zoom/zoom.h
+++ b/effects/zoom/zoom.h
@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_ZOOM_H

 #include <kwineffects.h>
-#include <QtCore/QTime>
-#include <QtCore/QTimeLine>
+#include <QTime>
+#include <QTimeLine>

 namespace KWin
 {
--- a/events.cpp
+++ b/events.cpp
@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <QWhatsThis>
 #include <QApplication>
-#include <QtGui/QDesktopWidget>
+#include <QDesktopWidget>

 #include <kkeyserver.h>

--- a/geometry.cpp
+++ b/geometry.cpp
@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef KWIN_BUILD_SCREENEDGES
 #include "screenedge.h"
 #endif
-#include <QtGui/QDesktopWidget>
+#include <QDesktopWidget>
 #include <QPainter>
 #include <QVarLengthArray>
 #include <QX11Info>
--- a/kcmkwin/kwincompositing/ktimerdialog.cpp
+++ b/kcmkwin/kwincompositing/ktimerdialog.cpp
@ -26,7 +26,7 @@
 #include <QPixmap>
 #include <QTimer>

-#include <QtGui/QProgressBar>
+#include <QProgressBar>

 #include <kwindowsystem.h>
 #include <kiconloader.h>
--- a/kcmkwin/kwindecoration/decorationmodel.cpp
+++ b/kcmkwin/kwindecoration/decorationmodel.cpp
@ -22,11 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // kwin
 #include <kdecorationfactory.h>
 // Qt
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QApplication>
 #include <QtGui/QPainter>
-#include <QtGui/QStyle>
+#include <QStyle>
 #include <QtGui/QTextDocument>
 // KDE
 #include <KConfigGroup>
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@ -40,9 +40,9 @@
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeItem>
 #include <QtDeclarative/QDeclarativeView>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QScrollBar>
+#include <QSortFilterProxyModel>
+#include <QGraphicsObject>
+#include <QScrollBar>
 #include <QUiLoader>
 // KDE
 #include <KAboutData>
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@ -30,7 +30,7 @@
 #include <KComboBox>
 #include <QHBoxLayout>
 #include <QFormLayout>
-#include <QtGui/QDesktopWidget>
+#include <QDesktopWidget>
 #include <QtDBus/QtDBus>

 #include <KButtonGroup>
--- a/kcmkwin/kwinscripts/module.cpp
+++ b/kcmkwin/kwinscripts/module.cpp
@ -20,7 +20,7 @@
 #include "module.h"
 #include "ui_module.h"

-#include <QtCore/QStringList>
+#include <QStringList>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusPendingCall>
--- a/kcmkwin/kwintabbox/layoutpreview.cpp
+++ b/kcmkwin/kwintabbox/layoutpreview.cpp
@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
-#include <QtGui/QGraphicsObject>
+#include <QGraphicsObject>
 #include <kdeclarative.h>
 #include <KDE/KConfigGroup>
 #include <KDE/KDesktopFile>
--- a/kcmkwin/kwintabbox/layoutpreview.h
+++ b/kcmkwin/kwintabbox/layoutpreview.h
@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_TABBOX_LAYOUTPREVIEW_H
 #define KWIN_TABBOX_LAYOUTPREVIEW_H

-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeImageProvider>

--- a/libkdecorations/kcommondecoration.h
+++ b/libkdecorations/kcommondecoration.h
@ -25,7 +25,7 @@
 #ifndef KCOMMONDECORATION_H
 #define KCOMMONDECORATION_H

-#include <QtGui/QAbstractButton>
+#include <QAbstractButton>
 #include "kdecoration.h"

 /** @addtogroup kdecoration */
--- a/libkdecorations/kdecoration.h
+++ b/libkdecorations/kdecoration.h
@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.

 #include <QtGui/QColor>
 #include <QtGui/QFont>
-#include <QtCore/QObject>
+#include <QObject>
 #include <QtGui/QIcon>
 #include <netwm_def.h>
 #include <QtGui/QMouseEvent>
--- a/libkdecorations/kdecoration_p.h
+++ b/libkdecorations/kdecoration_p.h
@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.
 //

 #include "kdecoration.h"
-#include <QtGui/QWidget>
+#include <QWidget>

 class KConfig;

--- a/libkdecorations/kdecoration_plugins_p.h
+++ b/libkdecorations/kdecoration_plugins_p.h
@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE.

 // This private header is used by KWin core.

-#include <QtGui/QWidget>
+#include <QWidget>
 #include <ksharedconfig.h>

 #include "kdecoration.h"
--- a/libkdecorations/kdecorationbridge.h
+++ b/libkdecorations/kdecorationbridge.h
@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 #define KDECORATIONBRIDGE_H

 #include "kdecoration.h"
-#include <QtGui/QWidget>
+#include <QWidget>

 /** @addtogroup kdecoration */
 /** @{ */
--- a/libkwineffects/kwinanimationeffect.h
+++ b/libkwineffects/kwinanimationeffect.h
@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include <QEasingCurve>
 #include <QElapsedTimer>
-#include <QtCore/qmath.h>
+#include <qmath.h>
 #include <kwineffects.h>


--- a/libkwineffects/kwineffects.cpp
+++ b/libkwineffects/kwineffects.cpp
@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDBus/QtDBus>
 #include <QVariant>
 #include <QList>
-#include <QtCore/QTimeLine>
+#include <QTimeLine>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@ -26,15 +26,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinconfig.h>
 #include <kwinglobals.h>

-#include <QtCore/QPair>
-#include <QtCore/QSet>
-#include <QtCore/QRect>
+#include <QPair>
+#include <QSet>
+#include <QRect>
 #include <QtGui/QRegion>

-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QVector>
+#include <QList>
+#include <QHash>
+#include <QStack>

 #include <KDE/KPluginFactory>
 #include <KDE/KShortcutsEditor>
--- a/libkwineffects/kwingltexture.h
+++ b/libkwineffects/kwingltexture.h
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "kwinglobals.h"

-#include <QtCore/QSize>
+#include <QSize>
 #include <QRegion>
 #include <QSharedPointer>
 #include <QExplicitlySharedDataPointer>
--- a/libkwineffects/kwingltexture_p.h
+++ b/libkwineffects/kwingltexture_p.h
@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "kwinglobals.h"

-#include <QtCore/QSize>
-#include <QtCore/QSharedData>
+#include <QSize>
+#include <QSharedData>
 #include <QImage>

 namespace KWin
--- a/libkwineffects/kwinglutils.h
+++ b/libkwineffects/kwinglutils.h
@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwingltexture.h"

 // Qt
-#include <QtCore/QSize>
-#include <QtCore/QStack>
+#include <QSize>
+#include <QStack>

 /** @addtogroup kwineffects */
 /** @{ */
--- a/outline.h
+++ b/outline.h
@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_OUTLINE_H
 #define KWIN_OUTLINE_H
 #include "xcbutils.h"
-#include <QtCore/QRect>
-#include <QtCore/QVector>
+#include <QRect>
+#include <QVector>

 namespace KWin {

--- a/overlaywindow.cpp
+++ b/overlaywindow.cpp
@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "assert.h"

-#include <QtCore/QVector>
+#include <QVector>

 #include <xcb/composite.h>
 #include <xcb/shape.h>
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kxerrorhandler.h>

 #include <QtGui/QPainter>
-#include <QtCore/qmath.h>
+#include <qmath.h>

 namespace KWin
 {
--- a/screenedge.cpp
+++ b/screenedge.cpp
@ -38,9 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include "virtualdesktops.h"
 // Qt
-#include <QtCore/QTimer>
-#include <QtCore/QVector>
-#include <QtCore/QTextStream>
+#include <QTimer>
+#include <QVector>
+#include <QTextStream>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusPendingCall>
 #include <QDesktopWidget>
--- a/screenedge.h
+++ b/screenedge.h
@ -35,8 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KDE includes
 #include <KDE/KConfig>
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QVector>
 #include <QDateTime>

 namespace KWin {
--- a/scripting/scriptedeffect.cpp
+++ b/scripting/scriptedeffect.cpp
@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDE/KDebug>
 #include <KDE/KStandardDirs>
 // Qt
-#include <QtCore/QFile>
+#include <QFile>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValueIterator>

--- a/scripting/scripting.cpp
+++ b/scripting/scripting.cpp
@ -39,14 +39,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusPendingCallWatcher>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QSettings>
-#include <QtCore/QtConcurrentRun>
+#include <QFutureWatcher>
+#include <QSettings>
+#include <QtConcurrentRun>
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtGui/QMenu>
+#include <QMenu>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValue>

--- a/scripting/scripting.h
+++ b/scripting/scripting.h
@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglobals.h>
 #include <kservice.h>

-#include <QtCore/QFile>
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
+#include <QFile>
+#include <QHash>
+#include <QStringList>
 #include <QtScript/QScriptEngineAgent>

 class QAction;
--- a/scripting/timer.cpp
+++ b/scripting/timer.cpp
@ -20,7 +20,7 @@
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptContext>
 #include <QtScript/QScriptable>
-#include <QtCore/QTimer>
+#include <QTimer>

 Q_DECLARE_METATYPE(QTimer*)

--- a/scripting/workspace_wrapper.cpp
+++ b/scripting/workspace_wrapper.cpp
@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../outline.h"
 #include "../virtualdesktops.h"

-#include <QtGui/QDesktopWidget>
+#include <QDesktopWidget>

 namespace KWin {

--- a/scripting/workspace_wrapper.h
+++ b/scripting/workspace_wrapper.h
@ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SCRIPTING_WORKSPACE_WRAPPER_H
 #define KWIN_SCRIPTING_WORKSPACE_WRAPPER_H

-#include <QtCore/QObject>
-#include <QtCore/QSize>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QSize>
+#include <QStringList>
 #include <QRect>
 #include <kwinglobals.h>

--- a/shadow.h
+++ b/shadow.h
@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SHADOW_H
 #define KWIN_SHADOW_H

-#include <QtCore/QObject>
+#include <QObject>
 #include <QtGui/QPixmap>
 #include <kwineffects.h>
 #include <qvarlengtharray.h>
--- a/tabbox/declarative.cpp
+++ b/tabbox/declarative.cpp
@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QGraphicsObject>
+#include <QDesktopWidget>
+#include <QGraphicsObject>
 #include <QtGui/QResizeEvent>
 #include <QX11Info>

--- a/thumbnailitem.h
+++ b/thumbnailitem.h
@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_THUMBNAILITEM_H
 #define KWIN_THUMBNAILITEM_H

-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>
 #include <QtDeclarative/QDeclarativeItem>

 namespace KWin
--- a/workspace.cpp
+++ b/workspace.cpp
@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <QtGui/QDesktopWidget>
+#include <QDesktopWidget>
 #include <QRegExp>
 #include <QPainter>
 #include <QBitmap>