generic: make changes required for building against katie

cmake/modules/CMakeLists.txt

@@ -85,10 +85,12 @@ set(cmakeFiles
                FindPyQt4.cmake
                Qt4Macros.cmake
                Qt4ConfigDependentSettings.cmake
+               KatieMacros.cmake
                FindPythonLibrary.cmake
                FindQCA2.cmake
                FindQImageBlitz.cmake
                FindQt4.cmake
+               FindKatie.cmake
                FindRUBY.cmake
                FindSIP.cmake
                FindSamba.cmake

cmake/modules/FindKDE4Internal.cmake

@@ -375,11 +375,9 @@ set(QT_USE_IMPORTED_TARGETS TRUE)
 
 #this line includes FindQt4.cmake, which searches the Qt library and headers
 # TODO: we should check here that all necessary modules of Qt have been found, e.g. QtDBus
+# TODO: use _REQ_STRING_KDE4
 set(KATIE_COMPAT TRUE)
 find_package(Katie)
-if(NOT KATIE_FOUND)
-    find_package(Qt4 ${_REQ_STRING_KDE4})
-endif()
 
 # Perl is not required for building KDE software, but we had that here since 4.0
 find_package(Perl)

cmake/modules/FindKatie.cmake

@@ -13,8 +13,13 @@
 #  KATIE_MOC_EXECUTABLE
 #  KATIE_UIC_EXECUTABLE
 #  KATIE_RCC_EXECUTABLE
-#  KATIE_DBUSXML2CPP_EXECUTABLE
-#  KATIE_DBUSCPP2XML_EXECUTABLE
+#  KATIE_QDBUSXML2CPP_EXECUTABLE
+#  KATIE_QDBUSCPP2XML_EXECUTABLE
+#  KATIE_QHELPGENERATOR_EXECUTABLE
+#  KATIE_QCOLLECTIONGENERATOR_EXECUTABLE
+#  KATIE_LUPDATE_EXECUTABLE
+#  KATIE_LRELEASE_EXECUTABLE
+#  KATIE_LCONVERT_EXECUTABLE
 #
 # In addition the following macros will be defined:
 #
@@ -34,8 +39,11 @@ endif(KATIE_INCLUDES AND KATIE_LIBRARIES)
 if(Katie_FIND_COMPONENTS)
     set(KATIECOMPONENTS ${Katie_FIND_COMPONENTS})
 else()
-    set(KATIECOMPONENTS Core Gui Network Multimedia OpenGL Sql Svg Test DBus Xml XmlPatterns Script ScriptTools WebKit Declarative)
+    # TODO: add Multimedia once it builds
+    set(KATIECOMPONENTS Core Gui Network OpenGL Sql Svg Test DBus Xml XmlPatterns Script ScriptTools WebKit Declarative Help UiTools)
 endif()
+# TODO: designer, linguist?
+set(KATIETOOLS moc uic rcc qdbusxml2cpp qdbuscpp2xml qhelpgenerator qcollectiongenerator lupdate lrelease lconvert)
 
 set(KATIE_FOUND TRUE)
 set(KATIE_INCLUDES ${CMAKE_BINARY_DIR}/_generated_)
@@ -52,55 +60,18 @@ find_path(KATIE_MKSPECS_DIR
     $ENV{QTDIR}/share
 )
 
-find_program(KATIE_MOC_EXECUTABLE
-    NAMES
-    moc moc-qt4
-    HINTS
-    /bin
-    /usr/bin
-    /usr/local/bin
-    $ENV{QTDIR}/bin
-)
-
-find_program(KATIE_UIC_EXECUTABLE
-    NAMES
-    uic uic-qt4
-    HINTS
-    /bin
-    /usr/bin
-    /usr/local/bin
-    $ENV{QTDIR}/bin
-)
-
-find_program(KATIE_RCC_EXECUTABLE
-    NAMES
-    rcc rcc-qt4
-    HINTS
-    /bin
-    /usr/bin
-    /usr/local/bin
-    $ENV{QTDIR}/bin
-)
-
-find_program(KATIE_DBUSXML2CPP_EXECUTABLE
-    NAMES
-    qdbusxml2cpp qdbusxml2cpp-qt4
-    HINTS
-    /bin
-    /usr/bin
-    /usr/local/bin
-    $ENV{QTDIR}/bin
-)
-
-find_program(KATIE_DBUSCPP2XML_EXECUTABLE
-    NAMES
-    qdbuscpp2xml qdbuscpp2xml-qt4
-    HINTS
-    /bin
-    /usr/bin
-    /usr/local/bin
-    $ENV{QTDIR}/bin
-)
+foreach(tool ${KATIETOOLS})
+    string(TOUPPER ${tool} uppertool)
+    find_program(KATIE_${uppertool}_EXECUTABLE
+        NAMES
+        ${tool} ${tool}-qt4 ${tool}-katie
+        HINTS
+        /bin
+        /usr/bin
+        /usr/local/bin
+        $ENV{QTDIR}/bin
+    )
+endforeach()
 
 foreach(component ${KATIECOMPONENTS})
     string(TOUPPER KATIE_${component} uppercomp)
@@ -170,7 +141,7 @@ if(${KATIE_COMPAT} AND KATIE_FOUND)
     set(QT_FOUND TRUE)
     set(QT4_FOUND TRUE)
     set(QT_VERSION_MAJOR ${KATIE_MAJOR})
-    set(QT_VERSION_MINOR.${KATIE_MINOR})
+    set(QT_VERSION_MINOR ${KATIE_MINOR})
     set(QT_VERSION_PATCH ${KATIE_MICRO})
     set(QT_VERSION ${KATIE_VERSION})
     set(QT_INCLUDES ${KATIE_INCLUDES})
@@ -179,47 +150,36 @@ if(${KATIE_COMPAT} AND KATIE_FOUND)
     set(QT_MOC_EXECUTABLE ${KATIE_MOC_EXECUTABLE})
     set(QT_UIC_EXECUTABLE ${KATIE_UIC_EXECUTABLE})
     set(QT_RCC_EXECUTABLE ${KATIE_RCC_EXECUTABLE})
-    set(QT_DBUSXML2CPP_EXECUTABLE ${KATIE_DBUSXML2CPP_EXECUTABLE})
-    set(QT_DBUSCPP2XML_EXECUTABLE ${KATIE_DBUSCPP2XML_EXECUTABLE})
+    set(QT_DBUSXML2CPP_EXECUTABLE ${KATIE_QDBUSXML2CPP_EXECUTABLE})
+    set(QT_DBUSCPP2XML_EXECUTABLE ${KATIE_QDBUSCPP2XML_EXECUTABLE})
+    set(QT_LUPDATE_EXECUTABLE ${KATIE_LUPDATE_EXECUTABLE})
+    set(QT_LRELEASE_EXECUTABLE ${KATIE_LRELEASE_EXECUTABLE})
     set(QT_MKSPECS_DIR ${KATIE_MKSPECS_DIR})
 
-    add_executable(Qt4::moc IMPORTED)
-    set_property(TARGET Qt4::moc PROPERTY IMPORTED_LOCATION ${KATIE_MOC_EXECUTABLE})
-    add_executable(Qt4::uic IMPORTED)
-    set_property(TARGET Qt4::uic PROPERTY IMPORTED_LOCATION ${KATIE_UIC_EXECUTABLE})
-    add_executable(Qt4::rcc IMPORTED)
-    set_property(TARGET Qt4::rcc PROPERTY IMPORTED_LOCATION ${KATIE_RCC_EXECUTABLE})
+    if(NOT "${KATIE_FIND_QUIETLY}")
+        foreach(tool ${KATIETOOLS})
+            string(TOUPPER ${tool} uppertool)
+            add_executable(Qt4::${tool} IMPORTED)
+            set_property(TARGET Qt4::${tool} PROPERTY IMPORTED_LOCATION ${KATIE_${uppertool}_EXECUTABLE})
+        endforeach()
 
-    set(QT_QTCORE_FOUND "${KATIE_CORE_FOUND}")
-    set(QT_QTCORE_LIBRARY "${KATIE_CORE_LIBRARIES}")
-    set(QT_QTGUI_FOUND "${KATIE_GUI_FOUND}")
-    set(QT_QTGUI_LIBRARY "${KATIE_GUI_LIBRARIES}")
-    set(QT_QTNETWORK_FOUND "${KATIE_NETWORK_FOUND}")
-    set(QT_QTNETWORK_LIBRARY "${KATIE_NETWORK_LIBRARIES}")
-    set(QT_QTMULTIMEDIA_FOUND "${KATIE_MULTIMEDIA_FOUND}")
-    set(QT_QTMULTIMEDIA_LIBRARY "${KATIE_MULTIMEDIA_LIBRARIES}")
-    set(QT_QTOPENGL_FOUND "${KATIE_OPENGL_FOUND}")
-    set(QT_QTOPENGL_LIBRARY "${KATIE_OPENGL_LIBRARIES}")
-    set(QT_QTSQL_FOUND "${KATIE_SQL_FOUND}")
-    set(QT_QTSQL_LIBRARY "${KATIE_SQL_LIBRARIES}")
-    set(QT_QTSVG_FOUND "${KATIE_SVG_FOUND}")
-    set(QT_QTSVG_LIBRARY "${KATIE_SVG_LIBRARIES}")
-    set(QT_QTTEST_FOUND "${KATIE_TEST_FOUND}")
-    set(QT_QTTEST_LIBRARY "${KATIE_TEST_LIBRARIES}")
-    set(QT_QTDBUS_LIBRARY "${KATIE_DBUS_LIBRARIES}")
-    set(QT_QTDBUS_FOUND "${KATIE_DBUS_FOUND}")
-    set(QT_QTXML_FOUND "${KATIE_XML_FOUND}")
-    set(QT_QTXML_LIBRARY "${KATIE_XML_LIBRARIES}")
-    set(QT_QTXMLPATTERNS_FOUND "${KATIE_XMLPATTERNS_FOUND}")
-    set(QT_QTXMLPATTERNS_LIBRARY "${KATIE_XMLPATTERNS_LIBRARIES}")
-    set(QT_QTSCRIPT_FOUND "${KATIE_SCRIPT_FOUND}")
-    set(QT_QTSCRIPT_LIBRARY "${KATIE_SCRIPT_LIBRARIES}")
-    set(QT_QTSCRIPTTOOLS_FOUND "${KATIE_SCRIPTTOOLS_FOUND}")
-    set(QT_QTSCRIPTTOOLS_LIBRARY "${KATIE_SCRIPTTOOLS_LIBRARIES}")
-    set(QT_QTWEBKIT_FOUND "${KATIE_WEBKIT_FOUND}")
-    set(QT_QTWEBKIT_LIBRARY "${KATIE_WEBKIT_LIBRARIES}")
-    set(QT_QTDECLARATIVE_FOUND "${KATIE_DECLARATIVE_FOUND}")
-    set(QT_QTDECLARATIVE_LIBRARY "${KATIE_DECLARATIVE_LIBRARIES}")
+        # XXX: should those be defined conditionally based on requested components?
+        foreach(component ${KATIECOMPONENTS})
+            add_library(Qt4::Qt${component} ${KATIE_TYPE} IMPORTED)
+        endforeach()
+    endif()
+
+    # bad assumption
+    if(UNIX)
+        set(Q_WS_X11 TRUE)
+        find_package(X11 REQUIRED)
+    endif()
+
+    foreach(component ${KATIECOMPONENTS})
+        string(TOUPPER ${component} uppercomp)
+        set(QT_QT${uppercomp}_FOUND "${KATIE_${uppercomp}_FOUND}")
+        set(QT_QT${uppercomp}_LIBRARY "${KATIE_${uppercomp}_LIBRARIES}")
+    endforeach()
     include(Qt4Macros)
 endif()
 

cmake/modules/FindQt4.cmake

@@ -0,0 +1 @@
+FindKatie.cmake

cmake/modules/KatieMacros.cmake

@@ -11,7 +11,7 @@ if(NOT "${KATIE_MOC_EXECUTABLE}")
     set(KATIE_MOC_EXECUTABLE "moc")
 endif()
 if(NOT "${KATIE_DBUSXML2CPP_EXECUTABLE}")
-    set(KATIE_DBUSXML2CPP_EXECUTABLE "dbusxml2cpp")
+    set(KATIE_DBUSXML2CPP_EXECUTABLE "qdbusxml2cpp")
 endif()
 
 macro(KATIE_RESOURCES RESOURCES)

dnssd/avahi_entrygroup_interface.h

@@ -12,7 +12,7 @@
 #define AVAHI_ENTRYGROUP_INTERFACE_H_1175536773
 
 #include <QtCore/QObject>
-#include <QtCore/QByteRef>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QString>

dnssd/avahi_server_interface.h

@@ -12,7 +12,7 @@
 #define AVAHI_SERVER_INTERFACE_H_1175535514
 
 #include <QtCore/QObject>
-#include <QtCore/QByteRef>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QString>

dnssd/avahi_serviceresolver_interface.h

@@ -12,7 +12,7 @@
 #define AVAHI_SERVICERESOLVER_INTERFACE_H_1175536773
 
 #include <QtCore/QObject>
-#include <QtCore/QByteRef>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QString>

experimental/libkdeclarative/kdeclarative.cpp

@@ -30,7 +30,7 @@
 #include <QtDeclarative/qdeclarativedebug.h>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValueIterator>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <kcmdlineargs.h>
 #include <kdebug.h>

experimental/libkdeclarative/private/kdeclarative_p.h

@@ -22,7 +22,7 @@
 
 #include "kdeclarative.h"
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 class KDeclarativePrivate
 {

interfaces/kimproxy/library/kimproxy.cpp

@@ -23,7 +23,7 @@
 
 #include "kimproxy.h"
 
-#include <QtCore/QBool>
+#include <QtCore/qglobal.h>
 #include <QtGui/QPixmapCache>
 
 #include <kapplication.h>

interfaces/kmediaplayer/kmediaplayeradaptor.cpp

@@ -8,8 +8,8 @@
  */
 
 #include "kmediaplayeradaptor_p.h"
-#include <QtCore/QArgument>
-#include <QtCore/QByteRef>
+#include <QtCore/qobjectdefs.h>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QString>

interfaces/ktexteditor/codecompletionmodel.h

@@ -21,7 +21,7 @@
 #define KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODEL_H
 
 #include <ktexteditor/ktexteditor_export.h>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <ktexteditor/range.h>
 
 namespace KTextEditor {

interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp

@@ -19,7 +19,7 @@
 
 #include "codecompletionmodelcontrollerinterface.h"
 
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <ktexteditor/view.h>
 #include <ktexteditor/document.h>

interfaces/ktexteditor/ktexteditor.cpp

@@ -17,6 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include <QtCore/qcoreapplication.h>
 #include <QtDBus/QtDBus>
 
 #include "cursor.h"

interfaces/ktexteditor/templateinterface.cpp

@@ -22,7 +22,7 @@
 #include <QtCore/QString>
 #include <klocale.h>
 #include <kglobal.h>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QRegExp>
 #include <kmessagebox.h>
 #include <kcalendarsystem.h>

kdecore/auth/backends/dbus/DBusBackend.cpp

@@ -23,7 +23,7 @@
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusPendingCall>
-#include <QtCore/QLatin1String>
+#include <QtCore/qstring.h>
 #include <QtCore/QStringList>
 #include <QtCore/QRegExp>
 

kdecore/auth/backends/dbus/DBusHelperProxy.cpp

@@ -27,6 +27,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QDebug>
 #include <QTimer>
+#include <QtCore/qeventloop.h>
 
 #include <klocalizedstring.h>
 

kdecore/config/conversion_check.h

@@ -25,7 +25,7 @@
 #include <QtCore/QString>
 #include <QtGui/QColor>
 #include <QtGui/QFont>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QPoint>
 #include <QtCore/QSize>
 #include <QtCore/QRect>

kdecore/config/kconfiggroup.cpp

@@ -31,7 +31,7 @@
 #include "kconfigdata.h"
 #include <kdebug.h>
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QSharedData>
 #include <QtCore/QFile>
 #include <QtCore/QPoint>

kdecore/config/kconfiggroup.h

@@ -28,7 +28,7 @@
 
 #include <kdecore_export.h>
 
-#include <QtCore/QExplicitlySharedDataPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
 

kdecore/config/kcoreconfigskeleton.h

@@ -29,7 +29,7 @@
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QHash>
 #include <QtCore/QRect>
 #include <QtCore/QStringList>

kdecore/date/kcalendarera.cpp

@@ -23,7 +23,7 @@
 
 #include "kdebug.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 KCalendarEra::KCalendarEra()
 {

kdecore/date/kcalendarera_p.h

@@ -21,7 +21,7 @@
 #define KCALENDARERA_H
 
 #include <QtCore/QString>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 #include "klocale.h"
 

kdecore/date/kcalendarsystem.h

@@ -27,7 +27,7 @@
 #include "kglobal.h"
 
 #include <QtCore/QStringList>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 class KCalendarSystemPrivate;
 class KCalendarEra;

kdecore/date/kcalendarsystemcoptic.cpp

@@ -24,8 +24,8 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 // Shared d pointer implementations
 

kdecore/date/kcalendarsystemethiopian.cpp

@@ -23,8 +23,8 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 //Reuse the Coptic private implementation
 class KCalendarSystemEthiopianPrivate : public KCalendarSystemCopticPrivate

kdecore/date/kcalendarsystemgregorian.cpp

@@ -28,8 +28,8 @@
 #include "kglobal.h"
 #include "kconfiggroup.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 // Shared d pointer base class definitions
 

kdecore/date/kcalendarsystemhebrew.cpp

@@ -28,8 +28,8 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 static int hebrewDaysElapsed(int y);
 

kdecore/date/kcalendarsystemindiannational.cpp

@@ -23,8 +23,8 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 class KCalendarSystemIndianNationalPrivate : public KCalendarSystemPrivate
 {

kdecore/date/kcalendarsystemislamiccivil.cpp

@@ -22,7 +22,7 @@
 #include "kcalendarsystemislamiccivil_p.h"
 #include "kcalendarsystemprivate_p.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate
 {

kdecore/date/kcalendarsystemjalali.cpp

@@ -30,7 +30,7 @@
 #include "kcalendarsystemjalali_p.h"
 #include "kcalendarsystemprivate_p.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate
 {

kdecore/date/kcalendarsystemjapanese.cpp

@@ -23,7 +23,7 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 //Reuse the Gregorian private implementation
 class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianPrivate

kdecore/date/kcalendarsystemjulian.cpp

@@ -25,8 +25,8 @@
 #include "kglobal.h"
 #include "kconfiggroup.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 class KCalendarSystemJulianPrivate : public KCalendarSystemPrivate
 {

kdecore/date/kcalendarsystemminguo.cpp

@@ -23,7 +23,7 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 //Reuse the Gregorian private implementation
 class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianPrivate

kdecore/date/kcalendarsystemqdate.cpp

@@ -30,8 +30,8 @@
 #include "kglobal.h"
 #include "kconfiggroup.h"
 
-#include <QtCore/QDate>
-#include <QtCore/QCharRef>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qstring.h>
 
 class KCalendarSystemQDatePrivate : public KCalendarSystemPrivate
 {

kdecore/date/kcalendarsystemthai.cpp

@@ -23,7 +23,7 @@
 #include "kdebug.h"
 #include "klocale.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 //Reuse the Gregorian private implementation
 class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianPrivate

kdecore/date/kdatetime.h

@@ -30,7 +30,7 @@
 #include <ktimezone.h>
 
 #include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 class QDataStream;
 class KDateTimePrivate;

kdecore/date/kdatetimeformatter.cpp

@@ -20,7 +20,7 @@
 
 #include "kdatetimeformatter_p.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QChar>

kdecore/date/kdayperiod.cpp

@@ -21,7 +21,7 @@
 
 #include <QtCore/QSharedData>
 #include <QtCore/QString>
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 
 class KDayPeriodPrivate : public QSharedData
 {

kdecore/date/kdayperiod_p.h

@@ -20,7 +20,7 @@
 #ifndef KDAYPERIOD_H
 #define KDAYPERIOD_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 #include "klocale.h"
 #include <kdecore_export.h>

kdecore/date/klocalizeddate.h

@@ -21,7 +21,7 @@
 #define KLOCALIZEDDATE_H
 
 #include <QtCore/QString>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 #include <kdecore_export.h>
 #include "kcalendarsystem.h"

kdecore/date/ktimezone.h

@@ -38,7 +38,7 @@
 #include <QtCore/QList>
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 class KTimeZone;
 class KTimeZoneBackend;

kdecore/io/karchive.h

@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QHash>

kdecore/io/kautosavefile.cpp

@@ -21,7 +21,7 @@
 
 #include <stdio.h> // for FILENAME_MAX
 
-#include <QtCore/QLatin1Char>
+#include <QtCore/qchar.h>
 #include <QtCore/QCoreApplication>
 #include "klockfile.h"
 #include "krandom.h"

kdecore/io/klockfile_unix.cpp

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QFile>
 #include <QTextStream>
 

kdecore/io/kmessage.cpp

@@ -20,7 +20,7 @@
 
 #include <kglobal.h>
 
-#include <QtCore/QLatin1String>
+#include <QtCore/qstring.h>
 
 #include <iostream>
 

kdecore/io/kurl.cpp

@@ -38,7 +38,7 @@
 #include <unistd.h>
 
 #include <QtCore/QDir>
-#include <QtCore/QMutableStringListIterator>
+#include <QtCore/qstringlist.h>
 #include <QtCore/QRegExp>
 #include <QtCore/QMimeData>
 #include <QtCore/QTextCodec>

kdecore/io/kzip.cpp

@@ -26,7 +26,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QFile>
 #include <QtCore/QDir>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QList>
 
 #include <zlib.h>

kdecore/kconfig_compiler/kconfig_compiler.cpp

@@ -32,7 +32,7 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtCore/QTextStream>
-#include <QtXml/QDomAttr>
+#include <QtXml/qdom.h>
 #include <QtCore/QRegExp>
 #include <QtCore/QStringList>
 

kdecore/kernel/kaboutdata.h

@@ -30,7 +30,7 @@
 
 // Qt
 #include <QtCore/QString>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 template <class T> class QList;
 class QVariant;

kdecore/kernel/kauthorized.cpp

@@ -37,8 +37,8 @@
 #include <kconfiggroup.h>
 
 #include <QMutex>
-#include <QMutexLocker>
-#include <QtCore/QBool>
+#include <QtCore/qmutex.h>
+#include <QtCore/qglobal.h>
 
 extern bool kde_kiosk_exception;
 

kdecore/kernel/kcmdlineargs.h

@@ -20,7 +20,7 @@
 #define KCMDLINEARGS_H
 
 #include <kdecore_export.h>
-#include <QtCore/QBool>
+#include <QtCore/qglobal.h>
 
 #include <klocale.h>
 

kdecore/kernel/kcomponentdata.cpp

@@ -31,7 +31,7 @@
 #include "klocale.h"
 #include "kconfiggroup.h"
 #include "kstandarddirs.h"
-#include <QtDebug>
+#include <QtCore/qdebug.h>
 
 KComponentData::KComponentData()
     : d(0)

kdecore/kernel/kcomponentdata_p.h

@@ -21,8 +21,8 @@
 #define KERNEL_KCOMPONENTDATA_P_H
 
 #include "kcomponentdata.h"
-#include <QAtomicInt>
-#include <QtDebug>
+#include <QtCore/qatomic.h>
+#include <QtCore/qdebug.h>
 #include <QString>
 
 #include <kconfig.h>

kdecore/kernel/kglobal.cpp

@@ -27,7 +27,7 @@
 #include "kglobal.h"
 #include "kglobal_p.h"
 #include <QThread>
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 
 #include <config.h>
 

kdecore/kernel/kglobal.h

@@ -20,7 +20,7 @@
 #define KGLOBAL_H
 
 #include <kdecore_export.h>
-#include <QtCore/QAtomicPointer>
+#include <QtCore/qatomic.h>
 #include <sys/types.h>
 #include <QtCore/QObject>
 

kdecore/kernel/kglobal_p.h

@@ -21,7 +21,7 @@
 #define KGLOBAL_P_H
 
 #include <kdecore_export.h>
-#include <QtCore/QAtomicPointer>
+#include <QtCore/qatomic.h>
 
 class KComponentData;
 

kdecore/kernel/ktoolinvocation.cpp

@@ -31,9 +31,10 @@
 #include <klocale.h>
 
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QCoreApplication>
 #include <QThread>
+#include <QtCore/qprocess.h>
 
 #include <errno.h>
 

kdecore/kernel/ktoolinvocation_x11.cpp

@@ -45,7 +45,7 @@
 #include <QtCore/QProcess>
 #include <QtCore/QHash>
 #include <QtCore/QDebug>
-#include <QtCore/QBool>
+#include <QtCore/qglobal.h>
 #include <QtCore/QFile>
 #include <QtDBus/QtDBus>
 

kdecore/localization/kcatalog.cpp

@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include <QtCore/QFile>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 

kdecore/localization/kcharsets.cpp

@@ -30,8 +30,8 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QRegExp>
-#include <QtCore/QCharRef>
-#include <QtCore/QMutableStringListIterator>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 #include <QtCore/QTextCodec>
 
 #include <assert.h>

kdecore/localization/kcurrencycode.cpp

@@ -20,7 +20,7 @@
 #include "kcurrencycode.h"
 
 #include <QtCore/QSharedData>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QFileInfo>

kdecore/localization/kcurrencycode.h

@@ -22,7 +22,7 @@
 
 #include <kdecore_export.h>
 
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtCore/QString>
 
 class QDate;

kdecore/localization/klocale_kde.cpp

@@ -46,7 +46,7 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QLocale>
 #include <QtCore/QHash>
-#include <QtCore/QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QtCore/QStringList>
 
 #include "kcatalog_p.h"

kdecore/localization/klocalizedstring.cpp

@@ -30,7 +30,7 @@
 #include <kuitsemantics_p.h>
 #include "kcatalogname_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QStringList>
 #include <QByteArray>
 #include <QChar>

kdecore/localization/klocalizedstring.h

@@ -23,7 +23,7 @@
 
 
 #include <QtCore/QChar>
-#include <QtCore/QLatin1Char>
+#include <QtCore/qchar.h>
 #include <QtCore/QStringList>
 
 class KLocale;

kdecore/localization/kuitsemantics.cpp

@@ -25,7 +25,7 @@
 #include <QSet>
 #include <QRegExp>
 #include <QStack>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QStringList>
 #include <QPair>
 #include <QDir>

kdecore/localization/probers/UnicodeGroupProber.cpp

@@ -27,7 +27,7 @@
 
 #include "ctype_test_p.h"
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <math.h>
 
 namespace kencodingprober {

kdecore/network/ConfigureChecks.cmake

@@ -6,8 +6,13 @@ include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CheckStructMember)
 
+# FIXME: the ssl check fails for some reason
+if(KATIE_FOUND)
+    set(HAVE_QSSLSOCKET TRUE)
+else()
 macro_push_required_vars()
   set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
+  message(STATUS ${QT_INCLUDE_DIR})
   if (QT_USE_FRAMEWORKS)
     set(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
   endif (QT_USE_FRAMEWORKS)
@@ -22,6 +27,7 @@ int main()
     message(SEND_ERROR "KDE Requires Qt to be built with SSL support")
   endif (NOT HAVE_QSSLSOCKET)
 macro_pop_required_vars()
+endif(KATIE_FOUND)
 
 check_include_files("sys/types.h;sys/socket.h;net/if.h" HAVE_NET_IF_H)
 check_include_files("sys/filio.h" HAVE_SYS_FILIO_H)

kdecore/network/ksslcertificatemanager.cpp

@@ -32,6 +32,8 @@
 #include <ktoolinvocation.h>
 
 #include <QtDBus/QtDBus>
+#include <QtCore/qfile.h>
+#include <QtCore/qdir.h>
 
 #include "kssld/kssld_interface.h"
 

kdecore/network/ksslcertificatemanager.h

@@ -27,7 +27,7 @@
 #include <QtNetwork/QSslError>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 class QSslCertificate;
 class KSslCertificateRulePrivate;

kdecore/network/kssld/kssld.cpp

@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 

kdecore/network/netsupp.cpp

@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include <QtCore/QBool>
+#include <QtCore/qglobal.h>
 
 #include <kdebug.h>
 

kdecore/services/kmimetype.cpp

@@ -37,6 +37,8 @@
 #include <QtDBus/QtDBus>
 #include <QtCore/QHash>
 #include <QBuffer>
+#include <QtCore/qstack.h>
+#include <QtCore/qxmlstream.h>
 
 extern int servicesDebugArea();
 

kdecore/services/kmimetyperepository.cpp

@@ -28,7 +28,7 @@
 #include "kfoldermimetype.h"
 #include <QFile>
 #include <QProcess>
-#include <QtEndian>
+#include <QtCore/qendian.h>
 
 extern int servicesDebugArea();
 

kdecore/services/kplugininfo.h

@@ -20,7 +20,7 @@
 #ifndef KDECORE_KPLUGININFO_H
 #define KDECORE_KPLUGININFO_H
 
-#include <QtCore/QExplicitlySharedDataPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtCore/QString>
 #include <QtCore/QMap>
 #include <QtCore/QStringList>

kdecore/services/kservice.cpp

@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <QtCore/QCharRef>
+#include <QtCore/qstring.h>
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 #include <QtCore/QMap>

kdecore/services/kserviceaction.h

@@ -21,7 +21,7 @@
 #define KSERVICEACTION_H
 
 #include <kdecore_export.h>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 class QVariant;
 class KServiceActionPrivate;
 

kdecore/services/kservicegroupfactory.cpp

@@ -22,7 +22,7 @@
 #include "ksycocadict_p.h"
 #include "kservice.h"
 
-#include <QtCore/QCharRef>
+#include <QtCore/qstring.h>
 
 #include <klocale.h>
 #include <kdebug.h>

kdecore/services/kservicetypeprofile.cpp

@@ -31,7 +31,7 @@
 #include <kconfiggroup.h>
 
 #include <QtCore/QHash>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 // servicetype -> profile
 class KServiceTypeProfiles : public QHash<QString, KServiceTypeProfileEntry *>

kdecore/sonnet/settings.cpp

@@ -30,7 +30,7 @@
 #include <klocale.h>
 
 #include <QtCore/QMap>
-#include <QtCore/QMutableStringListIterator>
+#include <QtCore/qstringlist.h>
 
 namespace Sonnet
 {

kdecore/sonnet/tests/test.cpp

@@ -24,7 +24,7 @@
 #include <QCoreApplication>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 using namespace Sonnet;
 

kdecore/sycoca/ksycoca.cpp

@@ -38,6 +38,7 @@
 #include <QtCore/QBuffer>
 #include <QProcess>
 #include <QtDBus/QtDBus>
+#include <QtCore/qthread.h>
 
 #include <config.h>
 

kdecore/tests/kdirwatchtest_gui.cpp

@@ -22,7 +22,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdirwatch.h>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtGui/QDialog>
 #include <QtCore/QDir>
 #include <QtGui/QApplication>

kdecore/tests/kglobaltest.cpp

@@ -19,6 +19,9 @@
 #include <kglobal.h>
 
 #include <QtCore/QObject>
+#include <QtCore/qthreadpool.h>
+#include <QtCore/qfuture.h>
+#include <QtCore/qtconcurrentrun.h>
 
 #include <qtest_kde.h>
 

kdecore/tests/klocaletest.cpp

@@ -30,7 +30,7 @@
 #include "kdatetime.h"
 #include "ksystemtimezone.h"
 #include <QtCore/QString>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtDBus/QtDBus>
 
 #include "moc_klocaletest.cpp"

kdecore/tests/klocaletimeformattest.h

@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QMap>
 #include <klocale.h>
 

kdecore/tests/klockfiletest.cpp

@@ -22,6 +22,8 @@
 #include <kdebug.h>
 #include <unistd.h>
 
+#include <QtCore/qprocess.h>
+
 // TODO test locking from two different threads
 //#include <qtconcurrentrun.h>
 

kdecore/tests/kmimeglobsfileparsertest.cpp

@@ -26,6 +26,8 @@
 #include <ksycoca.h>
 #include <kstandarddirs.h>
 
+#include <QtCore/qbuffer.h>
+
 class KMimeFileParserTest : public QObject
 {
     Q_OBJECT

kdecore/tests/kmimetypetest.cpp

@@ -41,6 +41,10 @@
 #include <ktemporaryfile.h>
 #include <kdesktopfile.h>
 
+#include <QtCore/qbuffer.h>
+#include <QtCore/qfuture.h>
+#include <QtCore/qtconcurrentrun.h>
+
 void KMimeTypeTest::initTestCase()
 {
     // Clean up local xdg dir in case of leftover mimetype definitions

kdecore/tests/kservicetest.cpp

@@ -37,7 +37,8 @@
 #include <kservicetype.h>
 #include <kservicetypeprofile.h>
 
-#include <QtCore/Q_PID>
+#include <QtCore/qprocess.h>
+#include <QtCore/qthread.h>
 
 QTEST_KDEMAIN_CORE( KServiceTest )
 

kdecore/tests/kservicetest.h

@@ -18,7 +18,7 @@
 #ifndef KSERVICETEST_H
 #define KSERVICETEST_H
 
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QtCore/QObject>
 
 class KServiceTest : public QObject

kdecore/tests/ksycocathreadtest.cpp

@@ -35,7 +35,8 @@
 #include <kservicetype.h>
 #include <kservicetypeprofile.h>
 
-#include <QtCore/Q_PID>
+#include <QtCore/qprocess.h>
+#include <QtCore/qthread.h>
 
 // Helper method for all the trader tests
 static bool offerListHasService( const KService::List& offers,

kdecore/tests/ktcpsockettest.cpp

@@ -19,7 +19,8 @@
  */
 
 #include "ktcpsockettest.h"
-#include <QtCore/QDebug>
+#include <QtCore/qdebug.h>
+#include <QtCore/qthread.h>
 #include <QtNetwork/QTcpSocket>
 #include <QtNetwork/QTcpServer>
 #include "ktcpsocket.h"

kdecore/tests/ktimezonestest.cpp

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <qtest_kde.h>
 #include <QtCore/QDir>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtDBus/QtDBus>
 #include <config-date.h> // for HAVE_TM_GMTOFF
 #include "ksystemtimezone.h"

kdecore/tests/kurltest.cpp

@@ -34,12 +34,14 @@ QTEST_KDEMAIN_CORE( KUrlTest )
 #include <kglobal.h>
 #include <kcharsets.h>
 #include <kuser.h>
-#include <QtCore/QTextCodec>
-#include <QtCore/QDataStream>
+#include <QtCore/qtextcodec.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qmimedata.h>
 #include <QtCore/QMap>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h> // gethostname
+#include <ctype.h>
 
 //QCOMPARE cannot be used to strictly check for empty or null QString as it treats QString("") == QString()
 #define QSTREMPTY(_str) QVERIFY(!_str.isNull() && _str.isEmpty())

kdecore/text/kstringhandler.cpp

@@ -26,8 +26,8 @@
 #include <kglobal.h>
 
 #include <QtCore/QRegExp>            // for the word ranges
-#include <QtCore/QCharRef>
-#include <QtCore/QMutableStringListIterator>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
 
 
 

kdecore/util/kexportplugin.h

@@ -22,7 +22,7 @@
 #include <kdeversion.h>
 
 #include <QtCore/QPluginLoader>
-#include <QtCore/QtPlugin>
+#include <QtCore/qplugin.h>
 
 /**
  * \internal