generic: make changes required for building against katie

2025-02-23 18:32:50 +00:00 · 2015-08-12 13:11:16 +03:00 · 2015-08-12 13:11:16 +03:00 · 840c8a25cc
commit 840c8a25cc
parent 280a229140
611 changed files with 831 additions and 810 deletions
--- a/appmenu/appmenu.cpp
+++ b/appmenu/appmenu.cpp
@ -33,7 +33,7 @@

 #include <QDBusInterface>
 #include <QDBusReply>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QMenu>
 #include <QApplication>
 #include <QDesktopWidget>
--- a/appmenu/appmenu_dbus.cpp
+++ b/appmenu/appmenu_dbus.cpp
@ -29,7 +29,7 @@

 #include <QApplication>
 #include <QDBusMessage>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QDBusServiceWatcher>

 static const char* DBUS_SERVICE = "org.kde.kded";
--- a/appmenu/appmenu_dbus.h
+++ b/appmenu/appmenu_dbus.h
@ -28,7 +28,7 @@

 // Qt
 #include <QDBusContext>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QObject>
 #include <QDebug>
 #include <qwindowdefs.h>
--- a/appmenu/glowbar.cpp
+++ b/appmenu/glowbar.cpp
@ -35,7 +35,7 @@
 #include <QTimer>
 #include <QDebug>
 #include <QPainter>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>


 GlowBar::GlowBar()
--- a/appmenu/menubar.cpp
+++ b/appmenu/menubar.cpp
@ -30,7 +30,7 @@
 #include <QPainter>
 #include <QMenu>
 #include <QDesktopWidget>
-#include <QGraphicsDropShadowEffect>
+#include <QtGui/qgraphicseffect.h>

 #include <KWindowSystem>
 #include <Plasma/FrameSvg>
--- a/appmenu/menubutton.cpp
+++ b/appmenu/menubutton.cpp
@ -27,7 +27,7 @@

 #include <QAction>
 #include <QMenu>
-#include <QGraphicsDropShadowEffect>
+#include <QtGui/qgraphicseffect.h>

 #include <Plasma/Theme>

--- a/appmenu/menuimporter.cpp
+++ b/appmenu/menuimporter.cpp
@ -28,7 +28,7 @@

 #include <QApplication>
 #include <QDBusMessage>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QDBusServiceWatcher>

 #include <KDebug>
--- a/appmenu/menuimporter.h
+++ b/appmenu/menuimporter.h
@ -28,7 +28,7 @@

 // Qt
 #include <QDBusContext>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QObject>
 #include <QWidget> // For WId

--- a/appmenu/shadows.cpp
+++ b/appmenu/shadows.cpp
@ -22,7 +22,7 @@
 #include <QPainter>

 #ifdef Q_WS_X11
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <fixx11h.h>
--- a/appmenu/verticalmenu.cpp
+++ b/appmenu/verticalmenu.cpp
@ -26,10 +26,10 @@
 #include "verticalmenu.h"

 #include <QCoreApplication>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QEvent>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>

 VerticalMenu::VerticalMenu(QWidget* parent) : QMenu(parent)
 {
--- a/drkonqi/detachedprocessmonitor.cpp
+++ b/drkonqi/detachedprocessmonitor.cpp
@ -18,7 +18,7 @@

 #include <signal.h>

-#include <QtCore/QTimerEvent>
+#include <QtCore/qcoreevent.h>

 #include <KDebug>

--- a/drkonqi/drkonqi.cpp
+++ b/drkonqi/drkonqi.cpp
@ -41,9 +41,9 @@
 */
 #include "drkonqi.h"

-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtCore/QTextStream>
-#include <QtCore/QTimerEvent>
+#include <QtCore/qcoreevent.h>

 #include <KMessageBox>
 #include <KFileDialog>
--- a/drkonqi/parser/backtraceparser.cpp
+++ b/drkonqi/parser/backtraceparser.cpp
@ -20,7 +20,7 @@
 #include "backtraceparserkdbgwin.h"
 #include "backtraceparsernull.h"
 #include <QtCore/QRegExp>
-#include <QtCore/QMetaEnum>
+#include <QtCore/qmetaobject.h>
 #include <KDebug>

 //factory
--- a/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp
+++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest.cpp
@ -18,7 +18,7 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QFile>
-#include <QMetaEnum>
+#include <QtCore/qmetaobject.h>
 #include <QDebug>
 #include <QSharedPointer>

--- a/drkonqi/tests/backtraceparsertest/backtraceparsertest.h
+++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest.h
@ -18,6 +18,8 @@
 #define BACKTRACEPARSERTEST_H

 #include <QtTest>
+#include <QtCore/qsettings.h>
+
 #include "fakebacktracegenerator.h"
 #include "../../parser/backtraceparser.h"

--- a/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp
+++ b/drkonqi/tests/backtraceparsertest/backtraceparsertest_manual.cpp
@ -19,7 +19,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QTextStream>
-#include <QtCore/QMetaEnum>
+#include <QtCore/qmetaobject.h>
 #include <QtCore/QCoreApplication>
 #include <KAboutData>
 #include <KCmdLineOptions>
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@ -40,7 +40,7 @@
 #include <QtDBus/QtDBus>
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #endif

 #include <kservicetypetrader.h>
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@ -31,7 +31,7 @@


 #include "moc_kaccess.cpp"
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <kvbox.h>

 struct ModifierKey {
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@ -6,7 +6,7 @@
 #include <QColor>
 //Added by qt3to4:
 #include <QLabel>
-#include <QPaintEvent>
+#include <QtGui/qevent.h>


 #include <KUniqueApplication>
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@ -15,7 +15,7 @@
 #include <QCheckBox>
 #include <QLineEdit>
 #include <QRadioButton>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QtDBus/QtDBus>

 //Added by qt3to4:
--- a/kcontrol/autostart/autostartitem.cpp
+++ b/kcontrol/autostart/autostartitem.cpp
@ -21,7 +21,7 @@
 #include "autostart.h"

 #include <QComboBox>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QTreeWidget>
 #include <QDir>

--- a/kcontrol/autostart/autostartitem.h
+++ b/kcontrol/autostart/autostartitem.h
@ -20,7 +20,7 @@
 #ifndef AUTOSTARTITEM_H
 #define AUTOSTARTITEM_H

-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QObject>
 #include <KUrl>

--- a/kcontrol/colors/previewwidget.cpp
+++ b/kcontrol/colors/previewwidget.cpp
@ -23,7 +23,7 @@
 #include <KGlobalSettings>
 #include <KColorScheme>

-#include <QtDebug>
+#include <QtCore/qdebug.h>

 PreviewWidget::PreviewWidget(QWidget *parent) : QFrame(parent)
 {
--- a/kcontrol/componentchooser/componentchooseremail.cpp
+++ b/kcontrol/componentchooser/componentchooseremail.cpp
@ -15,11 +15,11 @@

 #include "componentchooseremail.h"
 #include <QtDBus/QtDBus>
+#include <QtCore/qfile.h>
+#include <QtGui/qcheckbox.h>
 #include <kemailsettings.h>
-#include <QCheckBox>
 #include <kopenwithdialog.h>
 #include <kstandarddirs.h>
-
 #include <KUrl>

 // for chmod:
--- a/kcontrol/dateandtime/dtime.cpp
+++ b/kcontrol/dateandtime/dtime.cpp
@ -34,10 +34,10 @@
 #include <QtGui/QGroupBox>
 #include <QPushButton>
 #include <QPainter>
-#include <QTimeEdit>
+#include <QtGui/qdatetimeedit.h>

 #include <QCheckBox>
-#include <QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
--- a/kcontrol/dateandtime/dtime.h
+++ b/kcontrol/dateandtime/dtime.h
@ -30,7 +30,7 @@
 #include <QWidget>
 #include <QCheckBox>
 //Added by qt3to4:
-#include <QPaintEvent>
+#include <QtGui/qevent.h>

 #include <kdatepicker.h>
 #include <knuminput.h>
--- a/kcontrol/emoticons/emoticonslist.cpp
+++ b/kcontrol/emoticons/emoticonslist.cpp
@ -23,7 +23,7 @@
 #include <QDir>
 #include <QIcon>
 #include <QLabel>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <KMessageBox>
 #include <KDebug>
 #include <KIcon>
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@ -31,7 +31,7 @@
 #include <QRegExp>
 #include <QFile>
 #include <QDir>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QByteArray>

 #include <KLocale>
--- a/kcontrol/fonts/kxftconfig.h
+++ b/kcontrol/fonts/kxftconfig.h
@ -28,6 +28,7 @@

 #include <QStringList>
 #include <QtXml/QtXml>
+#include <QtXml/qdom.h>

 class KXftConfig
 {
--- a/kcontrol/input/kapplymousetheme.cpp
+++ b/kcontrol/input/kapplymousetheme.cpp
@ -24,7 +24,7 @@

 #include <config-X11.h>

-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <X11/Xlib.h>
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@ -29,7 +29,7 @@
 #include <QFile>

 #include "mouse.h"
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <ktoolinvocation.h>
 #include <klauncher_iface.h>
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@ -73,7 +73,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <kglobalsettings.h>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #undef Below

--- a/kcontrol/input/xcursor/cursortheme.cpp
+++ b/kcontrol/input/xcursor/cursortheme.cpp
@ -22,7 +22,7 @@
 #include <QCursor>
 #include <QImage>
 #include <QFile>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include "themepage.h"
 #include "cursortheme.h"
--- a/kcontrol/input/xcursor/itemdelegate.cpp
+++ b/kcontrol/input/xcursor/itemdelegate.cpp
@ -21,7 +21,7 @@
 #include "cursortheme.h"

 #include <QApplication>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPainter>

 namespace
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@ -17,7 +17,7 @@
 */

 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>

 #include "previewwidget.h"

--- a/kcontrol/input/xcursor/thememodel.h
+++ b/kcontrol/input/xcursor/thememodel.h
@ -20,7 +20,7 @@
 #ifndef THEMEMODEL_H
 #define THEMEMODEL_H

-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStringList>

 class QDir;
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@ -37,7 +37,7 @@
 #include <QWidget>
 #include <QPushButton>
 #include <QDir>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include "themepage.h"
 #include "moc_themepage.cpp"
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@ -20,7 +20,7 @@
 #define THEMEPAGE_H

 #include <QWidget>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>

 #include "ui_themepage.h"

--- a/kcontrol/input/xcursor/xcursortheme.cpp
+++ b/kcontrol/input/xcursor/xcursortheme.cpp
@ -24,7 +24,7 @@
 #include <QCursor>
 #include <QImage>
 #include <QDir>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
--- a/kcontrol/keyboard/iso_codes.cpp
+++ b/kcontrol/keyboard/iso_codes.cpp
@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kdebug.h>

-#include <QtXml/QXmlAttributes>
+#include <QtXml/qxml.h>


 class IsoCodesPrivate {
--- a/kcontrol/keyboard/kcm_keyboard_widget.cpp
+++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp
@ -30,7 +30,7 @@
 #include <QtGui/QCheckBox>
 #include <QtGui/QPixmap>
 #include <QtGui/QVBoxLayout>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include "keyboard_config.h"
 #include "preview/keyboardpainter.h"
--- a/kcontrol/keyboard/kcm_view_models.h
+++ b/kcontrol/keyboard/kcm_view_models.h
@ -21,7 +21,7 @@
 #define KCM_VIEW_MODELS_H_

 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QSet>
 #include <QtGui/QStyledItemDelegate>

--- a/kcontrol/keyboard/kcmmisc.cpp
+++ b/kcontrol/keyboard/kcmmisc.cpp
@ -31,7 +31,7 @@

 #include <QtGui/QCheckBox>
 #include <QtGui/QWhatsThis>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <klocale.h>
 #include <kconfig.h>
--- a/kcontrol/keyboard/keyboard_applet.cpp
+++ b/kcontrol/keyboard/keyboard_applet.cpp
@ -27,7 +27,7 @@

 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/QAction>
 #include <QtDBus/QtDBus>

--- a/kcontrol/keyboard/keyboard_daemon.cpp
+++ b/kcontrol/keyboard/keyboard_daemon.cpp
@ -18,7 +18,7 @@

 #include "keyboard_daemon.h"

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QtDBus/QtDBus>
 #include <QtCore/QProcess>

--- a/kcontrol/keyboard/keyboard_hardware.cpp
+++ b/kcontrol/keyboard/keyboard_hardware.cpp
@ -20,7 +20,7 @@
 #include <kconfiggroup.h>
 #include <ksharedconfig.h>

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QtGui/QCursor>	// WTF? - otherwise compiler complains

 #include <X11/Xlib.h>
--- a/kcontrol/keyboard/layout_memory.cpp
+++ b/kcontrol/keyboard/layout_memory.cpp
@ -19,7 +19,7 @@
 #include "layout_memory.h"

 #include <QtCore/QSet>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <kdebug.h>
 #include <kwindowsystem.h>
--- a/kcontrol/keyboard/layout_memory.h
+++ b/kcontrol/keyboard/layout_memory.h
@ -22,7 +22,7 @@

 #include <QtCore/QString>
 #include <QtCore/QMap>
-#include <QtGui/QWidgetList> //For WId
+#include <QtGui/qwindowdefs.h> //For WId

 #include "x11_helper.h"
 #include "keyboard_config.h"
--- a/kcontrol/keyboard/preview/keyaliases.cpp
+++ b/kcontrol/keyboard/preview/keyaliases.cpp
@ -23,7 +23,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
--- a/kcontrol/keyboard/preview/keyboardlayout.cpp
+++ b/kcontrol/keyboard/preview/keyboardlayout.cpp
@ -25,7 +25,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
--- a/kcontrol/keyboard/x11_helper.cpp
+++ b/kcontrol/keyboard/x11_helper.cpp
@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kdebug.h>

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <X11/X.h>
 #include <X11/Xlib.h>
--- a/kcontrol/keyboard/xinput_helper.cpp
+++ b/kcontrol/keyboard/xinput_helper.cpp
@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kdebug.h>

-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include <X11/X.h>
 #include <X11/Xlib.h>
--- a/kcontrol/keyboard/xkb_helper.cpp
+++ b/kcontrol/keyboard/xkb_helper.cpp
@ -22,8 +22,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QTime>
-#include <QtGui/QX11Info>
+#include <QtCore/qdatetime.h>
+#include <QtGui/qx11info_x11.h>

 #include <kglobal.h>
 #include <kstandarddirs.h>
--- a/kcontrol/keyboard/xkb_rules.cpp
+++ b/kcontrol/keyboard/xkb_rules.cpp
@ -25,7 +25,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QRegExp>
 #include <QtGui/QTextDocument> // for Qt::escape
-#include <QtXml/QXmlAttributes>
+#include <QtXml/qxml.h>
 #include <QtCore/QtConcurrentFilter>

 //#include <libintl.h>
@ -34,7 +34,7 @@
 #include "x11_helper.h"

 // for findXkbRuleFile
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
--- a/kcontrol/keyboard/xkb_rules.h
+++ b/kcontrol/keyboard/xkb_rules.h
@ -20,7 +20,7 @@
 #ifndef XKB_RULES_H_
 #define XKB_RULES_H_

-#include <QtXml/QXmlDefaultHandler>
+#include <QtXml/qxml.h>
 #include <QtCore/QList>
 #include <QtCore/QStringList>

--- a/kcontrol/kfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/CMakeLists.txt
@ -1,15 +1,3 @@
-if (KFI_BUILD_STANDALONE)
-    cmake_minimum_required(VERSION 2.6.4)
-    find_package(KDE4 "4.6.0" REQUIRED)
-    find_package(Qt4 REQUIRED)
-    find_package(Freetype REQUIRED)
-    find_package(Fontconfig REQUIRED)
-    find_package(Strigi REQUIRED)
-    find_package(X11 REQUIRED)
-    macro_log_feature(X11_Xft_FOUND "libxft" "X FreeType interface library" "http://www.x.org" FALSE "" "Font installer and font previews")
-    include(KDE4Defaults)
-endif (KFI_BUILD_STANDALONE)
-
 if (X11_Xft_FOUND)
    check_include_files(locale.h HAVE_LOCALE_H)
    configure_file(config-fontinst.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-fontinst.h)
--- a/kcontrol/kfontinst/apps/CreateParent.h
+++ b/kcontrol/kfontinst/apps/CreateParent.h
@ -24,8 +24,8 @@
 * Boston, MA 02110-1301, USA.
 */

-#include <QtCore/QLatin1String>
-#include <QtGui/QX11Info>
+#include <QtCore/qstring.h>
+#include <QtGui/qx11info_x11.h>
 #include <X11/Xlib.h>
 #include <fixx11h.h>

--- a/kcontrol/kfontinst/apps/Printer.cpp
+++ b/kcontrol/kfontinst/apps/Printer.cpp
@ -38,7 +38,7 @@
 #include <QtGui/QFrame>
 #include <QtGui/QGridLayout>
 #include <QtGui/QProgressBar>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 #include <KCmdLineArgs>
 #include <KAboutData>
 #include <KApplication>
--- a/kcontrol/kfontinst/dbus/FcConfig.cpp
+++ b/kcontrol/kfontinst/dbus/FcConfig.cpp
@ -27,10 +27,10 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 #include <QtCore/QByteArray>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNode>
-#include <QtXml/QDomText>
+#include <QtXml/qdom.h>
+#include <QtXml/qdom.h>
+#include <QtXml/qdom.h>
+#include <QtXml/qdom.h>
 #include <KDebug>
 #include <stdio.h>
 #include <fontconfig/fontconfig.h>
--- a/kcontrol/kfontinst/dbus/Folder.cpp
+++ b/kcontrol/kfontinst/dbus/Folder.cpp
@ -26,9 +26,9 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTextStream>
 #include <QtCore/QProcess>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNode>
+#include <QtXml/qdom.h>
+#include <QtXml/qdom.h>
+#include <QtXml/qdom.h>
 #include <KStandardDirs>
 #include <KSaveFile>
 #include <KShell>
--- a/kcontrol/kfontinst/dbus/FontInst.cpp
+++ b/kcontrol/kfontinst/dbus/FontInst.cpp
@ -21,8 +21,11 @@
 * Boston, MA 02110-1301, USA.
 */

-#include <QtDBus/QDBusConnection>
-#include <QtCore/QTimer>
+#include <QtDBus/qdbusconnection.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qcoreapplication.h>
+
 #include <kauth.h>
 #include <KDebug>
 #include <kio/global.h>
--- a/kcontrol/kfontinst/dbus/Helper.cpp
+++ b/kcontrol/kfontinst/dbus/Helper.cpp
@ -27,8 +27,9 @@
 #include "Misc.h"
 #include "Utils.h"
 #include <KDebug>
-#include <QtXml/QDomDocument>
-#include <QtCore/QTextCodec>
+#include <QtXml/qdom.h>
+#include <QtCore/qtextcodec.h>
+#include <QtCore/qcoreapplication.h>
 #include <kio/global.h>
 #include <kde_file.h>
 #include <sys/types.h>
--- a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
@ -41,12 +41,12 @@
 #include <QtCore/QTimer>
 #include <QtGui/QGridLayout>
 #include <QtCore/QDir>
-#include <QtCore/QFileInfoList>
+#include <QtCore/qfileinfo.h>
 #include <QtCore/QFileInfo>
 #include <QtGui/QHeaderView>
 #include <QtCore/QDateTime>
 #include <QtGui/QMenu>
-#include <QtGui/QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
--- a/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
@ -37,7 +37,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 #include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QApplication>
 #include <QtGui/QActionGroup>

--- a/kcontrol/kfontinst/kcmfontinst/FontList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/FontList.cpp
@ -39,7 +39,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtGui/QPixmap>
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QDateTime>
 #include <QtGui/QHeaderView>
 #include <QtGui/QPainter>
--- a/kcontrol/kfontinst/kcmfontinst/FontList.h
+++ b/kcontrol/kfontinst/kcmfontinst/FontList.h
@ -32,7 +32,7 @@
 #include <QtCore/QHash>
 #include <QtGui/QTreeView>
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVariant>
 #include <QtGui/QSortFilterProxyModel>
 #include <QtGui/QFontDatabase>
--- a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
@ -33,14 +33,14 @@
 #include <KSaveFile>
 #include <QtGui/QFont>
 #include <QtGui/QFontDatabase>
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QHeaderView>
 #include <QtGui/QMenu>
 #include <QtGui/QApplication>
 #include <QtGui/QStyledItemDelegate>
 #include <QtGui/QPainter>
-#include <QtGui/QLinearGradient>
-#include <QtXml/QDomElement>
+#include <QtGui/qbrush.h>
+#include <QtXml/qdom.h>
 #include <QtCore/QTextStream>
 #include <QtCore/QDir>
 #include <QtCore/QEvent>
--- a/kcontrol/kfontinst/kcmfontinst/GroupList.h
+++ b/kcontrol/kfontinst/kcmfontinst/GroupList.h
@ -31,7 +31,7 @@
 #include <QtCore/QList>
 #include <QtGui/QTreeView>
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVariant>
 #include "FontList.h"

--- a/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
@ -37,12 +37,13 @@
 #include <QtGui/QGridLayout>
 #include <QtGui/QProgressBar>
 #include <QtGui/QLabel>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QtGui/QStackedWidget>
 #include <QtGui/QCheckBox>
 #include <QtGui/QStyleOption>
 #include <QtGui/QStyle>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
+#include <QtCore/qprocess.h>
 #include <QtCore/QTimer>
 #include <QtDBus/QDBusServiceWatcher>
 #include <X11/Xlib.h>
--- a/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PreviewList.cpp
@ -30,8 +30,9 @@
 #include <QtGui/QApplication>
 #include <QtGui/QHeaderView>
 #include <QtGui/QPixmapCache>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QX11Info>
+#include <QtGui/qevent.h>
+#include <QtGui/qx11info_x11.h>
+#include <QtCore/qtextstream.h>

 namespace KFI
 {
--- a/kcontrol/kfontinst/kio/FontInstInterface.cpp
+++ b/kcontrol/kfontinst/kio/FontInstInterface.cpp
@ -27,6 +27,7 @@
 #include <KDebug>
 #include <kio/global.h>
 #include <QtDBus/QDBusServiceWatcher>
+#include <QtCore/qprocess.h>
 #include "config-fontinst.h"

 #define KFI_DBUG kDebug(7000) << '(' << time(NULL) << ')'
--- a/kcontrol/kfontinst/lib/Family.cpp
+++ b/kcontrol/kfontinst/lib/Family.cpp
@ -22,7 +22,7 @@
 */

 #include <QtCore/QTextStream>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <KDebug>
 #include "Family.h"
 #include "Misc.h"
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@ -27,7 +27,7 @@
 #include <QtGui/QPixmap>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
-#include <QtGui/QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <KUrl>
 #include <KConfig>
 #include <KConfigGroup>
--- a/kcontrol/kfontinst/lib/File.cpp
+++ b/kcontrol/kfontinst/lib/File.cpp
@ -21,7 +21,7 @@
 * Boston, MA 02110-1301, USA.
 */

-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QTextStream>
 #include <QtCore/QDir>
 #include "File.h"
--- a/kcontrol/kfontinst/lib/KfiConstants.h
+++ b/kcontrol/kfontinst/lib/KfiConstants.h
@ -24,7 +24,7 @@
 * Boston, MA 02110-1301, USA.
 */

-#include <QtCore/QLatin1String>
+#include <QtCore/qstring.h>
 #include <KLocale>
 #include <kio/udsentry.h>

--- a/kcontrol/kfontinst/lib/Style.cpp
+++ b/kcontrol/kfontinst/lib/Style.cpp
@ -23,7 +23,7 @@

 #include <QtCore/QTextStream>
 #include <QtCore/QStringList>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include "Fc.h"
 #include "Style.h"
 #include "WritingSystems.h"
--- a/kcontrol/kfontinst/viewpart/CharTip.cpp
+++ b/kcontrol/kfontinst/viewpart/CharTip.cpp
@ -42,7 +42,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QBoxLayout>
 #include <QtCore/QEvent>
-#include <QtGui/QResizeEvent>
+#include <QtGui/qevent.h>

 namespace KFI
 {
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@ -27,9 +27,9 @@
 #include <KApplication>
 #include <KLocale>
 #include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
 #include <stdlib.h>

 namespace KFI
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@ -28,7 +28,7 @@
 #include <QtCore/QSize>
 #include <QtGui/QWidget>
 #include <QtGui/QColor>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 #include "KfiConstants.h"
 #include "FcEngine.h"

--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@ -51,7 +51,7 @@
 #include "krdb.h"
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #endif
 inline const char * gtkEnvVar(int version)
 {
--- a/kcontrol/locale/countryselectordialog.cpp
+++ b/kcontrol/locale/countryselectordialog.cpp
@ -15,7 +15,7 @@

 #include <QAbstractItemModel>
 #include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QListView>
 #include <QScrollBar>

--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@ -23,7 +23,7 @@
 #include "kcmlocale.h"

 #include <QListWidget>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QPrinter>
 #include <QTimer>

--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@ -19,7 +19,7 @@
 #include "krandrpassivepopup.h"

 #include <kapplication.h>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QEvent>
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@ -29,7 +29,7 @@

 #include <config-randr.h>

-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QVariant>

 #include <KAction>
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@ -19,8 +19,8 @@
 #ifndef KRANDRTRAY_H
 #define KRANDRTRAY_H

-#include <QMouseEvent>
-#include <QWeakPointer>
+#include <QtGui/qevent.h>
+#include <QtCore/qsharedpointer.h>

 #include <KStatusNotifierItem>

--- a/kcontrol/randr/legacyrandrscreen.cpp
+++ b/kcontrol/randr/legacyrandrscreen.cpp
@ -31,7 +31,7 @@
 #include <QtGui/QLabel>
 #include <QDesktopWidget>

-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include "legacyrandrscreen.h"

 LegacyRandRScreen::LegacyRandRScreen(int screenIndex)
--- a/kcontrol/randr/outputgraphicsitem.h
+++ b/kcontrol/randr/outputgraphicsitem.h
@ -19,8 +19,8 @@
 #ifndef OUTPUTGRAPHICSITEM_H
 #define OUTPUTGRAPHICSITEM_H

-#include <QGraphicsRectItem>
-#include <QGraphicsTextItem>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicsitem.h>

 #include "randr.h"

--- a/kcontrol/randr/randrcrtc.h
+++ b/kcontrol/randr/randrcrtc.h
@ -21,7 +21,7 @@

 #include "randr.h"

-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QObject>
 #include <QRect>

--- a/kcontrol/randr/randrdisplay.cpp
+++ b/kcontrol/randr/randrdisplay.cpp
@ -23,7 +23,7 @@
 #include <KDebug>
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #include "randrdisplay.h"
 #ifdef HAS_RANDR_1_2 
--- a/kcontrol/randr/randroutput.cpp
+++ b/kcontrol/randr/randroutput.cpp
@ -25,7 +25,7 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KShell>
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QAction>

 RandROutput::RandROutput(RandRScreen *parent, RROutput id)
--- a/kcontrol/randr/randrscreen.h
+++ b/kcontrol/randr/randrscreen.h
@ -21,7 +21,7 @@

 #include "randr.h"

-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #include <QObject>
 #include <QMap>

--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@ -27,7 +27,7 @@

 #include "testwin.h"

-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 #ifdef HAVE_GLXCHOOSEVISUAL
 #include <GL/glx.h>
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@ -41,14 +41,14 @@
 #include <QTimer>
 #include <QTreeWidget>
 #include <QHeaderView>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QTextStream>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QHBoxLayout>
 #include <QBoxLayout>
 #include <QVBoxLayout>
-#include <QResizeEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
 #include <QtDBus/QtDBus>

 #include <QDesktopWidget>
@ -75,7 +75,7 @@
 #include <fixx11h.h>

 #include "scrnsave.h"
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>

 template class QList<SaverConfig*>;

--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@ -29,9 +29,9 @@
 #define SCRNSAVE__H

 #include <QWidget>
-#include <QMouseEvent>
-#include <QResizeEvent>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>

 #include <KCModule>

--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@ -27,7 +27,7 @@

 #define KDE3_SUPPORT
 #include <kcmodule.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #undef KDE3_SUPPORT

 #include "smartcardbase.h"
--- a/kcontrol/splash/installer.cpp
+++ b/kcontrol/splash/installer.cpp
@ -19,10 +19,10 @@
 #include <QPixmap>
 #include <QFrame>
 #include <QHBoxLayout>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
 #include <QVBoxLayout>
-#include <QDragEnterEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
 #include <QScrollArea>

 #include "installer.h"
--- a/kcontrol/splash/installer.h
+++ b/kcontrol/splash/installer.h
@ -13,10 +13,10 @@

 #include <QMap>
 #include <QPoint>
-#include <QDragEnterEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+#include <QtGui/qevent.h>
 #include <QLabel>
-#include <QDropEvent>
+#include <QtGui/qevent.h>

 #include <klistwidget.h>
 #include <kurl.h>
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@ -62,9 +62,10 @@
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QStyle>
 #include <QtDBus/QtDBus>
+#include <QtCore/qlibraryinfo.h>

 #ifdef Q_WS_X11
-#include <QX11Info>
+#include <QtGui/qx11info_x11.h>
 #endif

 #include "../krdb/krdb.h"
--- a/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h
+++ b/kcontrol/touchpad/src/kcm/customconfigdialogmanager.h
@ -20,7 +20,7 @@
 #define CUSTOMCONFIGDIALOGMANAGER_H

 #include <QMap>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>

 #include <KConfigDialogManager>

--- a/kcontrol/touchpad/src/kcm/customslider.cpp
+++ b/kcontrol/touchpad/src/kcm/customslider.cpp
@ -20,7 +20,7 @@

 #include <cmath>

-#include <QResizeEvent>
+#include <QtGui/qevent.h>

 CustomSlider::Interpolator::~Interpolator()
 {
--- a/Show more
+++ b/Show more