From eade05a4bdeba00d5c1d5fb5b670df8c9757310d Mon Sep 17 00:00:00 2001
From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
Date: Wed, 26 Apr 2017 21:33:34 -0400
Subject: [PATCH] Do not specify Qt modules in includes

---
 src/Application.cpp                            |  6 +++---
 src/BookmarkHandler.cpp                        |  6 +++---
 src/BookmarkHandler.h                          |  2 +-
 src/CharacterColor.h                           |  2 +-
 src/ColorScheme.cpp                            |  2 +-
 src/ColorScheme.h                              |  4 ++--
 src/ColorSchemeEditor.cpp                      |  8 ++++----
 src/ColorSchemeManager.cpp                     |  8 ++++----
 src/ColorSchemeManager.h                       |  4 ++--
 src/CopyInputDialog.h                          |  4 ++--
 src/EditProfileDialog.cpp                      | 16 ++++++++--------
 src/EditProfileDialog.h                        |  4 ++--
 src/Emulation.cpp                              |  2 +-
 src/Emulation.h                                |  6 +++---
 src/ExtendedCharTable.h                        |  2 +-
 src/Filter.cpp                                 | 14 +++++++-------
 src/Filter.h                                   | 14 +++++++-------
 src/History.h                                  |  6 +++---
 src/IncrementalSearchBar.cpp                   |  4 ++--
 src/IncrementalSearchBar.h                     |  2 +-
 src/KeyBindingEditor.cpp                       |  4 ++--
 src/KeyboardTranslator.cpp                     |  8 ++++----
 src/KeyboardTranslator.h                       |  9 ++++-----
 src/KeyboardTranslatorManager.cpp              |  6 +++---
 src/KeyboardTranslatorManager.h                |  4 ++--
 src/MainWindow.h                               |  4 ++--
 src/Part.cpp                                   |  8 ++++----
 src/Part.h                                     |  2 +-
 src/ProcessInfo.cpp                            | 12 ++++++------
 src/ProcessInfo.h                              |  8 ++++----
 src/Profile.cpp                                |  4 ++--
 src/Profile.h                                  | 10 +++++-----
 src/ProfileList.h                              |  6 +++---
 src/ProfileManager.cpp                         |  8 ++++----
 src/ProfileManager.h                           | 14 +++++++-------
 src/ProfileReader.cpp                          |  4 ++--
 src/ProfileWriter.cpp                          |  2 +-
 src/Pty.cpp                                    |  2 +-
 src/Pty.h                                      |  2 +-
 src/Screen.cpp                                 |  2 +-
 src/Screen.h                                   | 10 +++++-----
 src/ScreenWindow.h                             |  6 +++---
 src/Session.cpp                                | 10 +++++-----
 src/Session.h                                  | 13 ++++++-------
 src/SessionController.cpp                      |  6 +++---
 src/SessionController.h                        | 12 ++++++------
 src/SessionListModel.cpp                       |  2 +-
 src/SessionListModel.h                         |  4 ++--
 src/SessionManager.cpp                         |  6 +++---
 src/SessionManager.h                           |  4 ++--
 src/ShellCommand.h                             |  2 +-
 src/Shortcut_p.h                               |  2 +-
 src/TabTitleFormatButton.cpp                   |  2 +-
 src/TerminalCharacterDecoder.cpp               |  2 +-
 src/TerminalCharacterDecoder.h                 |  2 +-
 src/TerminalDisplay.cpp                        | 16 ++++++++--------
 src/TerminalDisplay.h                          |  4 ++--
 src/TerminalDisplayAccessible.h                |  4 ++--
 src/ViewContainer.cpp                          |  6 +++---
 src/ViewContainer.h                            |  8 ++++----
 src/ViewContainerTabBar.cpp                    |  8 ++++----
 src/ViewManager.cpp                            |  6 +++---
 src/ViewManager.h                              |  6 +++---
 src/ViewProperties.h                           | 10 +++++-----
 src/ViewSplitter.h                             |  2 +-
 src/Vt102Emulation.cpp                         |  6 +++---
 src/Vt102Emulation.h                           |  2 +-
 src/autotests/CharacterColorTest.cpp           |  4 ++--
 src/autotests/DBusTest.h                       |  2 +-
 src/autotests/PartTest.h                       |  2 +-
 src/autotests/ProfileTest.h                    |  2 +-
 src/autotests/PtyTest.cpp                      |  4 ++--
 src/autotests/ShellCommandTest.cpp             |  2 +-
 src/autotests/TerminalCharacterDecoderTest.cpp |  4 ++--
 src/konsole_wcwidth.h                          |  2 +-
 src/settings/ProfileSettings.cpp               |  4 ++--
 src/settings/ProfileSettings.h                 |  2 +-
 src/tests/PartManualTest.cpp                   |  2 +-
 src/tests/PartManualTest.h                     |  2 +-
 79 files changed, 213 insertions(+), 215 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index ef5ef6fc0..7bd76ee72 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -21,9 +21,9 @@
 #include "Application.h"
 
 // Qt
-#include <QtCore/QHashIterator>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QHashIterator>
+#include <QFileInfo>
+#include <QDir>
 #include <QCommandLineParser>
 #include <QStandardPaths>
 
diff --git a/src/BookmarkHandler.cpp b/src/BookmarkHandler.cpp
index b124db4a0..6600ea406 100644
--- a/src/BookmarkHandler.cpp
+++ b/src/BookmarkHandler.cpp
@@ -25,9 +25,9 @@
 #include "BookmarkHandler.h"
 
 // Qt
-#include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QDir>
+#include <QFileInfo>
+#include <QStandardPaths>
+#include <QDir>
 
 // KDE
 #include <KShell>
diff --git a/src/BookmarkHandler.h b/src/BookmarkHandler.h
index e502d382f..2a76dd148 100644
--- a/src/BookmarkHandler.h
+++ b/src/BookmarkHandler.h
@@ -27,7 +27,7 @@
 // KDE
 #include <KBookmarkManager>
 
-#include <QtCore/QUrl>
+#include <QUrl>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/CharacterColor.h b/src/CharacterColor.h
index 55f38e1b2..72de8d826 100644
--- a/src/CharacterColor.h
+++ b/src/CharacterColor.h
@@ -24,7 +24,7 @@
 #define CHARACTERCOLOR_H
 
 // Qt
-#include <QtGui/QColor>
+#include <QColor>
 
 namespace Konsole
 {
diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
index c3369be1a..c593e20e5 100644
--- a/src/ColorScheme.cpp
+++ b/src/ColorScheme.cpp
@@ -23,7 +23,7 @@
 #include "ColorScheme.h"
 
 // Qt
-#include <QtGui/QPainter>
+#include <QPainter>
 
 // KDE
 #include <KConfig>
diff --git a/src/ColorScheme.h b/src/ColorScheme.h
index 5c59d6343..f3443276f 100644
--- a/src/ColorScheme.h
+++ b/src/ColorScheme.h
@@ -23,8 +23,8 @@
 #define COLORSCHEME_H
 
 // Qt
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedData>
+#include <QMetaType>
+#include <QSharedData>
 
 // Konsole
 #include "CharacterColor.h"
diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index a6da53ff6..59a32d22e 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -21,12 +21,12 @@
 #include "ColorSchemeEditor.h"
 
 // Qt
-#include <QtGui/QFontMetrics>
-#include <QtCore/QFileInfo>
+#include <QFontMetrics>
+#include <QFileInfo>
 #include <QCompleter>
 #include <QFileSystemModel>
-#include <QtCore/QUrl>
-#include <QtGui/QIcon>
+#include <QUrl>
+#include <QIcon>
 #include <QFileDialog>
 #include <QImageReader>
 
diff --git a/src/ColorSchemeManager.cpp b/src/ColorSchemeManager.cpp
index 3cbfa24d0..74b55bade 100644
--- a/src/ColorSchemeManager.cpp
+++ b/src/ColorSchemeManager.cpp
@@ -25,10 +25,10 @@
 #include "konsoledebug.h"
 
 // Qt
-#include <QtCore/QIODevice>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QIODevice>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
 
 // KDE
 #include <KConfig>
diff --git a/src/ColorSchemeManager.h b/src/ColorSchemeManager.h
index 307d19841..70fc0962d 100644
--- a/src/ColorSchemeManager.h
+++ b/src/ColorSchemeManager.h
@@ -23,8 +23,8 @@
 #define COLORSCHEMEMANAGER_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QStringList>
 
 // Konsole
 #include "ColorScheme.h"
diff --git a/src/CopyInputDialog.h b/src/CopyInputDialog.h
index 9d4b15cf6..dbb56fde5 100644
--- a/src/CopyInputDialog.h
+++ b/src/CopyInputDialog.h
@@ -21,8 +21,8 @@
 #define COPYINPUTDIALOG_H
 
 // Qt
-#include <QtCore/QPointer>
-#include <QtCore/QSet>
+#include <QPointer>
+#include <QSet>
 
 // KDE
 #include <QDialog>
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index fb6e5bd88..6d0188e95 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -24,15 +24,15 @@
 #include <cmath>
 
 // Qt
-#include <QtGui/QBrush>
-#include <QtGui/QPainter>
+#include <QBrush>
+#include <QPainter>
 #include <QStandardItem>
-#include <QtCore/QTextCodec>
-#include <QtGui/QLinearGradient>
-#include <QtGui/QRadialGradient>
-#include <QtGui/QIcon>
-#include <QtCore/QTimer>
-#include <QtCore/QUrl>
+#include <QTextCodec>
+#include <QLinearGradient>
+#include <QRadialGradient>
+#include <QIcon>
+#include <QTimer>
+#include <QUrl>
 #include <QFontDialog>
 #include <QFileDialog>
 #include <QInputDialog>
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
index 37e59a8a3..4b447686c 100644
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -22,8 +22,8 @@
 
 // Qt
 #include <QAbstractItemDelegate>
-#include <QtCore/QHash>
-#include <QtCore/QPointer>
+#include <QHash>
+#include <QPointer>
 
 // KDE
 #include <QDialog>
diff --git a/src/Emulation.cpp b/src/Emulation.cpp
index 8fd360fe9..4c71a956e 100644
--- a/src/Emulation.cpp
+++ b/src/Emulation.cpp
@@ -23,7 +23,7 @@
 #include "Emulation.h"
 
 // Qt
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 
 // Konsole
 #include "KeyboardTranslator.h"
diff --git a/src/Emulation.h b/src/Emulation.h
index a72d95d63..f5f231f50 100644
--- a/src/Emulation.h
+++ b/src/Emulation.h
@@ -24,9 +24,9 @@
 #define EMULATION_H
 
 // Qt
-#include <QtCore/QSize>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTimer>
+#include <QSize>
+#include <QTextCodec>
+#include <QTimer>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/ExtendedCharTable.h b/src/ExtendedCharTable.h
index 03e6c1056..ace1e87f2 100644
--- a/src/ExtendedCharTable.h
+++ b/src/ExtendedCharTable.h
@@ -23,7 +23,7 @@
 #define EXTENDEDCHARTABLE_H
 
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 
 namespace Konsole
 {
diff --git a/src/Filter.cpp b/src/Filter.cpp
index 1900e48a3..b3babd2de 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -25,13 +25,13 @@
 // Qt
 #include <QAction>
 #include <QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QMimeDatabase>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QUrl>
+#include <QClipboard>
+#include <QDir>
+#include <QFile>
+#include <QMimeDatabase>
+#include <QString>
+#include <QTextStream>
+#include <QUrl>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/Filter.h b/src/Filter.h
index f78864628..6c93e8213 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -21,13 +21,13 @@
 #define FILTER_H
 
 // Qt
-#include <QtCore/QFileInfo>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QStringList>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QMultiHash>
+#include <QFileInfo>
+#include <QList>
+#include <QObject>
+#include <QPointer>
+#include <QStringList>
+#include <QRegularExpression>
+#include <QMultiHash>
 
 // Konsole
 #include "Character.h"
diff --git a/src/History.h b/src/History.h
index c360a0478..8b4ff488a 100644
--- a/src/History.h
+++ b/src/History.h
@@ -25,9 +25,9 @@
 #include <sys/mman.h>
 
 // Qt
-#include <QtCore/QList>
-#include <QtCore/QVector>
-#include <QtCore/QTemporaryFile>
+#include <QList>
+#include <QVector>
+#include <QTemporaryFile>
 
 #include "konsoleprivate_export.h"
 
diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp
index 428f9876e..558ba76fa 100644
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@@ -23,8 +23,8 @@
 // Qt
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QTimer>
+#include <QKeyEvent>
+#include <QTimer>
 #include <QToolButton>
 #include <QMenu>
 
diff --git a/src/IncrementalSearchBar.h b/src/IncrementalSearchBar.h
index 7b40fa331..7032e1d66 100644
--- a/src/IncrementalSearchBar.h
+++ b/src/IncrementalSearchBar.h
@@ -22,7 +22,7 @@
 
 // Qt
 #include <QWidget>
-#include <QtCore/QBitArray>
+#include <QBitArray>
 
 class QAction;
 class QTimer;
diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp
index 618e37578..01493f304 100644
--- a/src/KeyBindingEditor.cpp
+++ b/src/KeyBindingEditor.cpp
@@ -21,8 +21,8 @@
 #include "KeyBindingEditor.h"
 
 // Qt
-#include <QtGui/QKeyEvent>
-#include <QtGui/QIcon>
+#include <QKeyEvent>
+#include <QIcon>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp
index 7584cd380..28e6185cd 100644
--- a/src/KeyboardTranslator.cpp
+++ b/src/KeyboardTranslator.cpp
@@ -29,10 +29,10 @@
 #include <stdio.h>
 
 // Qt
-#include <QtCore/QBuffer>
-#include <QtCore/QTextStream>
-#include <QtCore/QRegularExpression>
-#include <QtGui/QKeySequence>
+#include <QBuffer>
+#include <QTextStream>
+#include <QRegularExpression>
+#include <QKeySequence>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h
index ee4305c3a..549460e11 100644
--- a/src/KeyboardTranslator.h
+++ b/src/KeyboardTranslator.h
@@ -23,11 +23,10 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QString>
-//#include <QtGui/QKeySequence>
-#include <QtCore/QMetaType>
+#include <QHash>
+#include <QList>
+#include <QString>
+#include <QMetaType>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/KeyboardTranslatorManager.cpp b/src/KeyboardTranslatorManager.cpp
index 3c288126a..ba5af3e7b 100644
--- a/src/KeyboardTranslatorManager.cpp
+++ b/src/KeyboardTranslatorManager.cpp
@@ -25,9 +25,9 @@
 #include "konsoledebug.h"
 
 // Qt
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
 #include <QStandardPaths>
 
 using namespace Konsole;
diff --git a/src/KeyboardTranslatorManager.h b/src/KeyboardTranslatorManager.h
index 44d606c55..a44b49247 100644
--- a/src/KeyboardTranslatorManager.h
+++ b/src/KeyboardTranslatorManager.h
@@ -23,8 +23,8 @@
 #define KEYBOARDTRANSLATOR_MANAGER_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QStringList>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 3b190b51d..a74f77a8d 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -21,8 +21,8 @@
 #define MAINWINDOW_H
 
 // Qt
-#include <QtCore/QPointer>
-#include <QtCore/QUrl>
+#include <QPointer>
+#include <QUrl>
 
 // KDE
 #include <KXmlGuiWindow>
diff --git a/src/Part.cpp b/src/Part.cpp
index 5b537ef21..8d822ac98 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -21,10 +21,10 @@
 #include "Part.h"
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QDir>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QUrl>
+#include <QStringList>
+#include <QDir>
+#include <QKeyEvent>
+#include <QUrl>
 
 // KDE
 #include <QAction>
diff --git a/src/Part.h b/src/Part.h
index 546ee8cba..a4c658974 100644
--- a/src/Part.h
+++ b/src/Part.h
@@ -26,7 +26,7 @@
 #include <kde_terminal_interface.h>
 
 // Qt
-#include <QtCore/QVariantList>
+#include <QVariantList>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index 2844d9f57..32c3159c5 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -32,12 +32,12 @@
 #include <sys/param.h>
 
 // Qt
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFlags>
-#include <QtCore/QTextStream>
-#include <QtCore/QStringList>
-#include <QtNetwork/QHostInfo>
+#include <QDir>
+#include <QFileInfo>
+#include <QFlags>
+#include <QTextStream>
+#include <QStringList>
+#include <QHostInfo>
 
 // KDE
 #include <KConfigGroup>
diff --git a/src/ProcessInfo.h b/src/ProcessInfo.h
index dbb0a5a53..40fa0f91d 100644
--- a/src/ProcessInfo.h
+++ b/src/ProcessInfo.h
@@ -21,10 +21,10 @@
 #define PROCESSINFO_H
 
 // Qt
-#include <QtCore/QFile>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QFile>
+#include <QMap>
+#include <QString>
+#include <QVector>
 
 namespace Konsole
 {
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 5e7d37224..dc7a81d7a 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -23,8 +23,8 @@
 #include "Profile.h"
 
 // Qt
-#include <QtCore/QTextCodec>
-#include <QtCore/QRegularExpression>
+#include <QTextCodec>
+#include <QRegularExpression>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/Profile.h b/src/Profile.h
index ebc219283..1ffdc6782 100644
--- a/src/Profile.h
+++ b/src/Profile.h
@@ -23,11 +23,11 @@
 #define PROFILE_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtGui/QFont>
-#include <QtGui/QColor>
+#include <QHash>
+#include <QStringList>
+#include <QVariant>
+#include <QFont>
+#include <QColor>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/ProfileList.h b/src/ProfileList.h
index bebefdb65..60e833489 100644
--- a/src/ProfileList.h
+++ b/src/ProfileList.h
@@ -21,9 +21,9 @@
 #define PROFILELIST_H
 
 // Qt
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QObject>
+#include <QList>
+#include <QSet>
+#include <QObject>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp
index 155b27e0c..e57dcf072 100644
--- a/src/ProfileManager.cpp
+++ b/src/ProfileManager.cpp
@@ -25,10 +25,10 @@
 #include "konsoledebug.h"
 
 // Qt
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QDir>
+#include <QFileInfo>
+#include <QList>
+#include <QString>
 
 // KDE
 #include <KSharedConfig>
diff --git a/src/ProfileManager.h b/src/ProfileManager.h
index 824442c67..6b2cb695c 100644
--- a/src/ProfileManager.h
+++ b/src/ProfileManager.h
@@ -23,13 +23,13 @@
 #define PROFILEMANAGER_H
 
 // Qt
-#include <QtGui/QKeySequence>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtCore/QStack>
+#include <QKeySequence>
+#include <QHash>
+#include <QList>
+#include <QSet>
+#include <QStringList>
+#include <QVariant>
+#include <QStack>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ProfileReader.cpp b/src/ProfileReader.cpp
index ab8d30a41..50147e294 100644
--- a/src/ProfileReader.cpp
+++ b/src/ProfileReader.cpp
@@ -23,8 +23,8 @@
 #include "ProfileReader.h"
 
 // Qt
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QDir>
 
 // KDE
 #include <KConfig>
diff --git a/src/ProfileWriter.cpp b/src/ProfileWriter.cpp
index 52c355415..2308439d4 100644
--- a/src/ProfileWriter.cpp
+++ b/src/ProfileWriter.cpp
@@ -23,7 +23,7 @@
 #include "ProfileWriter.h"
 
 // Qt
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 // KDE
 #include <KConfig>
diff --git a/src/Pty.cpp b/src/Pty.cpp
index db5e0d75d..c6c787af0 100644
--- a/src/Pty.cpp
+++ b/src/Pty.cpp
@@ -28,7 +28,7 @@
 #include <signal.h>
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
 #include <qplatformdefs.h>
 
 // KDE
diff --git a/src/Pty.h b/src/Pty.h
index 492a4752a..32a7c095d 100644
--- a/src/Pty.h
+++ b/src/Pty.h
@@ -24,7 +24,7 @@
 #define PTY_H
 
 // Qt
-#include <QtCore/QSize>
+#include <QSize>
 
 // KDE
 #include <KPtyProcess>
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 325d6e462..90671829b 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -24,7 +24,7 @@
 #include "Screen.h"
 
 // Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 // Konsole
 #include "konsole_wcwidth.h"
diff --git a/src/Screen.h b/src/Screen.h
index 08a2dd7ad..6386e611c 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -24,11 +24,11 @@
 #define SCREEN_H
 
 // Qt
-#include <QtCore/QRect>
-#include <QtCore/QSet>
-#include <QtCore/QVector>
-#include <QtCore/QBitArray>
-#include <QtCore/QVarLengthArray>
+#include <QRect>
+#include <QSet>
+#include <QVector>
+#include <QBitArray>
+#include <QVarLengthArray>
 
 // Konsole
 #include "Character.h"
diff --git a/src/ScreenWindow.h b/src/ScreenWindow.h
index 38d57e1c3..3c99fa12f 100644
--- a/src/ScreenWindow.h
+++ b/src/ScreenWindow.h
@@ -21,9 +21,9 @@
 #define SCREENWINDOW_H
 
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QPoint>
-#include <QtCore/QRect>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
 
 // Konsole
 #include "Character.h"
diff --git a/src/Session.cpp b/src/Session.cpp
index 0391f22da..3ef009249 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -31,11 +31,11 @@
 
 // Qt
 #include <QApplication>
-#include <QtGui/QColor>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtDBus/QtDBus>
+#include <QColor>
+#include <QDir>
+#include <QFile>
+#include <QStringList>
+#include <QtDBus>
 #include <QKeyEvent>
 
 // KDE
diff --git a/src/Session.h b/src/Session.h
index e08b11a61..30a36a219 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -25,14 +25,13 @@
 #define SESSION_H
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-//#include <QtCore/QByteRef>
-#include <QtCore/QUuid>
-#include <QtCore/QSize>
-#include <QtCore/QProcess>
+#include <QStringList>
+#include <QHash>
+#include <QUuid>
+#include <QSize>
+#include <QProcess>
 #include <QWidget>
-#include <QtCore/QUrl>
+#include <QUrl>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 7a1d11bf0..090e90c0b 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -28,14 +28,14 @@
 #include <QApplication>
 #include <QAction>
 #include <QMenu>
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QFileDialog>
 #include <QPainter>
 #include <QStandardPaths>
-#include <QtCore/QUrl>
-#include <QtGui/QIcon>
+#include <QUrl>
+#include <QIcon>
 
 // KDE
 #include <KActionMenu>
diff --git a/src/SessionController.h b/src/SessionController.h
index 2440b2620..43d01824f 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -22,12 +22,12 @@
 #define SESSIONCONTROLLER_H
 
 // Qt
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QPointer>
-#include <QtCore/QString>
-#include <QtCore/QHash>
-#include <QtCore/QRegularExpression>
+#include <QList>
+#include <QSet>
+#include <QPointer>
+#include <QString>
+#include <QHash>
+#include <QRegularExpression>
 
 // KDE
 #include <KXMLGUIClient>
diff --git a/src/SessionListModel.cpp b/src/SessionListModel.cpp
index 3aada35e1..c9dbf074b 100644
--- a/src/SessionListModel.cpp
+++ b/src/SessionListModel.cpp
@@ -25,7 +25,7 @@
 // KDE
 #include <KLocalizedString>
 
-#include <QtGui/QIcon>
+#include <QIcon>
 
 // Konsole
 #include "Session.h"
diff --git a/src/SessionListModel.h b/src/SessionListModel.h
index 0ca997fcd..d2ae0a998 100644
--- a/src/SessionListModel.h
+++ b/src/SessionListModel.h
@@ -23,8 +23,8 @@
 #define SESSIONLISTMODEL_H
 
 // Qt
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QVariant>
+#include <QAbstractListModel>
+#include <QVariant>
 
 namespace Konsole
 {
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index d31b5d52f..d9c5878a2 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -25,9 +25,9 @@
 #include "konsoledebug.h"
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QSignalMapper>
-#include <QtCore/QTextCodec>
+#include <QStringList>
+#include <QSignalMapper>
+#include <QTextCodec>
 
 // KDE
 #include <KConfig>
diff --git a/src/SessionManager.h b/src/SessionManager.h
index fe0f0e337..239f5cdf6 100644
--- a/src/SessionManager.h
+++ b/src/SessionManager.h
@@ -23,8 +23,8 @@
 #define SESSIONMANAGER_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QList>
+#include <QHash>
+#include <QList>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ShellCommand.h b/src/ShellCommand.h
index 1ed060cff..64d554fc5 100644
--- a/src/ShellCommand.h
+++ b/src/ShellCommand.h
@@ -21,7 +21,7 @@
 #define SHELLCOMMAND_H
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/Shortcut_p.h b/src/Shortcut_p.h
index 668f6ee1f..12da35d45 100644
--- a/src/Shortcut_p.h
+++ b/src/Shortcut_p.h
@@ -22,7 +22,7 @@
 #ifndef SHORTCUT_H
 #define SHORTCUT_H
 
-#include <QtCore/qnamespace.h>
+#include <qnamespace.h>
 
 namespace Konsole
 {
diff --git a/src/TabTitleFormatButton.cpp b/src/TabTitleFormatButton.cpp
index c1c86d9cb..41ce19002 100644
--- a/src/TabTitleFormatButton.cpp
+++ b/src/TabTitleFormatButton.cpp
@@ -21,7 +21,7 @@
 #include "TabTitleFormatButton.h"
 
 // Qt
-#include <QtCore/QList>
+#include <QList>
 #include <QMenu>
 
 // KDE
diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp
index 31f444c82..e0b2919d2 100644
--- a/src/TerminalCharacterDecoder.cpp
+++ b/src/TerminalCharacterDecoder.cpp
@@ -23,7 +23,7 @@
 #include "TerminalCharacterDecoder.h"
 
 // Qt
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 // Konsole
 #include "konsole_wcwidth.h"
diff --git a/src/TerminalCharacterDecoder.h b/src/TerminalCharacterDecoder.h
index 0fc76cf49..9ba7b2d05 100644
--- a/src/TerminalCharacterDecoder.h
+++ b/src/TerminalCharacterDecoder.h
@@ -23,7 +23,7 @@
 #define TERMINAL_CHARACTER_DECODER_H
 
 // Qt
-#include <QtCore/QList>
+#include <QList>
 
 // Konsole
 #include "Character.h"
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 740cb10e8..527cd9232 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -28,23 +28,23 @@
 
 // Qt
 #include <QApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QEvent>
-#include <QtCore/QFileInfo>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QFileInfo>
 #include <QGridLayout>
 #include <QAction>
 #include <QFontDatabase>
 #include <QLabel>
 #include <QMimeData>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
+#include <QPainter>
+#include <QPixmap>
 #include <QScrollBar>
 #include <QStyle>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QDrag>
 #include <QDesktopServices>
-#include <QtGui/QAccessible>
+#include <QAccessible>
 
 // KDE
 #include <KShell>
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index 34bcd6181..f365dc766 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -22,8 +22,8 @@
 #define TERMINALDISPLAY_H
 
 // Qt
-#include <QtGui/QColor>
-#include <QtCore/QPointer>
+#include <QColor>
+#include <QPointer>
 #include <QWidget>
 
 // Konsole
diff --git a/src/TerminalDisplayAccessible.h b/src/TerminalDisplayAccessible.h
index d1d1bf155..a5dbf153f 100644
--- a/src/TerminalDisplayAccessible.h
+++ b/src/TerminalDisplayAccessible.h
@@ -25,8 +25,8 @@
 //#include <QtGlobal>
 
 
-#include <QtGui/QAccessibleTextInterface>
-#include <QtWidgets/QAccessibleWidget>
+#include <QAccessibleTextInterface>
+#include <QAccessibleWidget>
 
 #include "TerminalDisplay.h"
 #include "ScreenWindow.h"
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index b5532be06..ab5de535e 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -27,9 +27,9 @@
 // Qt
 #include <QStackedWidget>
 #include <QToolButton>
-#include <QtGui/QDrag>
-#include <QtGui/QDragMoveEvent>
-#include <QtCore/QMimeData>
+#include <QDrag>
+#include <QDragMoveEvent>
+#include <QMimeData>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
index 70f50f6e5..74053b949 100644
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -23,10 +23,10 @@
 #define VIEWCONTAINER_H
 
 // Qt
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QHash>
-#include <QtCore/QList>
+#include <QObject>
+#include <QPointer>
+#include <QHash>
+#include <QList>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ViewContainerTabBar.cpp b/src/ViewContainerTabBar.cpp
index bd3cc1f64..8538ca77d 100644
--- a/src/ViewContainerTabBar.cpp
+++ b/src/ViewContainerTabBar.cpp
@@ -24,11 +24,11 @@
 #include "ViewContainer.h"
 
 // Qt
-#include <QtCore/QMimeData>
+#include <QMimeData>
 #include <QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QDragMoveEvent>
-#include <QtGui/QIcon>
+#include <QPainter>
+#include <QDragMoveEvent>
+#include <QIcon>
 #include <QTabBar>
 #include <QApplication>
 
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index fecb35a47..4eda31034 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -23,10 +23,10 @@
 #include <config-konsole.h>
 
 // Qt
-#include <QtCore/QSignalMapper>
-#include <QtCore/QStringList>
+#include <QSignalMapper>
+#include <QStringList>
 #include <QAction>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 // KDE
 #include <KAcceleratorManager>
diff --git a/src/ViewManager.h b/src/ViewManager.h
index 58a8a3a7a..713c28915 100644
--- a/src/ViewManager.h
+++ b/src/ViewManager.h
@@ -21,9 +21,9 @@
 #define VIEWMANAGER_H
 
 // Qt
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
+#include <QHash>
+#include <QObject>
+#include <QPointer>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ViewProperties.h b/src/ViewProperties.h
index 5a1664f4e..7a1fd83dd 100644
--- a/src/ViewProperties.h
+++ b/src/ViewProperties.h
@@ -21,11 +21,11 @@
 #define VIEWPROPERTIES_H
 
 // Qt
-#include <QtGui/QIcon>
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QMimeData>
-#include <QtCore/QUrl>
+#include <QIcon>
+#include <QObject>
+#include <QHash>
+#include <QMimeData>
+#include <QUrl>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/ViewSplitter.h b/src/ViewSplitter.h
index 89e4a7da5..1eb130486 100644
--- a/src/ViewSplitter.h
+++ b/src/ViewSplitter.h
@@ -23,7 +23,7 @@
 #define VIEWSPLITTER_H
 
 // Qt
-#include <QtCore/QList>
+#include <QList>
 #include <QSplitter>
 
 class QFocusEvent;
diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
index bf600186b..7add1f5c5 100644
--- a/src/Vt102Emulation.cpp
+++ b/src/Vt102Emulation.cpp
@@ -28,9 +28,9 @@
 #include <unistd.h>
 
 // Qt
-#include <QtCore/QEvent>
-#include <QtCore/QTimer>
-#include <QtGui/QKeyEvent>
+#include <QEvent>
+#include <QTimer>
+#include <QKeyEvent>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/Vt102Emulation.h b/src/Vt102Emulation.h
index c04e8dab3..a01854e85 100644
--- a/src/Vt102Emulation.h
+++ b/src/Vt102Emulation.h
@@ -24,7 +24,7 @@
 #define VT102EMULATION_H
 
 // Qt
-#include <QtCore/QHash>
+#include <QHash>
 
 // Konsole
 #include "Emulation.h"
diff --git a/src/autotests/CharacterColorTest.cpp b/src/autotests/CharacterColorTest.cpp
index dbf5598f1..9a1d7e9c8 100644
--- a/src/autotests/CharacterColorTest.cpp
+++ b/src/autotests/CharacterColorTest.cpp
@@ -21,8 +21,8 @@
 #include "CharacterColorTest.h"
 
 // Qt
-#include <QtCore/QSize>
-#include <QtCore/QStringList>
+#include <QSize>
+#include <QStringList>
 
 // KDE
 #include <qtest.h>
diff --git a/src/autotests/DBusTest.h b/src/autotests/DBusTest.h
index 251a2f9f3..6f0b169eb 100644
--- a/src/autotests/DBusTest.h
+++ b/src/autotests/DBusTest.h
@@ -24,7 +24,7 @@
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
-#include <QtCore/QTextCodec>
+#include <QTextCodec>
 
 #include <unistd.h>
 
diff --git a/src/autotests/PartTest.h b/src/autotests/PartTest.h
index 0925cf894..acd1a02b0 100644
--- a/src/autotests/PartTest.h
+++ b/src/autotests/PartTest.h
@@ -20,7 +20,7 @@
 #ifndef PARTTEST_H
 #define PARTTEST_H
 
-#include <QtCore/QEventLoop>
+#include <QEventLoop>
 
 #include <kde_terminal_interface.h>
 #include <KParts/Part>
diff --git a/src/autotests/ProfileTest.h b/src/autotests/ProfileTest.h
index d526f6db0..ca42d313e 100644
--- a/src/autotests/ProfileTest.h
+++ b/src/autotests/ProfileTest.h
@@ -20,7 +20,7 @@
 #ifndef PROFILETEST_H
 #define PROFILETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace Konsole
 {
diff --git a/src/autotests/PtyTest.cpp b/src/autotests/PtyTest.cpp
index e39347239..234f0b258 100644
--- a/src/autotests/PtyTest.cpp
+++ b/src/autotests/PtyTest.cpp
@@ -21,8 +21,8 @@
 #include "PtyTest.h"
 
 // Qt
-#include <QtCore/QSize>
-#include <QtCore/QStringList>
+#include <QSize>
+#include <QStringList>
 
 // KDE
 #include <qtest.h>
diff --git a/src/autotests/ShellCommandTest.cpp b/src/autotests/ShellCommandTest.cpp
index 13de6f600..5d9c553e4 100644
--- a/src/autotests/ShellCommandTest.cpp
+++ b/src/autotests/ShellCommandTest.cpp
@@ -22,7 +22,7 @@
 #include "ShellCommandTest.h"
 
 // Qt
-#include <QtCore/QStringList>
+#include <QStringList>
 
 // KDE
 #include <qtest.h>
diff --git a/src/autotests/TerminalCharacterDecoderTest.cpp b/src/autotests/TerminalCharacterDecoderTest.cpp
index 108310857..219b1ea58 100644
--- a/src/autotests/TerminalCharacterDecoderTest.cpp
+++ b/src/autotests/TerminalCharacterDecoderTest.cpp
@@ -22,8 +22,8 @@
 #include "TerminalCharacterDecoderTest.h"
 
 // Qt
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
+#include <QStringList>
+#include <QTextStream>
 
 #include <QFile>
 #include <QXmlSimpleReader>
diff --git a/src/konsole_wcwidth.h b/src/konsole_wcwidth.h
index f6cd7287d..457cfc6e0 100644
--- a/src/konsole_wcwidth.h
+++ b/src/konsole_wcwidth.h
@@ -7,7 +7,7 @@
 #define KONSOLE_WCWIDTH_H
 
 // Qt
-#include <QtCore/QString>
+#include <QString>
 
 int konsole_wcwidth(quint16 oucs);
 
diff --git a/src/settings/ProfileSettings.cpp b/src/settings/ProfileSettings.cpp
index 8469a2e0e..b7654c789 100644
--- a/src/settings/ProfileSettings.cpp
+++ b/src/settings/ProfileSettings.cpp
@@ -21,8 +21,8 @@
 #include "ProfileSettings.h"
 
 // Qt
-#include <QtCore/QFileInfo>
-#include <QtCore/QStandardPaths>
+#include <QFileInfo>
+#include <QStandardPaths>
 #include <QStandardItem>
 
 // KDE
diff --git a/src/settings/ProfileSettings.h b/src/settings/ProfileSettings.h
index 514ad3c1d..b21041aa4 100644
--- a/src/settings/ProfileSettings.h
+++ b/src/settings/ProfileSettings.h
@@ -22,7 +22,7 @@
 
 // Qt
 #include <QStyledItemDelegate>
-#include <QtCore/QSet>
+#include <QSet>
 
 // KDE
 
diff --git a/src/tests/PartManualTest.cpp b/src/tests/PartManualTest.cpp
index cd0948ff0..a09ad3ac7 100644
--- a/src/tests/PartManualTest.cpp
+++ b/src/tests/PartManualTest.cpp
@@ -21,7 +21,7 @@
 #include "PartManualTest.h"
 
 // Qt
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <qtestkeyboard.h>
 #include <QMenu>
 #include <QAction>
diff --git a/src/tests/PartManualTest.h b/src/tests/PartManualTest.h
index ff2d18b08..17179a2af 100644
--- a/src/tests/PartManualTest.h
+++ b/src/tests/PartManualTest.h
@@ -20,7 +20,7 @@
 #ifndef PARTMANUALTEST_H
 #define PARTMANUALTEST_H
 
-#include <QtCore/QEventLoop>
+#include <QEventLoop>
 
 #include <kde_terminal_interface.h>
 #include <KParts/Part>