include cleanup

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=663054

src/BookmarkHandler.cpp

@@ -25,7 +25,7 @@
 #include "BookmarkHandler.h"
 
 // Qt
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE
 #include <kshell.h>

src/BookmarkHandler.h

@@ -23,7 +23,7 @@
 #define KONSOLEBOOKMARKHANDLER_H
 
 // Qt
-#include <QMenu>
+#include <QtGui/QMenu>
 
 // KDE
 #include <KBookmarkManager>

src/ColorScheme.cpp

@@ -23,8 +23,8 @@
 #include "ColorScheme.h"
 
 // Qt
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 // KDE
 #include <KConfig>

src/ColorScheme.h

@@ -23,11 +23,11 @@
 #define COLORSCHEME_H
 
 // Qt
-#include <QHash>
-#include <QList>
-#include <QMetaType>
-#include <QIODevice>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QMetaType>
+#include <QtCore/QIODevice>
+#include <QtCore/QSet>
 
 // Konsole
 #include "TECommon.h"

src/ColorSchemeEditor.cpp

@@ -21,12 +21,11 @@
 #include "ColorSchemeEditor.h"
 
 // Qt
-#include <QBrush>
-#include <QFontMetrics>
-#include <QHeaderView>
-#include <QItemDelegate>
-#include <QItemEditorCreatorBase>
-#include <QItemEditorFactory>
+#include <QtGui/QBrush>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemDelegate>
+#include <QtGui/QItemEditorCreator>
 
 // KDE
 #include <KColorDialog>

src/ColorSchemeEditor.h

@@ -21,7 +21,7 @@
 #define COLORSCHEMEEDITOR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Konsole
 #include "ColorScheme.h"

src/EditProfileDialog.cpp

@@ -21,11 +21,11 @@
 #include "EditProfileDialog.h"
 
 // Qt
-#include <QHideEvent>
-#include <QLinearGradient>
-#include <QPainter>
-#include <QStandardItemModel>
-#include <QtDebug>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QBrush>
+#include <QtGui/QPainter>
+#include <QtGui/QStandardItem>
+#include <QtCore/QDebug>
 
 // KDE
 #include <KFontDialog>

src/EditProfileDialog.h

@@ -21,10 +21,10 @@
 #define EDITSESSIONDIALOG_H
 
 // Qt
-#include <QAbstractItemDelegate>
-#include <QPair>
-#include <QHash>
-#include <QSet>
+#include <QtGui/QAbstractItemDelegate>
+#include <QtCore/QPair>
+#include <QtCore/QHash>
+#include <QtCore/QSet>
 
 // KDE
 #include <KDialog>

src/Emulation.cpp

@@ -75,13 +75,13 @@
 #include <unistd.h>
 
 // Qt
-#include <QApplication>
-#include <QClipboard>
-#include <QHashIterator>
-#include <QKeyEvent>
-#include <QRegExp>
-#include <QTextStream>
-#include <QThread>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QHash>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
+#include <QtCore/QThread>
 
 // KDE
 #include <kdebug.h>

src/Emulation.h

@@ -25,11 +25,11 @@
 #include <stdio.h>
 
 // Qt 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 //#include <QPointer>
-#include <QTextCodec>
-#include <QTextStream>
-#include <QTimer>
+#include <QtCore/QTextCodec>
+#include <QtCore/QTextStream>
+#include <QtCore/QTimer>
 
 class KeyTrans;
 

src/Filter.cpp

@@ -24,13 +24,13 @@
 #include <iostream>
 
 // Qt
-#include <QAction>
-#include <QApplication>
-#include <QClipboard>
-#include <QString>
-#include <QtDebug>
-#include <QSharedData>
-#include <QFile>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QString>
+#include <QtCore/QDebug>
+#include <QtCore/QSharedData>
+#include <QtCore/QFile>
 
 // KDE
 #include <KLocale>

src/Filter.h

@@ -21,12 +21,12 @@
 #define FILTER_H
 
 // Qt
-#include <QAction>
-#include <QList>
-#include <QObject>
-#include <QStringList>
-#include <QMultiHash>
-#include <QRegExp>
+#include <QtGui/QAction>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QHash>
+#include <QtCore/QRegExp>
 
 namespace Konsole
 {
@@ -297,7 +297,7 @@ class FilterObject : public QObject
 {
 Q_OBJECT
 public:
-    FilterObject(Filter::HotSpot* filter) : _filter(filter) {};
+    FilterObject(Filter::HotSpot* filter) : _filter(filter) {}
 private slots:
     void activated();
 private:

src/History.h

@@ -22,9 +22,9 @@
 #define TEHISTORY_H
 
 // Qt
-#include <QBitArray>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QBitRef>
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
 // KDE
 #include <ktemporaryfile.h>

src/HistorySizeDialog.cpp

@@ -21,13 +21,12 @@
 #include "HistorySizeDialog.h"
 
 // Qt
-#include <QButtonGroup>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
 
 // KDE
 #include <KLocalizedString>

src/IncrementalSearchBar.cpp

@@ -21,14 +21,14 @@
 #include "IncrementalSearchBar.h"
 
 // Qt
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QProgressBar>
-#include <QShowEvent>
-#include <QTimer>
-#include <QToolButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QProgressBar>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QToolButton>
 
 // KDE
 #include <KLocale>

src/IncrementalSearchBar.h

@@ -21,7 +21,7 @@
 #define INCREMENTALSEARCHBAR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QCheckBox;
 class QLabel;

src/KeyBindingEditor.cpp

@@ -21,7 +21,7 @@
 #include "KeyBindingEditor.h"
 
 // Qt
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 // Konsole
 #include "ui_KeyBindingEditor.h"

src/KeyBindingEditor.h

@@ -21,7 +21,7 @@
 #define KEYBINDINGEDITOR_H
 
 // Qt
-#include <QWidget>
+#include <QtGui/QWidget>
 
 namespace Ui
 {

src/KeyTrans.cpp

@@ -33,10 +33,10 @@
 #include <stddef.h>
 
 // Qt
-#include <QBuffer>
-#include <QHash>
-#include <QObject>
-#include <QFile>
+#include <QtCore/QBuffer>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QFile>
 
 // KDE
 #include <kstandarddirs.h>
@@ -811,7 +811,6 @@ void test()
   // Opening sequence
 
   QCString txt =
-#include "default.keytab.h"
   ;
   QBuffer buf(txt);
   if (0) TestTokenizer(buf);

src/KeyTrans.h

@@ -21,9 +21,9 @@
 #ifndef KEYTRANS_H
 #define KEYTRANS_H
 
-#include <QList>
-#include <QString>
-#include <QIODevice>
+#include <QtCore/QList>
+#include <QtCore/QString>
+#include <QtCore/QIODevice>
 
 #define BITS_NewLine    0
 #define BITS_BsHack     1