Adjust including form for some Qt headers as preparation for Qt5

So if someone notices later some Qt header is included in the form of "#include <Class>" instead of the more common form of "#include <Module/Class>", do not rush changing it. REVIEW: 105819
14 years ago · 131091c983
parent a3ea90b559
commit 131091c983
28 changed files with 47 additions and 47 deletions
--- a/src/ColorSchemeEditor.h
+++ b/src/ColorSchemeEditor.h
@ -21,7 +21,7 @@
 #define COLORSCHEMEEDITOR_H

 // Qt
-#include <QtGui/QWidget>
+#include <QWidget>

 class QTableWidgetItem;

--- a/src/CopyInputDialog.cpp
+++ b/src/CopyInputDialog.cpp
@ -21,7 +21,7 @@
 #include "CopyInputDialog.h"

 // Qt
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>

 // Konsole
 #include "ui_CopyInputDialog.h"
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@ -26,7 +26,7 @@
 // Qt
 #include <QtGui/QBrush>
 #include <QtGui/QPainter>
-#include <QtGui/QStandardItem>
+#include <QStandardItem>
 #include <QtCore/QTextCodec>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QRadialGradient>
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@ -21,7 +21,7 @@
 #define EDITPROFILEDIALOG_H

 // Qt
-#include <QtGui/QAbstractItemDelegate>
+#include <QAbstractItemDelegate>
 #include <QtCore/QHash>
 #include <QtCore/QPointer>

--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@ -21,8 +21,8 @@
 #include "Filter.h"

 // Qt
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
+#include <QAction>
+#include <QApplication>
 #include <QtGui/QClipboard>
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
--- a/src/HistorySizeWidget.cpp
+++ b/src/HistorySizeWidget.cpp
@ -22,8 +22,8 @@
 #include "HistorySizeWidget.h"

 // Qt
-#include <QtGui/QButtonGroup>
-#include <QtGui/QAbstractButton>
+#include <QButtonGroup>
+#include <QAbstractButton>

 // Konsole
 #include "ui_HistorySizeWidget.h"
--- a/src/HistorySizeWidget.h
+++ b/src/HistorySizeWidget.h
@ -22,7 +22,7 @@
 #define HISTORYSIZEWIDGET_H

 // Qt
-#include <QtGui/QWidget>
+#include <QWidget>

 // Konsole
 #include "Enumeration.h"
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@ -21,12 +21,12 @@
 #include "IncrementalSearchBar.h"

 // Qt
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QtGui/QKeyEvent>
 #include <QtCore/QTimer>
-#include <QtGui/QToolButton>
-#include <QtGui/QMenu>
+#include <QToolButton>
+#include <QMenu>

 // KDE
 #include <KColorScheme>
--- a/src/IncrementalSearchBar.h
+++ b/src/IncrementalSearchBar.h
@ -21,7 +21,7 @@
 #define INCREMENTALSEARCHBAR_H

 // Qt
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QtCore/QBitArray>

 class QAction;
--- a/src/KeyBindingEditor.h
+++ b/src/KeyBindingEditor.h
@ -21,7 +21,7 @@
 #define KEYBINDINGEDITOR_H

 // Qt
-#include <QtGui/QWidget>
+#include <QWidget>

 class QTableWidgetItem;

--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@ -21,7 +21,7 @@
 #include "MainWindow.h"

 // Qt
-#include <QtGui/QVBoxLayout>
+#include <QVBoxLayout>

 // KDE
 #include <KAcceleratorManager>
--- a/src/ManageProfilesDialog.cpp
+++ b/src/ManageProfilesDialog.cpp
@ -22,7 +22,7 @@

 // Qt
 #include <QtCore/QFileInfo>
-#include <QtGui/QStandardItem>
+#include <QStandardItem>

 // KDE
 #include <KKeySequenceWidget>
--- a/src/ManageProfilesDialog.h
+++ b/src/ManageProfilesDialog.h
@ -21,7 +21,7 @@
 #define MANAGEPROFILESDIALOG_H

 // Qt
-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>
 #include <QtCore/QSet>

 // KDE
--- a/src/ProfileList.cpp
+++ b/src/ProfileList.cpp
@ -21,8 +21,8 @@
 #include "ProfileList.h"

 // Qt
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
+#include <QAction>
+#include <QActionGroup>

 // KDE
 #include <KIcon>
--- a/src/RenameTabWidget.h
+++ b/src/RenameTabWidget.h
@ -21,7 +21,7 @@
 #define RENAMETABWIDGET_H

 // Qt
-#include <QtGui/QWidget>
+#include <QWidget>

 namespace Ui
 {
--- a/src/Session.cpp
+++ b/src/Session.cpp
@ -30,7 +30,7 @@
 #include <unistd.h>

 // Qt
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtGui/QColor>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
--- a/src/Session.h
+++ b/src/Session.h
@ -31,7 +31,7 @@
 #include <QtCore/QUuid>
 #include <QtCore/QSize>
 #include <QtCore/QProcess>
-#include <QtGui/QWidget>
+#include <QWidget>

 // KDE
 #include <KUrl>
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@ -22,8 +22,8 @@
 #include "SessionController.h"

 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QMenu>
+#include <QApplication>
+#include <QMenu>
 #include <QtGui/QKeyEvent>

 // KDE
--- a/src/TabTitleFormatButton.cpp
+++ b/src/TabTitleFormatButton.cpp
@ -22,7 +22,7 @@

 // Qt
 #include <QtCore/QList>
-#include <QtGui/QMenu>
+#include <QMenu>

 // KDE
 #include <KLocalizedString>
--- a/src/TabTitleFormatButton.h
+++ b/src/TabTitleFormatButton.h
@ -21,8 +21,8 @@
 #define TABTITLEFORMATBUTTON_H

 // Qt
-#include <QtGui/QPushButton>
-#include <QtGui/QAction>
+#include <QPushButton>
+#include <QAction>

 // Konsole
 #include "Session.h"
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@ -24,20 +24,20 @@
 #include "TerminalDisplay.h"

 // Qt
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
 #include <QtCore/QEvent>
 #include <QtCore/QFileInfo>
-#include <QtGui/QGridLayout>
-#include <QtGui/QAction>
-#include <QtGui/QLabel>
+#include <QGridLayout>
+#include <QAction>
+#include <QLabel>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyle>
+#include <QScrollBar>
+#include <QStyle>
 #include <QtCore/QTimer>
-#include <QtGui/QToolTip>
+#include <QToolTip>
 #include <QtGui/QAccessible>

 // KDE
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@ -24,7 +24,7 @@
 // Qt
 #include <QtGui/QColor>
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QWidget>

 // Konsole
 #include "Character.h"
--- a/src/TerminalDisplayAccessible.h
+++ b/src/TerminalDisplayAccessible.h
@ -24,7 +24,7 @@

 #include <QtGui/qaccessible.h>
 #include <QtGui/qaccessible2.h>
-#include <QtGui/qaccessiblewidget.h>
+#include <qaccessiblewidget.h>

 #include "TerminalDisplay.h"
 #include "ScreenWindow.h"
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@ -23,13 +23,13 @@
 #include "ViewContainer.h"

 // Qt
-#include <QtGui/QStackedWidget>
-#include <QtGui/QToolButton>
+#include <QStackedWidget>
+#include <QToolButton>
 #include <QtGui/QDrag>
 #include <QtGui/QDragMoveEvent>
 #include <QtCore/QMimeData>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>

 // KDE
 #include <KColorScheme>
--- a/src/ViewContainerTabBar.cpp
+++ b/src/ViewContainerTabBar.cpp
@ -24,7 +24,7 @@

 // Qt
 #include <QtCore/QMimeData>
-#include <QtGui/QLabel>
+#include <QLabel>
 #include <QtGui/QPainter>
 #include <QtGui/QDragMoveEvent>

--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@ -23,7 +23,7 @@
 // Qt
 #include <QtCore/QSignalMapper>
 #include <QtCore/QStringList>
-#include <QtGui/QMenu>
+#include <QMenu>
 #include <QtDBus/QtDBus>

 // KDE
--- a/src/ViewSplitter.h
+++ b/src/ViewSplitter.h
@ -24,7 +24,7 @@

 // Qt
 #include <QtCore/QList>
-#include <QtGui/QSplitter>
+#include <QSplitter>

 class QFocusEvent;

--- a/src/tests/PartTest.cpp
+++ b/src/tests/PartTest.cpp
@ -21,9 +21,9 @@
 #include "PartTest.h"

 // Qt
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
+#include <QWidget>
+#include <QLabel>
+#include <QVBoxLayout>
 #include <QtGui/QKeyEvent>
 #include <qtestkeyboard.h>