Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.
2024-10-01 01:26:01 -04:00 · 2013-10-03 15:18:16 +02:00 · 2013-10-03 15:18:16 +02:00 · 6504b6f2bd
commit 6504b6f2bd
parent 035271d469
170 changed files with 332 additions and 339 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -153,14 +153,7 @@ if(UNIX AND NOT APPLE)
 endif()

 find_package(Qt4 4.6.0 REQUIRED ${QT_REQUIRED_MODULES})
-add_definitions(${QT_DEFINITIONS} -DQT_CORE_LIB -DQT_GUI_LIB)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG QT_DEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_DEBUG)
-endif()
+include(${QT_USE_FILE})

 find_package(Gcrypt REQUIRED)

@ -201,7 +194,7 @@ if(UNIX)
  endif()
 endif()

-include_directories(SYSTEM ${QT_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

 if(NOT (${CMAKE_VERSION} VERSION_LESS 2.8.3))
  set(PRINT_SUMMARY ON)
--- a/src/autotype/AutoType.cpp
+++ b/src/autotype/AutoType.cpp
@ -17,8 +17,8 @@

 #include "AutoType.h"

-#include <QtCore/QPluginLoader>
-#include <QtGui/QApplication>
+#include <QApplication>
+#include <QPluginLoader>

 #include "autotype/AutoTypePlatformPlugin.h"
 #include "autotype/AutoTypeSelectDialog.h"
--- a/src/autotype/AutoType.h
+++ b/src/autotype/AutoType.h
@ -18,9 +18,9 @@
 #ifndef KEEPASSX_AUTOTYPE_H
 #define KEEPASSX_AUTOTYPE_H

-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtGui/QWidget>
+#include <QObject>
+#include <QStringList>
+#include <QWidget>

 #include "core/Global.h"

--- a/src/autotype/AutoTypeAction.h
+++ b/src/autotype/AutoTypeAction.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_AUTOTYPEACTION_H
 #define KEEPASSX_AUTOTYPEACTION_H

-#include <QtCore/QChar>
-#include <QtCore/Qt>
+#include <QChar>
+#include <Qt>

 #include "core/Global.h"

--- a/src/autotype/AutoTypePlatformPlugin.h
+++ b/src/autotype/AutoTypePlatformPlugin.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_AUTOTYPEPLATFORMPLUGIN_H
 #define KEEPASSX_AUTOTYPEPLATFORMPLUGIN_H

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

 #include "autotype/AutoTypeAction.h"

--- a/src/autotype/AutoTypeSelectDialog.cpp
+++ b/src/autotype/AutoTypeSelectDialog.cpp
@ -17,11 +17,11 @@

 #include "AutoTypeSelectDialog.h"

-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QVBoxLayout>

 #include "autotype/AutoTypeSelectView.h"
 #include "core/FilePath.h"
--- a/src/autotype/AutoTypeSelectDialog.h
+++ b/src/autotype/AutoTypeSelectDialog.h
@ -18,9 +18,9 @@
 #ifndef KEEPASSX_AUTOTYPESELECTDIALOG_H
 #define KEEPASSX_AUTOTYPESELECTDIALOG_H

-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QHash>
-#include <QtGui/QDialog>
+#include <QAbstractItemModel>
+#include <QDialog>
+#include <QHash>

 #include "core/Global.h"

--- a/src/autotype/AutoTypeSelectView.cpp
+++ b/src/autotype/AutoTypeSelectView.cpp
@ -17,7 +17,7 @@

 #include "AutoTypeSelectView.h"

-#include <QtGui/QMouseEvent>
+#include <QMouseEvent>

 AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
    : EntryView(parent)
--- a/src/autotype/ShortcutWidget.cpp
+++ b/src/autotype/ShortcutWidget.cpp
@ -17,7 +17,7 @@

 #include "ShortcutWidget.h"

-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>

 #include "autotype/AutoType.h"

--- a/src/autotype/ShortcutWidget.h
+++ b/src/autotype/ShortcutWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_SHORTCUTWIDGET_H
 #define KEEPASSX_SHORTCUTWIDGET_H

-#include <QtGui/QLineEdit>
+#include <QLineEdit>

 #include "core/Global.h"

--- a/src/autotype/WildcardMatcher.cpp
+++ b/src/autotype/WildcardMatcher.cpp
@ -17,7 +17,7 @@

 #include "WildcardMatcher.h"

-#include <QtCore/QStringList>
+#include <QStringList>

 const QChar WildcardMatcher::Wildcard = '*';
 const Qt::CaseSensitivity WildcardMatcher::Sensitivity = Qt::CaseInsensitive;
--- a/src/autotype/WildcardMatcher.h
+++ b/src/autotype/WildcardMatcher.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_WILDCARDMATCHER_H
 #define KEEPASSX_WILDCARDMATCHER_H

-#include <QtCore/QStringList>
+#include <QStringList>

 class WildcardMatcher
 {
--- a/src/autotype/WindowSelectComboBox.cpp
+++ b/src/autotype/WindowSelectComboBox.cpp
@ -17,7 +17,7 @@

 #include "WindowSelectComboBox.h"

-#include <QtGui/QLineEdit>
+#include <QLineEdit>

 #include "autotype/AutoType.h"

--- a/src/autotype/WindowSelectComboBox.h
+++ b/src/autotype/WindowSelectComboBox.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_WINDOWSELECTCOMBOBOX_H
 #define KEEPASSX_WINDOWSELECTCOMBOBOX_H

-#include <QtGui/QComboBox>
+#include <QComboBox>

 #include "core/Global.h"

--- a/src/autotype/test/AutoTypeTest.h
+++ b/src/autotype/test/AutoTypeTest.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_AUTOTYPETEST_H
 #define KEEPASSX_AUTOTYPETEST_H

-#include <QtCore/QtPlugin>
+#include <QtPlugin>

 #include "autotype/AutoTypePlatformPlugin.h"
 #include "autotype/AutoTypeAction.h"
--- a/src/autotype/x11/AutoTypeX11.h
+++ b/src/autotype/x11/AutoTypeX11.h
@ -19,11 +19,11 @@
 #ifndef KEEPASSX_AUTOTYPEX11_H
 #define KEEPASSX_AUTOTYPEX11_H

-#include <QtCore/QSet>
-#include <QtCore/QtPlugin>
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
-#include <QtGui/QX11Info>
+#include <QApplication>
+#include <QSet>
+#include <QtPlugin>
+#include <QWidget>
+#include <QX11Info>

 #include <X11/Xutil.h>
 #include <X11/extensions/XTest.h>
--- 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
 {
--- 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"

--- 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);

--- 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"

--- 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"
--- 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"
--- 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"

--- 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 {

--- 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;

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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__)
--- 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"
--- 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
--- 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"
--- 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"

--- 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"

--- 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())
--- 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;
--- 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
 {
--- 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
--- 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"

--- 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"

--- 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
 {
--- 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)
--- 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
--- 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
 {
--- a/src/crypto/Crypto.cpp
+++ b/src/crypto/Crypto.cpp
@ -17,7 +17,7 @@

 #include "Crypto.h"

-#include <QtCore/QMutex>
+#include <QMutex>

 #include <gcrypt.h>

--- a/src/crypto/CryptoHash.h
+++ b/src/crypto/CryptoHash.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_CRYPTOHASH_H
 #define KEEPASSX_CRYPTOHASH_H

-#include <QtCore/QByteArray>
+#include <QByteArray>

 class CryptoHashPrivate;

--- a/src/crypto/Random.h
+++ b/src/crypto/Random.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_RANDOM_H
 #define KEEPASSX_RANDOM_H

-#include <QtCore/QByteArray>
+#include <QByteArray>

 class Random
 {
--- a/src/crypto/SymmetricCipher.h
+++ b/src/crypto/SymmetricCipher.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_SYMMETRICCIPHER_H
 #define KEEPASSX_SYMMETRICCIPHER_H

-#include <QtCore/QByteArray>
-#include <QtCore/QScopedPointer>
+#include <QByteArray>
+#include <QScopedPointer>

 #include "core/Global.h"
 #include "crypto/SymmetricCipherBackend.h"
--- a/src/crypto/SymmetricCipherBackend.h
+++ b/src/crypto/SymmetricCipherBackend.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERBACKEND_H
 #define KEEPASSX_SYMMETRICCIPHERBACKEND_H

-#include <QtCore/QByteArray>
+#include <QByteArray>

 class SymmetricCipherBackend
 {
--- a/src/format/KeePass1.h
+++ b/src/format/KeePass1.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_KEEPASS1_H
 #define KEEPASSX_KEEPASS1_H

-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 namespace KeePass1
 {
--- a/src/format/KeePass1Reader.cpp
+++ b/src/format/KeePass1Reader.cpp
@ -17,9 +17,9 @@

 #include "KeePass1Reader.h"

-#include <QtCore/QFile>
-#include <QtCore/QTextCodec>
-#include <QtGui/QImage>
+#include <QFile>
+#include <QImage>
+#include <QTextCodec>

 #include "core/Database.h"
 #include "core/Endian.h"
--- a/src/format/KeePass1Reader.h
+++ b/src/format/KeePass1Reader.h
@ -18,9 +18,9 @@
 #ifndef KEEPASSX_KEEPASS1READER_H
 #define KEEPASSX_KEEPASS1READER_H

-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QHash>

 class Database;
 class Entry;
--- a/src/format/KeePass2.h
+++ b/src/format/KeePass2.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_KEEPASS2_H
 #define KEEPASSX_KEEPASS2_H

-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 #include "core/Uuid.h"

--- a/src/format/KeePass2RandomStream.h
+++ b/src/format/KeePass2RandomStream.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_KEEPASS2RANDOMSTREAM_H
 #define KEEPASSX_KEEPASS2RANDOMSTREAM_H

-#include <QtCore/QByteArray>
+#include <QByteArray>

 #include "crypto/SymmetricCipher.h"

--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@ -17,9 +17,9 @@

 #include "KeePass2Reader.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QIODevice>
+#include <QBuffer>
+#include <QFile>
+#include <QIODevice>

 #include "core/Database.h"
 #include "core/Endian.h"
--- a/src/format/KeePass2Reader.h
+++ b/src/format/KeePass2Reader.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_KEEPASS2READER_H
 #define KEEPASSX_KEEPASS2READER_H

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>

 #include "keys/CompositeKey.h"

--- a/src/format/KeePass2Writer.cpp
+++ b/src/format/KeePass2Writer.cpp
@ -17,9 +17,9 @@

 #include "KeePass2Writer.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QIODevice>
+#include <QBuffer>
+#include <QFile>
+#include <QIODevice>

 #include "core/Database.h"
 #include "core/Endian.h"
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@ -17,8 +17,8 @@

 #include "KeePass2XmlReader.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
+#include <QBuffer>
+#include <QFile>

 #include "core/Database.h"
 #include "core/DatabaseIcons.h"
--- a/src/format/KeePass2XmlReader.h
+++ b/src/format/KeePass2XmlReader.h
@ -18,12 +18,12 @@
 #ifndef KEEPASSX_KEEPASS2XMLREADER_H
 #define KEEPASSX_KEEPASS2XMLREADER_H

-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
-#include <QtCore/QPair>
-#include <QtCore/QXmlStreamReader>
-#include <QtGui/QColor>
+#include <QColor>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QHash>
+#include <QPair>
+#include <QXmlStreamReader>

 #include "core/Global.h"
 #include "core/TimeInfo.h"
--- a/src/format/KeePass2XmlWriter.cpp
+++ b/src/format/KeePass2XmlWriter.cpp
@ -17,8 +17,8 @@

 #include "KeePass2XmlWriter.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
+#include <QBuffer>
+#include <QFile>

 #include "core/Metadata.h"
 #include "format/KeePass2RandomStream.h"
--- a/src/format/KeePass2XmlWriter.h
+++ b/src/format/KeePass2XmlWriter.h
@ -18,10 +18,10 @@
 #ifndef KEEPASSX_KEEPASS2XMLWRITER_H
 #define KEEPASSX_KEEPASS2XMLWRITER_H

-#include <QtCore/QDateTime>
-#include <QtCore/QXmlStreamWriter>
-#include <QtGui/QColor>
-#include <QtGui/QImage>
+#include <QColor>
+#include <QDateTime>
+#include <QImage>
+#include <QXmlStreamWriter>

 #include "core/Database.h"
 #include "core/Entry.h"
--- a/src/gui/AboutDialog.h
+++ b/src/gui/AboutDialog.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_ABOUTDIALOG_H
 #define KEEPASSX_ABOUTDIALOG_H

-#include <QtCore/QScopedPointer>
-#include <QtGui/QDialog>
+#include <QDialog>
+#include <QScopedPointer>

 #include "core/Global.h"

--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@ -18,7 +18,7 @@

 #include "Application.h"

-#include <QtGui/QFileOpenEvent>
+#include <QFileOpenEvent>

 #include "autotype/AutoType.h"

--- a/src/gui/Application.h
+++ b/src/gui/Application.h
@ -19,7 +19,7 @@
 #ifndef KEEPASSX_APPLICATION_H
 #define KEEPASSX_APPLICATION_H

-#include <QtGui/QApplication>
+#include <QApplication>

 #include "core/Global.h"

--- a/src/gui/ChangeMasterKeyWidget.cpp
+++ b/src/gui/ChangeMasterKeyWidget.cpp
@ -18,7 +18,7 @@
 #include "ChangeMasterKeyWidget.h"
 #include "ui_ChangeMasterKeyWidget.h"

-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 #include "keys/FileKey.h"
 #include "keys/PasswordKey.h"
--- a/src/gui/ChangeMasterKeyWidget.h
+++ b/src/gui/ChangeMasterKeyWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_CHANGEMASTERKEYWIDGET_H
 #define KEEPASSX_CHANGEMASTERKEYWIDGET_H

-#include <QtCore/QScopedPointer>
+#include <QScopedPointer>

 #include "gui/DialogyWidget.h"
 #include "keys/CompositeKey.h"
--- a/src/gui/Clipboard.cpp
+++ b/src/gui/Clipboard.cpp
@ -17,13 +17,13 @@

 #include "Clipboard.h"

-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QApplication>
+#include <QClipboard>
+#include <QTimer>

 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
+#include <QDBusConnection>
+#include <QDBusMessage>
 #endif

 #include "core/Config.h"
--- a/src/gui/Clipboard.h
+++ b/src/gui/Clipboard.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_CLIPBOARD_H
 #define KEEPASSX_CLIPBOARD_H

-#include <QtCore/QObject>
+#include <QObject>

 #include "core/Global.h"

--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@ -18,7 +18,7 @@
 #include "DatabaseOpenWidget.h"
 #include "ui_DatabaseOpenWidget.h"

-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 #include "core/Config.h"
 #include "core/Database.h"
--- a/src/gui/DatabaseOpenWidget.h
+++ b/src/gui/DatabaseOpenWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_DATABASEOPENWIDGET_H
 #define KEEPASSX_DATABASEOPENWIDGET_H

-#include <QtCore/QScopedPointer>
+#include <QScopedPointer>

 #include "gui/DialogyWidget.h"
 #include "keys/CompositeKey.h"
--- a/src/gui/DatabaseSettingsWidget.h
+++ b/src/gui/DatabaseSettingsWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_DATABASESETTINGSWIDGET_H
 #define KEEPASSX_DATABASESETTINGSWIDGET_H

-#include <QtCore/QScopedPointer>
+#include <QScopedPointer>

 #include "gui/DialogyWidget.h"

--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@ -17,9 +17,9 @@

 #include "DatabaseTabWidget.h"

-#include <QtCore/QFileInfo>
-#include <QtGui/QTabWidget>
-#include <QtGui/QMessageBox>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QTabWidget>

 #include "autotype/AutoType.h"
 #include "core/Config.h"
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DATABASETABWIDGET_H
 #define KEEPASSX_DATABASETABWIDGET_H

-#include <QtCore/QHash>
-#include <QtGui/QTabWidget>
+#include <QHash>
+#include <QTabWidget>

 #include "format/KeePass2Writer.h"
 #include "gui/DatabaseWidget.h"
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@ -18,14 +18,14 @@
 #include "DatabaseWidget.h"
 #include "ui_SearchWidget.h"

-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMessageBox>
-#include <QtGui/QSplitter>
+#include <QAction>
+#include <QDesktopServices>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QSplitter>
+#include <QTimer>

 #include "autotype/AutoType.h"
 #include "core/FilePath.h"
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DATABASEWIDGET_H
 #define KEEPASSX_DATABASEWIDGET_H

-#include <QtCore/QScopedPointer>
-#include <QtGui/QStackedWidget>
+#include <QScopedPointer>
+#include <QStackedWidget>

 #include "core/Global.h"

--- a/src/gui/DialogyWidget.cpp
+++ b/src/gui/DialogyWidget.cpp
@ -17,9 +17,9 @@

 #include "DialogyWidget.h"

-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QKeyEvent>
+#include <QDialogButtonBox>
+#include <QKeyEvent>
+#include <QPushButton>

 DialogyWidget::DialogyWidget(QWidget* parent)
    : QWidget(parent)
--- a/src/gui/DialogyWidget.h
+++ b/src/gui/DialogyWidget.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DIALOGYWIDGET_H
 #define KEEPASSX_DIALOGYWIDGET_H

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

 #include "core/Global.h"

--- a/src/gui/DragTabBar.cpp
+++ b/src/gui/DragTabBar.cpp
@ -17,9 +17,9 @@

 #include "DragTabBar.h"

-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QDragEnterEvent>
+#include <QApplication>
+#include <QDragEnterEvent>
+#include <QTimer>

 DragTabBar::DragTabBar(QWidget* parent)
    : QTabBar(parent)
--- a/src/gui/DragTabBar.h
+++ b/src/gui/DragTabBar.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_DRAGTABBAR_H
 #define KEEPASSX_DRAGTABBAR_H

-#include <QtGui/QTabBar>
+#include <QTabBar>

 #include "core/Global.h"

--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_EDITWIDGET_H
 #define KEEPASSX_EDITWIDGET_H

-#include <QtCore/QScopedPointer>
+#include <QScopedPointer>

 #include "gui/DialogyWidget.h"

--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@ -18,8 +18,8 @@
 #include "EditWidgetIcons.h"
 #include "ui_EditWidgetIcons.h"

-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
+#include <QFileDialog>
+#include <QMessageBox>

 #include "core/Group.h"
 #include "core/Metadata.h"
--- a/src/gui/EditWidgetIcons.h
+++ b/src/gui/EditWidgetIcons.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_EDITWIDGETICONS_H
 #define KEEPASSX_EDITWIDGETICONS_H

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

 #include "core/Global.h"
 #include "core/Uuid.h"
--- a/src/gui/EditWidgetProperties.h
+++ b/src/gui/EditWidgetProperties.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_EDITWIDGETPROPERTIES_H
 #define KEEPASSX_EDITWIDGETPROPERTIES_H

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

 #include "core/Global.h"
 #include "core/TimeInfo.h"
--- a/src/gui/FileDialog.h
+++ b/src/gui/FileDialog.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_FILEDIALOG_H
 #define KEEPASSX_FILEDIALOG_H

-#include <QtGui/QFileDialog>
+#include <QFileDialog>

 #include "core/Global.h"

--- a/src/gui/IconModels.h
+++ b/src/gui/IconModels.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_ICONMODELS_H
 #define KEEPASSX_ICONMODELS_H

-#include <QtCore/QAbstractListModel>
-#include <QtGui/QImage>
+#include <QAbstractListModel>
+#include <QImage>

 #include "core/Global.h"
 #include "core/Uuid.h"
--- a/src/gui/KeePass1OpenWidget.cpp
+++ b/src/gui/KeePass1OpenWidget.cpp
@ -17,9 +17,9 @@

 #include "KeePass1OpenWidget.h"

-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtGui/QMessageBox>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>

 #include "ui_DatabaseOpenWidget.h"
 #include "core/Database.h"
--- a/src/gui/LineEdit.cpp
+++ b/src/gui/LineEdit.cpp
@ -19,8 +19,8 @@

 #include "LineEdit.h"

-#include <QtGui/QStyle>
-#include <QtGui/QToolButton>
+#include <QStyle>
+#include <QToolButton>

 #include "core/FilePath.h"

--- a/src/gui/LineEdit.h
+++ b/src/gui/LineEdit.h
@ -20,7 +20,7 @@
 #ifndef KEEPASSX_LINEEDIT_H
 #define KEEPASSX_LINEEDIT_H

-#include <QtGui/QLineEdit>
+#include <QLineEdit>

 #include "core/Global.h"

--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@ -18,8 +18,8 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"

-#include <QtGui/QCloseEvent>
-#include <QtGui/QShortcut>
+#include <QCloseEvent>
+#include <QShortcut>

 #include "autotype/AutoType.h"
 #include "core/Config.h"
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_MAINWINDOW_H
 #define KEEPASSX_MAINWINDOW_H

-#include <QtGui/QActionGroup>
-#include <QtGui/QMainWindow>
+#include <QActionGroup>
+#include <QMainWindow>

 #include "core/SignalMultiplexer.h"
 #include "gui/DatabaseWidget.h"
--- a/src/gui/PasswordGeneratorWidget.h
+++ b/src/gui/PasswordGeneratorWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_PASSWORDGENERATORWIDGET_H
 #define KEEPASSX_PASSWORDGENERATORWIDGET_H

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

 #include "core/Global.h"
 #include "core/PasswordGenerator.h"
--- a/src/gui/SortFilterHideProxyModel.h
+++ b/src/gui/SortFilterHideProxyModel.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_SORTFILTERHIDEPROXYMODEL_H
 #define KEEPASSX_SORTFILTERHIDEPROXYMODEL_H

-#include <QtCore/QBitArray>
-#include <QtGui/QSortFilterProxyModel>
+#include <QBitArray>
+#include <QSortFilterProxyModel>

 #include "core/Global.h"

--- a/src/gui/UnlockDatabaseWidget.cpp
+++ b/src/gui/UnlockDatabaseWidget.cpp
@ -17,7 +17,7 @@

 #include "UnlockDatabaseWidget.h"

-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 #include "ui_DatabaseOpenWidget.h"
 #include "core/Database.h"
--- a/src/gui/WelcomeWidget.h
+++ b/src/gui/WelcomeWidget.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_WELCOMEWIDGET_H
 #define KEEPASSX_WELCOMEWIDGET_H

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

 #include "core/Global.h"

--- a/src/gui/entry/AutoTypeAssociationsModel.h
+++ b/src/gui/entry/AutoTypeAssociationsModel.h
@ -18,7 +18,7 @@
 #ifndef KEEPASSX_AUTOTYPEASSOCIATIONSMODEL_H
 #define KEEPASSX_AUTOTYPEASSOCIATIONSMODEL_H

-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>

 #include "core/AutoTypeAssociations.h"

--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@ -21,11 +21,11 @@
 #include "ui_EditEntryWidgetHistory.h"
 #include "ui_EditEntryWidgetMain.h"

-#include <QtGui/QDesktopServices>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QSortFilterProxyModel>
+#include <QDesktopServices>
+#include <QStackedLayout>
+#include <QMenu>
+#include <QMessageBox>
+#include <QSortFilterProxyModel>

 #include "core/Database.h"
 #include "core/Entry.h"
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_EDITENTRYWIDGET_H
 #define KEEPASSX_EDITENTRYWIDGET_H

-#include <QtCore/QModelIndex>
-#include <QtCore/QScopedPointer>
+#include <QModelIndex>
+#include <QScopedPointer>

 #include "gui/EditWidget.h"

--- a/src/gui/entry/EditEntryWidget_p.h
+++ b/src/gui/entry/EditEntryWidget_p.h
@ -18,10 +18,10 @@
 #ifndef KEEPASSX_EDITENTRYWIDGET_P_H
 #define KEEPASSX_EDITENTRYWIDGET_P_H

-#include <QtCore/QSize>
-#include <QtGui/QListWidget>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyledItemDelegate>
+#include <QListWidget>
+#include <QScrollBar>
+#include <QSize>
+#include <QStyledItemDelegate>

 class CategoryListViewDelegate : public QStyledItemDelegate
 {
--- a/Show More
+++ b/Show More