generic: make changes required for building against Katie

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2025-02-23 18:32:53 +00:00 · 2015-11-25 10:00:54 +00:00 · 2015-11-25 10:00:54 +00:00 · cbf29a08cf
commit cbf29a08cf
parent 61dae2dbd9
629 changed files with 883 additions and 853 deletions
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@ -70,7 +70,7 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QWidget>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include "partadaptor.h"

 #include <memory>
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@ -42,10 +42,10 @@
 #include <KLocale>

 #include <QApplication>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QMenu>
-#include <QPaintEvent>
+
 #include <QPalette>
 #include <QScrollBar>

--- a/akregator/src/articlemodel.h
+++ b/akregator/src/articlemodel.h
@ -24,7 +24,7 @@
 #ifndef AKREGATOR_ARTICLEMODEL_H
 #define AKREGATOR_ARTICLEMODEL_H

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

 #include "akregator_export.h"
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@ -48,8 +48,8 @@
 //#include <qtl.h>

 #include <QDateTime>
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QHash>
 #include <QIcon>
 #include <QList>
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@ -40,7 +40,7 @@
 #include <qdom.h>
 #include <QHash>
 #include <QSet>
-#include <QTime>
+#include <QtCore/qdatetime.h>

 #include <cassert>

--- a/akregator/src/importfeedlistcommand.cpp
+++ b/akregator/src/importfeedlistcommand.cpp
@ -32,7 +32,7 @@
 #include <KInputDialog>
 #include <KLocalizedString>

-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QPointer>
 #include <QTimer>

--- a/akregator/src/loadfeedlistcommand.cpp
+++ b/akregator/src/loadfeedlistcommand.cpp
@ -32,7 +32,7 @@
 #include <KRandom>

 #include <QDateTime>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QPointer>
 #include <QString>
--- a/akregator/src/mainwidget.cpp
+++ b/akregator/src/mainwidget.cpp
@ -79,7 +79,7 @@
 #include <QClipboard>
 #include <QSplitter>
 #include <QTextDocument>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QTimer>

 #include <algorithm>
--- a/ark/app/batchextract.cpp
+++ b/ark/app/batchextract.cpp
@ -44,7 +44,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 BatchExtract::BatchExtract(QObject* parent)
    : KCompositeJob(parent),
--- a/ark/app/mainwindow.cpp
+++ b/ark/app/mainwindow.cpp
@ -40,9 +40,9 @@
 #include <KShortcutsDialog>
 #include <KXMLGUIFactory>

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

 static bool isValidArchiveDrag(const QMimeData *data)
 {
--- a/ark/kerfuffle/addtoarchive.cpp
+++ b/ark/kerfuffle/addtoarchive.cpp
@ -41,7 +41,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 namespace Kerfuffle
 {
--- a/ark/kerfuffle/archiveinterface.h
+++ b/ark/kerfuffle/archiveinterface.h
@ -34,7 +34,7 @@
 #include <QObject>
 #include <QStringList>
 #include <QString>
-#include <QVariantList>
+#include <QtCore/qvariant.h>

 namespace Kerfuffle
 {
--- a/ark/kerfuffle/queries.cpp
+++ b/ark/kerfuffle/queries.cpp
@ -33,7 +33,7 @@
 #include <kio/renamedialog.h>

 #include <QApplication>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 namespace Kerfuffle
 {
--- a/ark/kerfuffle/tests/jsonparser.cpp
+++ b/ark/kerfuffle/tests/jsonparser.cpp
@ -29,7 +29,7 @@

 #include <KDebug>

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

 #include <qjson/parser.h>

--- a/ark/part/archivemodel.cpp
+++ b/ark/part/archivemodel.cpp
@ -33,10 +33,10 @@

 #include <QDir>
 #include <QFont>
-#include <QLatin1String>
+#include <QDateTime>
 #include <QList>
 #include <QMimeData>
-#include <QPersistentModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPixmap>
 #include <QtDBus/QtDBus>

--- a/ark/part/archiveview.cpp
+++ b/ark/part/archiveview.cpp
@ -25,9 +25,9 @@
 #include <KGlobalSettings>

 #include <QApplication>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
+

 ArchiveView::ArchiveView(QWidget *parent)
        : QTreeView(parent)
--- a/ark/part/arkviewer.h
+++ b/ark/part/arkviewer.h
@ -28,7 +28,7 @@
 #include <KParts/ReadOnlyPart>
 #include <KService>

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

 class ArkViewer : public KDialog
 {
--- a/ark/part/interface.h
+++ b/ark/part/interface.h
@ -22,7 +22,7 @@
 #define INTERFACE_H

 #include <QStringList>
-#include <QtPlugin>
+#include <QtCore/qplugin.h>

 class Interface
 {
--- a/ark/part/part.cpp
+++ b/ark/part/part.cpp
@ -61,12 +61,12 @@
 #include <QHeaderView>
 #include <QMenu>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QScopedPointer>
 #include <QSplitter>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtDBus/QtDBus>

 using namespace Kerfuffle;
--- a/ark/part/part.h
+++ b/ark/part/part.h
@ -29,7 +29,7 @@
 #include <KParts/StatusBarExtension>
 #include <KTempDir>

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

 class ArchiveModel;
 class InfoPanel;
--- a/ark/plugins/clilhaplugin/cliplugin.cpp
+++ b/ark/plugins/clilhaplugin/cliplugin.cpp
@ -22,8 +22,8 @@
 #include "cliplugin.h"

 #include "kerfuffle/kerfuffle_export.h"
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 #include <kdebug.h>

 using namespace Kerfuffle;
--- a/ark/plugins/cliplugin-example/cliplugin.cpp
+++ b/ark/plugins/cliplugin-example/cliplugin.cpp
@ -26,8 +26,8 @@
 #include <kdebug.h>

 #include <QDir>
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>

 CliPlugin::CliPlugin(QObject *parent, const QVariantList &args)
    : CliInterface(parent, args),
--- a/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
@ -26,8 +26,8 @@
 #include <bluedevil/bluedevil_export.h>

 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
-#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/qdbusextratypes.h>
+#include <QtDBus/qdbuspendingcall.h>

 namespace BlueDevil {

--- a/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
@ -22,8 +22,8 @@
 #ifndef dbustypes_H
 #define dbustypes_H

-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+#include <QtDBus/qdbusextratypes.h>

 typedef QMap<QString,QVariantMap> QVariantMapMap;
 Q_DECLARE_METATYPE(QVariantMapMap)
--- a/bluedevil/libbluedevil/bluedevil/bluedevildevice.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevildevice.h
@ -30,7 +30,7 @@

 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>

 namespace BlueDevil {

--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
@ -30,7 +30,7 @@
 #include "bluedevil/bluezagentmanager1.h"

 #include <QtCore/QHash>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>

 #include <QtDBus/QDBusConnectionInterface>

--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
@ -26,7 +26,7 @@
 #include <bluedevil/bluedevil_export.h>

 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>

 namespace BlueDevil {

--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
@ -16,6 +16,8 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
 *************************************************************************************/

+#include <QtCore/qdebug.h>
+
 #include "bluedevilmanager.h"
 #include "bluedevilmanager_p.h"
 #include "bluedeviladapter.h"
--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
@ -24,7 +24,7 @@
 #include "bluedevildbustypes.h"

 #include <QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>

 namespace BlueDevil {
 class Adapter;
--- a/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
+++ b/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
@ -28,7 +28,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 #include <QValidator>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 #include <QRegExp>

 #include <KIcon>
--- a/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
+++ b/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
@ -25,7 +25,8 @@

 #include "filereceiver/filereceiver.h"

-#include <QtCore/QProcess>
+#include <QTimer>
+#include <QProcess>
 #include <QDBusServiceWatcher>
 #include <QDBusMetaType>

--- a/bluedevil/src/daemon/kded/bluezagent.h
+++ b/bluedevil/src/daemon/kded/bluezagent.h
@ -24,7 +24,7 @@
 #define BLUEZAGENT_H

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

 class QProcess;
--- a/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
+++ b/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
@ -22,7 +22,7 @@

 #include <QDBusConnection>
 #include <QDBusPendingCall>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QDBusServiceWatcher>

 #include <KDebug>
--- a/bluedevil/src/daemon/kded/filereceiver/obexagent.h
+++ b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
@ -21,7 +21,7 @@

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

 #include <KComponentData>

--- a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
+++ b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
@ -23,13 +23,14 @@
 #include "obex_session.h"
 #include "dbus_properties.h"

-#include <KIcon>
+#include <QDir>
 #include <QDBusConnection>

 #include <bluedevil/bluedevilmanager.h>
 #include <bluedevil/bluedeviladapter.h>
 #include <bluedevil/bluedevildevice.h>

+#include <KIcon>
 #include <KDebug>
 #include <KIO/Job>
 #include <kio/copyjob.h>
--- a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
+++ b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
@ -20,7 +20,7 @@
 #ifndef RECEIVE_FILE_JOB_H
 #define RECEIVE_FILE_JOB_H

-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QDBusMessage>

 #include <KJob>
--- a/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
+++ b/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
@ -24,7 +24,7 @@
 #include <QMenu>
 #include <QAction>
 #include <QWidget>
-#include <QVariantList>
+#include <QtCore/qvariant.h>

 #include <KIcon>
 #include <KPluginFactory>
--- a/bluedevil/src/kcmodule/bluedevildevices.cpp
+++ b/bluedevil/src/kcmodule/bluedevildevices.cpp
@ -27,7 +27,7 @@
 #include <bluedevil/bluedevil.h>

 #include <QtCore/QAbstractItemModel>
-
+#include <QtCore/QTimer>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
--- a/bluedevil/src/kcmodule/bluedevildevices.h
+++ b/bluedevil/src/kcmodule/bluedevildevices.h
@ -21,7 +21,7 @@
 #ifndef _BLUEDEVILDEVICES_H
 #define _BLUEDEVILDEVICES_H

-#include <QtGui/QItemSelection>
+#include <QtGui/qitemselectionmodel.h>

 #include <kcmodule.h>

--- a/bluedevil/src/kcmodule/systemcheck.cpp
+++ b/bluedevil/src/kcmodule/systemcheck.cpp
@ -38,7 +38,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QPainter>
 #include <QtGui/QBoxLayout>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>

 SystemCheck::SystemCheck(QWidget *parent)
    : QObject(parent)
--- a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
+++ b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
@ -21,7 +21,7 @@

 #include "../obexdtypes.h"

-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <kdedmodule.h>

 class KJob;
--- a/bluedevil/src/kio/obexftp/kio_obexftp.cpp
+++ b/bluedevil/src/kio/obexftp/kio_obexftp.cpp
@ -22,6 +22,7 @@
 #include "obexd_file_transfer.h"
 #include "kdedobexftp.h"
 #include "version.h"
+#include <QTimer>
 #include <KDebug>
 #include <KComponentData>
 #include <KCmdLineArgs>
--- a/bluedevil/src/kio/obexftp/kio_obexftp.h
+++ b/bluedevil/src/kio/obexftp/kio_obexftp.h
@ -25,7 +25,7 @@
 #include "kdedobexftp.h"

 #include <QtCore/QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QEventLoop>

 #include <kio/slavebase.h>
--- a/bluedevil/src/kio/obexftp/obexdtypes.h
+++ b/bluedevil/src/kio/obexftp/obexdtypes.h
@ -20,9 +20,9 @@
 #define OBEXD_TYPES_H

 #include <QtCore/QList>
-#include <QtCore/QVariantMap>
-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+
+#include <QtDBus/qdbusextratypes.h>

 typedef QList<QVariantMap> QVariantMapList;
 Q_DECLARE_METATYPE(QVariantMapList);
--- a/bluedevil/src/kio/obexftp/transferfilejob.h
+++ b/bluedevil/src/kio/obexftp/transferfilejob.h
@ -19,7 +19,7 @@
 #ifndef KIO_GET_FILE_JOB_H
 #define KIO_GET_FILE_JOB_H

-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QVariant>

 #include <KJob>
--- a/bluedevil/src/monolithic/monolithic.h
+++ b/bluedevil/src/monolithic/monolithic.h
@ -20,7 +20,7 @@
 #ifndef MONOLITHIC_H
 #define MONOLITHIC_H

-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>

 #include <kstatusnotifieritem.h>

--- a/bluedevil/src/sendfile/discoverwidget.cpp
+++ b/bluedevil/src/sendfile/discoverwidget.cpp
@ -24,7 +24,7 @@
 #include "discoverwidget.h"
 #include "ui_discover.h"

-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
--- a/bluedevil/src/sendfile/pages/connectingpage.h
+++ b/bluedevil/src/sendfile/pages/connectingpage.h
@ -25,7 +25,7 @@

 #include "ui_connecting.h"

-#include <QtGui/QWizardPage>
+#include <QtGui/qwizard.h>

 class ConnectingPage : public QWizardPage,
 public Ui::Connecting
--- a/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
@ -25,7 +25,7 @@

 #include "ui_selectfilediscover.h"

-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class KUrl;
 class QWizard;
--- a/bluedevil/src/sendfile/pages/selectdevicepage.h
+++ b/bluedevil/src/sendfile/pages/selectdevicepage.h
@ -25,7 +25,7 @@

 #include "ui_selectfilediscover.h"

-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class KUrl;
 class QWizard;
--- a/bluedevil/src/sendfile/pages/selectfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectfilespage.h
@ -23,7 +23,7 @@
 #ifndef SELECTFILESPAGE_H
 #define SELECTFILESPAGE_H

-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class QWizard;
 class KFileWidget;
--- a/bluedevil/src/sendfile/sendfilesjob.h
+++ b/bluedevil/src/sendfile/sendfilesjob.h
@ -25,7 +25,7 @@

 #include <QList>
 #include <QStringList>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>

 #include <kcompositejob.h>
 #include <KFileItemList>
--- a/bluedevil/src/wizard/pages/discoverpage.cpp
+++ b/bluedevil/src/wizard/pages/discoverpage.cpp
@ -22,11 +22,11 @@
 #include "../bluewizard.h"
 #include "../wizardagent.h"

-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>

 #include <KDebug>
 #include <KLocale>
--- a/bluedevil/src/wizard/pages/discoverpage.h
+++ b/bluedevil/src/wizard/pages/discoverpage.h
@ -20,7 +20,7 @@
 #define DISCOVERPAGE_H

 #include "ui_discover.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;

--- a/bluedevil/src/wizard/pages/fail.h
+++ b/bluedevil/src/wizard/pages/fail.h
@ -25,7 +25,7 @@
 #define FAIL_H

 #include "ui_fail.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
--- a/bluedevil/src/wizard/pages/keyboardpairing.h
+++ b/bluedevil/src/wizard/pages/keyboardpairing.h
@ -25,7 +25,7 @@
 #define KEYBOARDPAIRING_H

 #include "ui_keyboardpairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
--- a/bluedevil/src/wizard/pages/legacypairing.h
+++ b/bluedevil/src/wizard/pages/legacypairing.h
@ -25,7 +25,7 @@
 #define LEGACYPAIRING_H

 #include "ui_legacypairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
--- a/bluedevil/src/wizard/pages/legacypairingdatabase.h
+++ b/bluedevil/src/wizard/pages/legacypairingdatabase.h
@ -25,7 +25,7 @@
 #define LEGACYPAIRINGDATABASE_H

 #include "ui_nopairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
--- a/bluedevil/src/wizard/pages/nopairing.h
+++ b/bluedevil/src/wizard/pages/nopairing.h
@ -26,7 +26,7 @@

 #include "ui_nopairing.h"
 #include <QWizard>
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
--- a/bluedevil/src/wizard/pages/ssppairing.h
+++ b/bluedevil/src/wizard/pages/ssppairing.h
@ -25,7 +25,7 @@
 #define SSPPAIRINGPAGE_H

 #include "ui_ssppairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 #include <QDBusMessage>

 class BlueWizard;
--- a/bluedevil/src/wizard/pages/success.h
+++ b/bluedevil/src/wizard/pages/success.h
@ -25,7 +25,7 @@
 #define SUCCESS_H

 #include "ui_success.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>

 class BlueWizard;

--- a/bluedevil/src/wizard/wizardagent.h
+++ b/bluedevil/src/wizard/wizardagent.h
@ -24,7 +24,7 @@

 #include <QtDBus>
 #include <QApplication>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>

 namespace BlueDevil {
    class Device;
--- a/dragon/src/app/adjustSizeButton.cpp
+++ b/dragon/src/app/adjustSizeButton.cpp
@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QPainter>
-#include <QTimerEvent>
+#include <QtCore/qcoreevent.h>

 #include "extern.h"
 #include "theStream.h"
--- a/dragon/src/app/analyzer/blockAnalyzer.cpp
+++ b/dragon/src/app/analyzer/blockAnalyzer.cpp
@ -27,8 +27,8 @@

 #include <QPainter>        //paletteChange()
 //Added by qt3to4:
-#include <QContextMenuEvent>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
+

 static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }

--- a/dragon/src/app/analyzer/blockAnalyzer.h
+++ b/dragon/src/app/analyzer/blockAnalyzer.h
@ -20,9 +20,9 @@
 #include "analyzerBase.h"
 #include <QColor>
 //Added by qt3to4:
-#include <QResizeEvent>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+
+
+#include <QtGui/qevent.h>
 #include <QPixmap>

 class QResizeEvent;
--- a/dragon/src/app/discSelectionDialog.cpp
+++ b/dragon/src/app/discSelectionDialog.cpp
@ -24,7 +24,7 @@
 #include "videoWindow.h"

 #include <QLabel>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QVBoxLayout>

 #include <KListWidget>
--- a/dragon/src/app/fullScreenToolBarHandler.cpp
+++ b/dragon/src/app/fullScreenToolBarHandler.cpp
@ -25,7 +25,7 @@
 #include "mainWindow.h"

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

 #include <KDebug>
--- a/dragon/src/app/mainWindow.cpp
+++ b/dragon/src/app/mainWindow.cpp
@ -51,13 +51,13 @@
 #include <QActionGroup>
 #include <QDesktopWidget>
 #include <QDockWidget>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QEvent>        //::stateChanged()
-#include <QKeyEvent>
+
 #include <QLabel>
 #include <QLayout>      //ctor
-#include <QMouseEvent>
+
 #include <QObject>
 #include <QTimer>
 #include <QStackedWidget>
--- a/dragon/src/app/part.cpp
+++ b/dragon/src/app/part.cpp
@ -36,7 +36,7 @@

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

 K_PLUGIN_FACTORY(CodeineFactory, registerPlugin<Dragon::Part>();)
--- a/dragon/src/app/partToolBar.cpp
+++ b/dragon/src/app/partToolBar.cpp
@ -23,7 +23,7 @@

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

 MouseOverToolBar::MouseOverToolBar( QWidget *parent )
      : KToolBar( parent )
--- a/dragon/src/app/recentlyPlayedList.cpp
+++ b/dragon/src/app/recentlyPlayedList.cpp
@ -30,7 +30,7 @@

 #include <QFile>
 #include <QFileInfo>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>

 //this is a widget for dispaying the rcently played items in a list. It is subclassed so that we can hook up a context menu
 RecentlyPlayedList::RecentlyPlayedList(QWidget *parent)
--- a/dragon/src/app/textItem.cpp
+++ b/dragon/src/app/textItem.cpp
@ -23,7 +23,7 @@
 #include <KDebug>

 #include <QTextDocument>
-#include <QSizeF>
+#include <QtCore/qsize.h>
 #include <QWidget>

 ExpandingTextItem::ExpandingTextItem(QGraphicsWidget* parent)
--- a/dragon/src/app/textItem.h
+++ b/dragon/src/app/textItem.h
@ -22,7 +22,7 @@
 #define TEXTITEM_H

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

 /**
 * A QGV text widget which will automatically change its font size based on 
--- a/dragon/src/app/videoWindow.cpp
+++ b/dragon/src/app/videoWindow.cpp
@ -30,7 +30,7 @@
 #include "theStream.h"

 #include <QActionGroup>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QTimer>
 #include <QVBoxLayout>
--- a/dragon/src/app/videoWindow.h
+++ b/dragon/src/app/videoWindow.h
@ -24,7 +24,7 @@

 #include "codeine.h"

-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <QWidget>

 #include <Phonon/Path>
--- a/dragon/src/mpris2/mediaplayer2player.h
+++ b/dragon/src/mpris2/mediaplayer2player.h
@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MEDIAPLAYRER2PLAYER_H

 #include <QDBusAbstractAdaptor>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>

 #include <Phonon/MediaSource>

--- a/dragon/src/mpris2/mpris2.cpp
+++ b/dragon/src/mpris2/mpris2.cpp
@ -25,7 +25,7 @@

 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QMetaClassInfo>
+#include <QtCore/qmetaobject.h>
 #include <QStringList>

 #include <unistd.h>
--- a/dragon/src/mpris2/mpris2.h
+++ b/dragon/src/mpris2/mpris2.h
@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MPRIS2_H

 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>

 class Mpris2 : public QObject
 {
--- a/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
+++ b/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
@ -25,7 +25,7 @@
 #include <cmath>
 #include <qglobal.h>
 #include <sys/stat.h>
-#include <QTime>
+#include <QtCore/qdatetime.h>


 using namespace std;
--- a/filelight/src/part/radialMap/labels.cpp
+++ b/filelight/src/part/radialMap/labels.cpp
@ -19,6 +19,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/

+#include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QPainter>
--- a/filelight/src/part/radialMap/widget.h
+++ b/filelight/src/part/radialMap/widget.h
@ -25,11 +25,11 @@
 #include <KJob>
 #include <KUrl>

-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
+#include <QtGui/qevent.h>
+
+
+
+
 #include <QtGui/QWidget>
 #include <QtCore/QTimer>

--- a/filelight/src/part/radialMap/widgetEvents.cpp
+++ b/filelight/src/part/radialMap/widgetEvents.cpp
@ -42,11 +42,11 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QPainter>
 #include <QtCore/QTimer>      //::resizeEvent()
-#include <QtGui/QDropEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QDragEnterEvent>
+
+
+
+
+#include <QtGui/qevent.h>
 #include <QtGui/QToolTip>

 #include <cmath>         //::segmentAt()
--- a/filelight/src/part/settingsDialog.cpp
+++ b/filelight/src/part/settingsDialog.cpp
@ -27,7 +27,7 @@
 #include <KMessageBox>

 #include <QtGui/QRadioButton>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QDir>

 SettingsDialog::SettingsDialog(QWidget *parent) : KDialog(parent)
--- a/filelight/src/part/settingsDialog.h
+++ b/filelight/src/part/settingsDialog.h
@ -25,7 +25,7 @@
 #include "ui_dialog.h" //generated by uic

 #include <QtCore/QTimer>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>

 #include <kdialog.h>

--- a/filelight/src/part/summaryWidget.cpp
+++ b/filelight/src/part/summaryWidget.cpp
@ -42,7 +42,7 @@
 #include <QtGui/QApplication>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QLayout>

 struct Disk
--- a/gwenview/app/browsemainpage.cpp
+++ b/gwenview/app/browsemainpage.cpp
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_browsemainpage.cpp"

 // Qt
-#include <QDropEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QSlider>
 #include <QToolTip>
--- a/gwenview/app/filtercontroller.cpp
+++ b/gwenview/app/filtercontroller.cpp
@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QAction>
 #include <QCompleter>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QLineEdit>
 #include <QPainter>
 #include <QPainterPath>
--- a/gwenview/app/folderviewcontextmanageritem.cpp
+++ b/gwenview/app/folderviewcontextmanageritem.cpp
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include "folderviewcontextmanageritem.h"

 // Qt
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QTreeView>

--- a/gwenview/app/infocontextmanageritem.cpp
+++ b/gwenview/app/infocontextmanageritem.cpp
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Qt
 #include <QApplication>
 #include <QGridLayout>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QPainter>
 #include <QPointer>
--- a/gwenview/app/sidebar.cpp
+++ b/gwenview/app/sidebar.cpp
@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QLabel>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionTabV3>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTabBar>
 #include <QToolButton>
--- a/gwenview/importer/importdialog.cpp
+++ b/gwenview/importer/importdialog.cpp
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA

 // Qt
 #include <QApplication>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QStackedWidget>

 // KDE
--- a/gwenview/importer/thumbnailpage.h
+++ b/gwenview/importer/thumbnailpage.h
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #define THUMBNAILPAGE_H

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

 // KDE
--- a/gwenview/lib/abstractimageoperation.h
+++ b/gwenview/lib/abstractimageoperation.h
@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/gwenviewlib_export.h>

 // Qt
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>

 // KDE

--- a/gwenview/lib/crop/croptool.cpp
+++ b/gwenview/lib/crop/croptool.cpp
@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Qt
 #include <qmath.h>
 #include <QApplication>
-#include <QFlags>
-#include <QGraphicsSceneMouseEvent>
-#include <QMouseEvent>
+#include <QtCore/qglobal.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QRect>
 #include <QScrollBar>
--- a/gwenview/lib/datewidget.cpp
+++ b/gwenview/lib/datewidget.cpp
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_datewidget.cpp"

 // Qt
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QHBoxLayout>

 // KDE
--- a/gwenview/lib/document/document_p.h
+++ b/gwenview/lib/document/document_p.h
@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QObject>
 #include <QQueue>
 #include <QUndoStack>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 namespace Gwenview
 {
--- a/gwenview/lib/documentview/abstractimageview.cpp
+++ b/gwenview/lib/documentview/abstractimageview.cpp
@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA

 // Qt
 #include <QCursor>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>

 namespace Gwenview
 {
--- a/gwenview/lib/documentview/documentview.cpp
+++ b/gwenview/lib/documentview/documentview.cpp
@ -27,14 +27,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-#include <QMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 // KDE
 #include <KDebug>
--- a/gwenview/lib/documentview/documentviewcontainer.cpp
+++ b/gwenview/lib/documentview/documentviewcontainer.cpp
@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA

 // Qt
 #include <QEvent>
-#include <QGLWidget>
+#include <QGL>
 #include <QGraphicsScene>
 #include <QPropertyAnimation>
 #include <QTimer>
--- a/gwenview/lib/documentview/rasterimageview.cpp
+++ b/gwenview/lib/documentview/rasterimageview.cpp
@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KDebug>

 // Qt
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>

 // LCMS2
 #include <lcms2.h>
--- a/Show more
+++ b/Show more