Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.

30 files changed, 81 insertions, 81 deletions

diff --git a/src/core/ArgumentParser.h b/src/core/ArgumentParser.h
index 3c0279164..b03f976bb 100644
--- a/src/core/ArgumentParser.h
+++ b/src/core/ArgumentParser.h
@@ -20,8 +20,8 @@
 
 #include "core/Global.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QStringList>
 
 class ArgumentParser
 {
diff --git a/src/core/AutoTypeAssociations.h b/src/core/AutoTypeAssociations.h
index c71a45b45..1b5871b3e 100644
--- a/src/core/AutoTypeAssociations.h
+++ b/src/core/AutoTypeAssociations.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_AUTOTYPEASSOCIATIONS_H
 #define KEEPASSX_AUTOTYPEASSOCIATIONS_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "core/Global.h"
 
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index c06250c48..48803d69f 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -17,11 +17,11 @@
 
 #include "Config.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QTemporaryFile>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopServices>
+#include <QApplication>
+#include <QDesktopServices>
+#include <QDir>
+#include <QSettings>
+#include <QTemporaryFile>
 
 Config* Config::m_instance(Q_NULLPTR);
 
diff --git a/src/core/Config.h b/src/core/Config.h
index 0a775bdfc..ee3082685 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_CONFIG_H
 #define KEEPASSX_CONFIG_H
 
-#include <QtCore/QScopedPointer>
-#include <QtCore/QVariant>
+#include <QScopedPointer>
+#include <QVariant>
 
 #include "core/Global.h"
 
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 3e656873b..80d168225 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -17,9 +17,9 @@
 
 #include "Database.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
-#include <QtCore/QXmlStreamReader>
+#include <QFile>
+#include <QTimer>
+#include <QXmlStreamReader>
 
 #include "core/Group.h"
 #include "core/Metadata.h"
diff --git a/src/core/Database.h b/src/core/Database.h
index f4173441f..267d6b0b4 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DATABASE_H
 #define KEEPASSX_DATABASE_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
+#include <QDateTime>
+#include <QHash>
 
 #include "core/Uuid.h"
 #include "keys/CompositeKey.h"
diff --git a/src/core/DatabaseIcons.h b/src/core/DatabaseIcons.h
index cc840df49..68d1e0cb0 100644
--- a/src/core/DatabaseIcons.h
+++ b/src/core/DatabaseIcons.h
@@ -18,10 +18,10 @@
 #ifndef KEEPASSX_DATABASEICONS_H
 #define KEEPASSX_DATABASEICONS_H
 
-#include <QtCore/QVector>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QPixmapCache>
+#include <QImage>
+#include <QPixmap>
+#include <QPixmapCache>
+#include <QVector>
 
 #include "core/Global.h"
 
diff --git a/src/core/Endian.cpp b/src/core/Endian.cpp
index f96301a4e..bf838abcb 100644
--- a/src/core/Endian.cpp
+++ b/src/core/Endian.cpp
@@ -17,8 +17,8 @@
 
 #include "Endian.h"
 
-#include <QtCore/QtEndian>
-#include <QtCore/QIODevice>
+#include <QtEndian>
+#include <QIODevice>
 
 namespace Endian {
 
diff --git a/src/core/Endian.h b/src/core/Endian.h
index 152cf9a1b..0cea617c6 100644
--- a/src/core/Endian.h
+++ b/src/core/Endian.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_ENDIAN_H
 #define KEEPASSX_ENDIAN_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QSysInfo>
+#include <QByteArray>
+#include <QSysInfo>
 
 class QIODevice;
 
diff --git a/src/core/Entry.h b/src/core/Entry.h
index d86775210..d4a52933f 100644
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -18,14 +18,14 @@
 #ifndef KEEPASSX_ENTRY_H
 #define KEEPASSX_ENTRY_H
 
-#include <QtCore/QMap>
-#include <QtCore/QPointer>
-#include <QtCore/QSet>
-#include <QtCore/QUrl>
-#include <QtGui/QColor>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QPixmapCache>
+#include <QColor>
+#include <QImage>
+#include <QMap>
+#include <QPixmap>
+#include <QPixmapCache>
+#include <QPointer>
+#include <QSet>
+#include <QUrl>
 
 #include "core/AutoTypeAssociations.h"
 #include "core/EntryAttachments.h"
diff --git a/src/core/EntryAttachments.h b/src/core/EntryAttachments.h
index 31b0c4ce6..b482f42e3 100644
--- a/src/core/EntryAttachments.h
+++ b/src/core/EntryAttachments.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_ENTRYATTACHMENTS_H
 #define KEEPASSX_ENTRYATTACHMENTS_H
 
-#include <QtCore/QMap>
-#include <QtCore/QObject>
+#include <QMap>
+#include <QObject>
 
 #include "core/Global.h"
 
diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h
index 8d17eb81b..420c085fa 100644
--- a/src/core/EntryAttributes.h
+++ b/src/core/EntryAttributes.h
@@ -18,10 +18,10 @@
 #ifndef KEEPASSX_ENTRYATTRIBUTES_H
 #define KEEPASSX_ENTRYATTRIBUTES_H
 
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QMap>
+#include <QObject>
+#include <QSet>
+#include <QStringList>
 
 #include "core/Global.h"
 
diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index 6e488ac07..dd300ec1d 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -17,9 +17,9 @@
 
 #include "FilePath.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QLibrary>
+#include <QCoreApplication>
+#include <QDir>
+#include <QLibrary>
 
 #include "config-keepassx.h"
 
diff --git a/src/core/FilePath.h b/src/core/FilePath.h
index d2d8c7390..411cbbc7d 100644
--- a/src/core/FilePath.h
+++ b/src/core/FilePath.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSX_FILEPATH_H
 #define KEEPASSX_FILEPATH_H
 
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtGui/QIcon>
+#include <QHash>
+#include <QIcon>
+#include <QString>
 
 #include "core/Global.h"
 
diff --git a/src/core/Global.h b/src/core/Global.h
index cb9cf5df7..0b1ed2140 100644
--- a/src/core/Global.h
+++ b/src/core/Global.h
@@ -22,7 +22,7 @@
 
 // mostly copied from qcompilerdetection.h which is part of Qt 5
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 #ifdef Q_CC_CLANG
 #  if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
diff --git a/src/core/Group.h b/src/core/Group.h
index d22b6ef24..b1a51d181 100644
--- a/src/core/Group.h
+++ b/src/core/Group.h
@@ -18,10 +18,10 @@
 #ifndef KEEPASSX_GROUP_H
 #define KEEPASSX_GROUP_H
 
-#include <QtCore/QPointer>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QPixmapCache>
+#include <QImage>
+#include <QPixmap>
+#include <QPixmapCache>
+#include <QPointer>
 
 #include "core/Database.h"
 #include "core/Entry.h"
diff --git a/src/core/ListDeleter.h b/src/core/ListDeleter.h
index 76c7bda9a..5687cbb1d 100644
--- a/src/core/ListDeleter.h
+++ b/src/core/ListDeleter.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_LISTDELETER_H
 #define KEEPASSX_LISTDELETER_H
 
-#include <QtCore/QList>
+#include <QList>
 
 template <typename T>
 class ListDeleter
diff --git a/src/core/Metadata.h b/src/core/Metadata.h
index 8e9e8a7db..ec3c692e6 100644
--- a/src/core/Metadata.h
+++ b/src/core/Metadata.h
@@ -18,11 +18,11 @@
 #ifndef KEEPASSX_METADATA_H
 #define KEEPASSX_METADATA_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
-#include <QtCore/QPointer>
-#include <QtGui/QColor>
-#include <QtGui/QImage>
+#include <QColor>
+#include <QDateTime>
+#include <QHash>
+#include <QImage>
+#include <QPointer>
 
 #include "core/Global.h"
 #include "core/Uuid.h"
diff --git a/src/core/PasswordGenerator.h b/src/core/PasswordGenerator.h
index a9a21acd4..2a9a47b82 100644
--- a/src/core/PasswordGenerator.h
+++ b/src/core/PasswordGenerator.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSX_PASSWORDGENERATOR_H
 #define KEEPASSX_PASSWORDGENERATOR_H
 
-#include <QtCore/QFlags>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QFlags>
+#include <QString>
+#include <QVector>
 
 #include "core/Global.h"
 
diff --git a/src/core/SignalMultiplexer.h b/src/core/SignalMultiplexer.h
index 1c5e44f40..6d39cd5bb 100644
--- a/src/core/SignalMultiplexer.h
+++ b/src/core/SignalMultiplexer.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_SIGNALMULTIPLEXER_H
 #define KEEPASSX_SIGNALMULTIPLEXER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
+#include <QObject>
+#include <QPointer>
 
 #include "core/Global.h"
 
diff --git a/src/core/TimeDelta.cpp b/src/core/TimeDelta.cpp
index 989d744b8..e2dbdac40 100644
--- a/src/core/TimeDelta.cpp
+++ b/src/core/TimeDelta.cpp
@@ -17,7 +17,7 @@
 
 #include "TimeDelta.h"
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 QDateTime operator+(const QDateTime& dateTime, const TimeDelta& delta) {
     return dateTime.addDays(delta.getDays())
diff --git a/src/core/TimeDelta.h b/src/core/TimeDelta.h
index c8fa9fd0c..d52ba72e5 100644
--- a/src/core/TimeDelta.h
+++ b/src/core/TimeDelta.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TIMEDELTA_H
 #define KEEPASSX_TIMEDELTA_H
 
-#include <QtCore/QMetaType>
+#include <QMetaType>
 
 class QDateTime;
 class TimeDelta;
diff --git a/src/core/TimeInfo.h b/src/core/TimeInfo.h
index 2c8d505c0..455c002cd 100644
--- a/src/core/TimeInfo.h
+++ b/src/core/TimeInfo.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TIMEINFO_H
 #define KEEPASSX_TIMEINFO_H
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 class TimeInfo
 {
diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index 04d053bb3..37ef50c42 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -17,16 +17,16 @@
 
 #include "Tools.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QIODevice>
-#include <QtCore/QLocale>
-#include <QtCore/QStringList>
-#include <QtGui/QImageReader>
+#include <QCoreApplication>
+#include <QImageReader>
+#include <QIODevice>
+#include <QLocale>
+#include <QStringList>
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
-#include <QtCore/QElapsedTimer>
+#include <QElapsedTimer>
 #else
-#include <QtCore/QTime>
+#include <QTime>
 #endif
 
 #ifdef Q_OS_WIN
diff --git a/src/core/Tools.h b/src/core/Tools.h
index 86c8338c0..8058f2518 100644
--- a/src/core/Tools.h
+++ b/src/core/Tools.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSX_TOOLS_H
 #define KEEPASSX_TOOLS_H
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
+#include <QDateTime>
+#include <QObject>
+#include <QString>
 
 #include "core/Global.h"
 
diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index ae8b2dc5c..8cd6a9b85 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -17,7 +17,7 @@
 
 #include "Uuid.h"
 
-#include <QtCore/QHash>
+#include <QHash>
 
 #include "crypto/Random.h"
 
diff --git a/src/core/Uuid.h b/src/core/Uuid.h
index ddcd39c80..8c39a7cb6 100644
--- a/src/core/Uuid.h
+++ b/src/core/Uuid.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_UUID_H
 #define KEEPASSX_UUID_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QString>
 
 class Uuid
 {
diff --git a/src/core/qsavefile.cpp b/src/core/qsavefile.cpp
index 51ef0c339..247535006 100644
--- a/src/core/qsavefile.cpp
+++ b/src/core/qsavefile.cpp
@@ -42,9 +42,9 @@
 #include "qsavefile.h"
 #include "qsavefile_p.h"
 
-#include <QtCore/QAbstractFileEngine>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTemporaryFile>
+#include <QAbstractFileEngine>
+#include <QFileInfo>
+#include <QTemporaryFile>
 
 QSaveFilePrivate::QSaveFilePrivate()
     : tempFile(0), error(QFile::NoError)
diff --git a/src/core/qsavefile.h b/src/core/qsavefile.h
index 48a8bf32b..84d5a2450 100644
--- a/src/core/qsavefile.h
+++ b/src/core/qsavefile.h
@@ -42,8 +42,8 @@
 #ifndef QSAVEFILE_H
 #define QSAVEFILE_H
 
-#include <QtCore/QFile>
-#include <QtCore/QString>
+#include <QFile>
+#include <QString>
 
 #ifdef open
 #error qsavefile.h must be included before any header file that defines open
diff --git a/src/core/qsavefile_p.h b/src/core/qsavefile_p.h
index 7c7cfe663..549ecc1b2 100644
--- a/src/core/qsavefile_p.h
+++ b/src/core/qsavefile_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtCore/QTemporaryFile>
+#include <QTemporaryFile>
 
 class QSaveFilePrivate
 {