generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kcddb/libkcddb/cdinfodialog.cpp

@@ -26,6 +26,7 @@
 #include <QTextCodec>
 #include <QStringList>
 #include <QStandardItemModel>
+#include <QDateTime>
 
 #include <kdebug.h>
 #include <kglobal.h>

kdecore/config/kconfiggroup.cpp

@@ -30,6 +30,7 @@
 #include "kcomponentdata.h"
 #include "kconfigdata.h"
 #include <kdebug.h>
+#include <kurl.h>
 
 #include <QtCore/QDateTime>
 #include <QtCore/QSharedData>

kdecore/config/kconfiggroup.h

@@ -30,11 +30,6 @@
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qfont.h>
-#include <QtCore/qdatetime.h>
-#include <QtCore/qrect.h>
-#include <kurl.h>
 
 class KConfig;
 class KConfigGroupPrivate;

kdecore/config/kcoreconfigskeleton.h

@@ -29,7 +29,8 @@
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 
-#include <QtCore/qrect.h>
+#include <QtCore/QRect>
+#include <QtCore/QDateTime>
 
   class KConfigSkeletonItemPrivate;
   /**

kdecore/kernel/ktoolinvocation_x11.cpp

@@ -28,6 +28,7 @@
 
 #include <kconfiggroup.h>
 #include <kmimetypetrader.h>
+#include <kurl.h>
 
 #include "kcmdlineargs.h"
 #include "kconfig.h"

kdeui/config/kconfiggroupgui.cpp

@@ -22,6 +22,8 @@
 #include <kconfiggroup_p.h>
 #include <kdebug.h>
 
+#include <QColor>
+
 /**
  * Try to read a GUI type from config group @p cg at key @p key.
  * @p input is the default value and also indicates the type to be read.

kdeui/dialogs/kbugreport.cpp

@@ -39,6 +39,7 @@
 #include <kurllabel.h>
 #include <ktextedit.h>
 #include <ktitlewidget.h>
+#include <kurl.h>
 
 #include <stdio.h>
 #include <pwd.h>

kdeui/widgets/klineedit.cpp

@@ -42,6 +42,7 @@
 #include <kmenu.h>
 #include <kstandardaction.h>
 #include <kstandardshortcut.h>
+#include <kurl.h>
 
 #include <QtCore/QTimer>
 #include <QtGui/QClipboard>

kfile/knameandurlinputdialog.h

@@ -23,6 +23,7 @@
 
 #include <kfile_export.h>
 #include <kdialog.h>
+#include <kurl.h>
 
 class KLineEdit;
 class KUrlRequester;

khtml/khtml_settings.cpp

@@ -34,8 +34,9 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <QtGui/QFontDatabase>
+#include <QFontDatabase>
 #include <QByteArray>
+#include <QDateTime>
 
 /**
  * @internal

khtml/testkhtml.h

@@ -5,6 +5,7 @@
 #include <khtml_part.h>
 #include <QList>
 #include <QMap>
+#include <QDateTime>
 
 /**
  * @internal

kio/kfile/kfilemetadatareaderprocess.cpp

@@ -25,6 +25,7 @@
 #include <kcomponentdata.h>
 #include <kconfiggroup.h>
 #include <klocale.h>
+#include <kurl.h>
 
 #include <QtCore/QByteArray>
 #include <QtCore/QCoreApplication>

kio/kio/accessmanager.cpp

@@ -38,6 +38,7 @@
 
 #include <QtCore/QUrl>
 #include <QtCore/QPointer>
+#include <QtCore/QDateTime>
 #include <QtGui/QWidget>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusConnection>

kio/kssl/kcm/displaycertdialog.cpp

@@ -22,6 +22,8 @@
 #include <kstandardguiitem.h>
 #include <klocale.h>
 
+#include <QDateTime>
+
 DisplayCertDialog::DisplayCertDialog(QWidget *parent)
  : KDialog(parent),
    m_index(0)

kioslave/ftp/ftp.cpp

@@ -47,6 +47,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
+#include <QtCore/QDateTime>
 #include <QtNetwork/QHostAddress>
 #include <QtNetwork/QTcpSocket>
 #include <QtNetwork/QTcpServer>

kioslave/http/kcookiejar/kcookiewin.cpp

@@ -37,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kcookiewin.h"
 #include "kcookiejar.h"
 
+#include <QtCore/QUrl>
 #include <QtGui/QLabel>
 #include <QtGui/QLayout>
 #include <QtGui/QGroupBox>

kjs/tests/CMakeLists.txt

@@ -10,7 +10,7 @@ set(testkjs_SRCS testkjs.cpp )
 
 kde4_add_manual_test(testkjs ${testkjs_SRCS})
 
-target_link_libraries(testkjs ${KDE4_KJS_LIBS} ${QT_QTCORE_LIBRARY})
+target_link_libraries(testkjs kjs_library ${QT_QTCORE_LIBRARY})
 
 ########### ecmatest ##############
 

kparts/tests/normalktm.cpp

@@ -26,7 +26,7 @@
 #include <QtGui/QSplitter>
 #include <QtGui/QCheckBox>
 #include <QtCore/QDir>
-#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>

kross/modules/form.cpp

@@ -36,6 +36,7 @@
 #include <QtGui/QTextBrowser>
 #include <QUiLoader>
 #include <QTextCursor>
+#include <QDateTime>
 #include <QtGui/qtextobject.h>
 
 #include <kdebug.h>

kutils/kcmultidialog.cpp

@@ -38,6 +38,7 @@
 #include <ktoolinvocation.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
+#include <kurl.h>
 
 #include "auth/kauthaction.h"
 

plasma/abstractrunner.cpp

@@ -24,8 +24,8 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QMutex>
-#include <QtCore/qmutex.h>
 #include <QTimer>
+#include <QDateTime>
 
 #include <kdebug.h>
 #include <kicon.h>

plasma/datacontainer.cpp

@@ -21,6 +21,7 @@
 #include "private/storage_p.h"
 
 #include <kdebug.h>
+#include <QDateTime>
 
 #include "plasma.h"
 

plasma/private/datacontainer_p.cpp

@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <QDateTime>
+
 #include "datacontainer.h" //krazy:exclude=includes
 #include "datacontainer_p.h" //krazy:exclude=includes
 

plasma/private/storagethread.cpp

@@ -25,6 +25,7 @@
 #include <QSqlField>
 #include <QSqlDriver>
 #include <QSqlRecord>
+#include <QDateTime>
 
 #include <kdebug.h>
 #include <kstandarddirs.h>

plasma/wallpaper.cpp

@@ -33,6 +33,7 @@
 #include <QThreadPool>
 #include <QPainter>
 #include <QSvgRenderer>
+#include <QDateTime>
 
 #include <kdebug.h>
 #include <kglobal.h>