diff options
| author | Felix Geyer <debfx@fobos.de> | 2013-10-03 17:18:16 +0400 |
|---|---|---|
| committer | Felix Geyer <debfx@fobos.de> | 2013-10-03 17:18:16 +0400 |
| commit | 6504b6f2bdd818e1ff7c1a2b1d680f3216c09ebf (patch) | |
| tree | 7213d818d5343fc7ca875cb7687e60ef667086ca /src | |
| parent | 035271d469dd5572aac82376728be9686de32ef3 (diff) | |
Drop Qt module name from include statements.
This is a preparation to be able to build KeePassX against Qt 5.
Diffstat (limited to 'src')
123 files changed, 251 insertions, 251 deletions
diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp index 7da919360..dbf0dacca 100644 --- 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" diff --git a/src/autotype/AutoType.h b/src/autotype/AutoType.h index 51b6a540a..0916698e9 100644 --- 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" diff --git a/src/autotype/AutoTypeAction.h b/src/autotype/AutoTypeAction.h index 1bd061c1c..07e050b1a 100644 --- 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" diff --git a/src/autotype/AutoTypePlatformPlugin.h b/src/autotype/AutoTypePlatformPlugin.h index 28115393b..03960fd38 100644 --- 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" diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp index 4d60c1dce..36125dec8 100644 --- 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" diff --git a/src/autotype/AutoTypeSelectDialog.h b/src/autotype/AutoTypeSelectDialog.h index 44e909bbf..4f455c751 100644 --- 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" diff --git a/src/autotype/AutoTypeSelectView.cpp b/src/autotype/AutoTypeSelectView.cpp index 88d73e264..717e20a31 100644 --- 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) diff --git a/src/autotype/ShortcutWidget.cpp b/src/autotype/ShortcutWidget.cpp index 11e6ad9a5..56a374011 100644 --- 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" diff --git a/src/autotype/ShortcutWidget.h b/src/autotype/ShortcutWidget.h index 8dba02b34..5ff306c05 100644 --- 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" diff --git a/src/autotype/WildcardMatcher.cpp b/src/autotype/WildcardMatcher.cpp index d7e01a50a..3d7cc7511 100644 --- 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; diff --git a/src/autotype/WildcardMatcher.h b/src/autotype/WildcardMatcher.h index 8fe85eeac..6ef48743b 100644 --- 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 { diff --git a/src/autotype/WindowSelectComboBox.cpp b/src/autotype/WindowSelectComboBox.cpp index 6c26b7620..c02c83a79 100644 --- 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" diff --git a/src/autotype/WindowSelectComboBox.h b/src/autotype/WindowSelectComboBox.h index 6fb839ab8..661bc84ea 100644 --- 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" diff --git a/src/autotype/test/AutoTypeTest.h b/src/autotype/test/AutoTypeTest.h index cda9397c9..a39269b01 100644 --- 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" diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index ab8e9cfb3..7e67dc83f 100644 --- 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> 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 { diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp index bedd49fc4..6ad7fb0f2 100644 --- 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> diff --git a/src/crypto/CryptoHash.h b/src/crypto/CryptoHash.h index 3eec9981f..80df056f1 100644 --- 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; diff --git a/src/crypto/Random.h b/src/crypto/Random.h index 987ba6fd7..6728e99f6 100644 --- 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 { diff --git a/src/crypto/SymmetricCipher.h b/src/crypto/SymmetricCipher.h index a6cc9162c..d036e532e 100644 --- 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" diff --git a/src/crypto/SymmetricCipherBackend.h b/src/crypto/SymmetricCipherBackend.h index 7b737839b..fbad9b065 100644 --- 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 { diff --git a/src/format/KeePass1.h b/src/format/KeePass1.h index 0a1c56e56..fa220da03 100644 --- 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 { diff --git a/src/format/KeePass1Reader.cpp b/src/format/KeePass1Reader.cpp index 926399293..d4760b9e7 100644 --- 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" diff --git a/src/format/KeePass1Reader.h b/src/format/KeePass1Reader.h index 056a21504..e98dd7d1f 100644 --- 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; diff --git a/src/format/KeePass2.h b/src/format/KeePass2.h index d0002ddf5..b49ae4f6a 100644 --- 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" diff --git a/src/format/KeePass2RandomStream.h b/src/format/KeePass2RandomStream.h index 9f1969522..c5bcf8cdb 100644 --- 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" diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index 91482316c..72b4d8e06 100644 --- 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" diff --git a/src/format/KeePass2Reader.h b/src/format/KeePass2Reader.h index 8af87adeb..2c9daab2d 100644 --- 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" diff --git a/src/format/KeePass2Writer.cpp b/src/format/KeePass2Writer.cpp index 2a6b4eb9a..c22412a19 100644 --- 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" diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp index ecf5c0484..6e9aa582d 100644 --- 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" diff --git a/src/format/KeePass2XmlReader.h b/src/format/KeePass2XmlReader.h index 1eb41898b..4520d42bf 100644 --- 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" diff --git a/src/format/KeePass2XmlWriter.cpp b/src/format/KeePass2XmlWriter.cpp index d582476ce..fa7c4d956 100644 --- 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" diff --git a/src/format/KeePass2XmlWriter.h b/src/format/KeePass2XmlWriter.h index 78842cac4..16812fb9c 100644 --- 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" diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h index 051e831d9..1436aee4e 100644 --- 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" diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index 50e341769..2dede3f8c 100644 --- 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" diff --git a/src/gui/Application.h b/src/gui/Application.h index ef3646f15..a5f55d4dd 100644 --- 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" diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp index b03f5f721..e3cf8023f 100644 --- 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" diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h index 4995d0316..384aad2d1 100644 --- 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" diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp index 8783c1b50..eb77d2b3d 100644 --- 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" diff --git a/src/gui/Clipboard.h b/src/gui/Clipboard.h index 7c73ab343..bc2a19d31 100644 --- 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" diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index 4c1e0b4cb..bed1eb266 100644 --- 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" diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h index 0216de586..e957cd7de 100644 --- 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" diff --git a/src/gui/DatabaseSettingsWidget.h b/src/gui/DatabaseSettingsWidget.h index 1b6e36ab7..a7d283266 100644 --- 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" diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index d11effbc5..f6b608b01 100644 --- 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" diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h index 4ac9bf418..9261a065c 100644 --- 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" diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 50c9106ee..d51dec94f 100644 --- 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" diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h index a3cbe70e7..c1e1a94c8 100644 --- 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" diff --git a/src/gui/DialogyWidget.cpp b/src/gui/DialogyWidget.cpp index 8c1e73030..617224984 100644 --- 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) diff --git a/src/gui/DialogyWidget.h b/src/gui/DialogyWidget.h index b7fc45c8e..9dd05283e 100644 --- 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" diff --git a/src/gui/DragTabBar.cpp b/src/gui/DragTabBar.cpp index 0fff69127..a19031a8d 100644 --- 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) diff --git a/src/gui/DragTabBar.h b/src/gui/DragTabBar.h index d4fd42c39..1b6005df8 100644 --- 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" diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h index 1dfe3a243..c99acfb1b 100644 --- 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" diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index db4a29176..d5e824f13 100644 --- 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" diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h index 50eec6034..e18f4440f 100644 --- 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" diff --git a/src/gui/EditWidgetProperties.h b/src/gui/EditWidgetProperties.h index e9a253049..c5d0eb03e 100644 --- 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" diff --git a/src/gui/FileDialog.h b/src/gui/FileDialog.h index 99db198bf..e2e848aad 100644 --- 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" diff --git a/src/gui/IconModels.h b/src/gui/IconModels.h index ff65bf1f3..a04efa209 100644 --- 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" diff --git a/src/gui/KeePass1OpenWidget.cpp b/src/gui/KeePass1OpenWidget.cpp index f167e3bb4..3de8e88e3 100644 --- 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" diff --git a/src/gui/LineEdit.cpp b/src/gui/LineEdit.cpp index ac43a2ac1..148dc3d17 100644 --- 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" diff --git a/src/gui/LineEdit.h b/src/gui/LineEdit.h index 1dbfe78db..2672aae71 100644 --- 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" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d7127e9e8..b9ac27e0a 100644 --- 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" diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index 8e96ec9b2..74952687e 100644 --- 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" diff --git a/src/gui/PasswordGeneratorWidget.h b/src/gui/PasswordGeneratorWidget.h index 064cb6662..8451bbc59 100644 --- 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" diff --git a/src/gui/SortFilterHideProxyModel.h b/src/gui/SortFilterHideProxyModel.h index 0b212dec7..a6f1e712a 100644 --- 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" diff --git a/src/gui/UnlockDatabaseWidget.cpp b/src/gui/UnlockDatabaseWidget.cpp index 547b35be0..133dd4216 100644 --- 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" diff --git a/src/gui/WelcomeWidget.h b/src/gui/WelcomeWidget.h index 43497ebf7..983aaa040 100644 --- 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" diff --git a/src/gui/entry/AutoTypeAssociationsModel.h b/src/gui/entry/AutoTypeAssociationsModel.h index 046c826a7..ecb4247bd 100644 --- 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" diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index cbb572c77..e043e3561 100644 --- 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" diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index 7a3aaa8aa..bfdde1636 100644 --- 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" diff --git a/src/gui/entry/EditEntryWidget_p.h b/src/gui/entry/EditEntryWidget_p.h index 4619eeecd..cdae8bd3d 100644 --- 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 { diff --git a/src/gui/entry/EntryAttachmentsModel.h b/src/gui/entry/EntryAttachmentsModel.h index 7668013f9..177cde063 100644 --- a/src/gui/entry/EntryAttachmentsModel.h +++ b/src/gui/entry/EntryAttachmentsModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_ENTRYATTACHMENTSMODEL_H #define KEEPASSX_ENTRYATTACHMENTSMODEL_H -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> #include "core/Global.h" diff --git a/src/gui/entry/EntryAttributesModel.h b/src/gui/entry/EntryAttributesModel.h index 421921f4e..f6ac65149 100644 --- a/src/gui/entry/EntryAttributesModel.h +++ b/src/gui/entry/EntryAttributesModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_ENTRYATTRIBUTESMODEL_H #define KEEPASSX_ENTRYATTRIBUTESMODEL_H -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> #include "core/Global.h" diff --git a/src/gui/entry/EntryHistoryModel.h b/src/gui/entry/EntryHistoryModel.h index dd013f82f..6c8073ac6 100644 --- a/src/gui/entry/EntryHistoryModel.h +++ b/src/gui/entry/EntryHistoryModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_ENTRYHISTORYMODEL_H #define KEEPASSX_ENTRYHISTORYMODEL_H -#include <QtCore/QAbstractTableModel> +#include <QAbstractTableModel> #include "core/Global.h" diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp index 5de746daa..04273bd8d 100644 --- a/src/gui/entry/EntryModel.cpp +++ b/src/gui/entry/EntryModel.cpp @@ -17,8 +17,8 @@ #include "EntryModel.h" -#include <QtCore/QMimeData> -#include <QtGui/QFont> +#include <QFont> +#include <QMimeData> #include "core/DatabaseIcons.h" #include "core/Entry.h" diff --git a/src/gui/entry/EntryModel.h b/src/gui/entry/EntryModel.h index 94e48b450..20bcad999 100644 --- a/src/gui/entry/EntryModel.h +++ b/src/gui/entry/EntryModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_ENTRYMODEL_H #define KEEPASSX_ENTRYMODEL_H -#include <QtCore/QAbstractTableModel> +#include <QAbstractTableModel> #include "core/Global.h" diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp index 90384795b..7c64557a5 100644 --- a/src/gui/entry/EntryView.cpp +++ b/src/gui/entry/EntryView.cpp @@ -17,7 +17,7 @@ #include "EntryView.h" -#include <QtGui/QKeyEvent> +#include <QKeyEvent> #include "gui/SortFilterHideProxyModel.h" diff --git a/src/gui/entry/EntryView.h b/src/gui/entry/EntryView.h index 45187a9e0..b5f056aa0 100644 --- a/src/gui/entry/EntryView.h +++ b/src/gui/entry/EntryView.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_ENTRYVIEW_H #define KEEPASSX_ENTRYVIEW_H -#include <QtGui/QTreeView> +#include <QTreeView> #include "core/Global.h" diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h index 454b2fb5c..de075be87 100644 --- a/src/gui/group/EditGroupWidget.h +++ b/src/gui/group/EditGroupWidget.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_EDITGROUPWIDGET_H #define KEEPASSX_EDITGROUPWIDGET_H -#include <QtCore/QScopedPointer> -#include <QtGui/QComboBox> +#include <QComboBox> +#include <QScopedPointer> #include "core/Group.h" #include "gui/EditWidget.h" diff --git a/src/gui/group/GroupModel.cpp b/src/gui/group/GroupModel.cpp index db63079ce..73b9a59d9 100644 --- a/src/gui/group/GroupModel.cpp +++ b/src/gui/group/GroupModel.cpp @@ -17,8 +17,8 @@ #include "GroupModel.h" -#include <QtCore/QMimeData> -#include <QtGui/QFont> +#include <QFont> +#include <QMimeData> #include "core/Database.h" #include "core/DatabaseIcons.h" diff --git a/src/gui/group/GroupModel.h b/src/gui/group/GroupModel.h index f3ef51643..173ea3a23 100644 --- a/src/gui/group/GroupModel.h +++ b/src/gui/group/GroupModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_GROUPMODEL_H #define KEEPASSX_GROUPMODEL_H -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> #include "core/Global.h" diff --git a/src/gui/group/GroupView.cpp b/src/gui/group/GroupView.cpp index 42a68036e..3c9366229 100644 --- a/src/gui/group/GroupView.cpp +++ b/src/gui/group/GroupView.cpp @@ -17,8 +17,8 @@ #include "GroupView.h" -#include <QtCore/QMetaObject> -#include <QtGui/QDragMoveEvent> +#include <QDragMoveEvent> +#include <QMetaObject> #include "core/Database.h" #include "core/Group.h" diff --git a/src/gui/group/GroupView.h b/src/gui/group/GroupView.h index eff83aefd..98073f633 100644 --- a/src/gui/group/GroupView.h +++ b/src/gui/group/GroupView.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_GROUPVIEW_H #define KEEPASSX_GROUPVIEW_H -#include <QtGui/QTreeView> +#include <QTreeView> #include "core/Global.h" diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index 905a6dbe8..8f6c5319e 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -18,8 +18,8 @@ #include "CompositeKey.h" #include "CompositeKey_p.h" -#include <QtCore/QtConcurrentRun> -#include <QtCore/QTime> +#include <QtConcurrentRun> +#include <QTime> #include "crypto/CryptoHash.h" #include "crypto/SymmetricCipher.h" diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h index 1d3233cca..ff738e61a 100644 --- a/src/keys/CompositeKey.h +++ b/src/keys/CompositeKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_COMPOSITEKEY_H #define KEEPASSX_COMPOSITEKEY_H -#include <QtCore/QList> +#include <QList> #include "keys/Key.h" diff --git a/src/keys/CompositeKey_p.h b/src/keys/CompositeKey_p.h index c704f086b..27fa7abc4 100644 --- a/src/keys/CompositeKey_p.h +++ b/src/keys/CompositeKey_p.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_COMPOSITEKEY_P_H #define KEEPASSX_COMPOSITEKEY_P_H -#include <QtCore/QThread> +#include <QThread> class TransformKeyBenchmarkThread : public QThread { diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp index 5a97c9b11..77687ba74 100644 --- a/src/keys/FileKey.cpp +++ b/src/keys/FileKey.cpp @@ -17,8 +17,8 @@ #include "FileKey.h" -#include <QtCore/QFile> -#include <QtCore/QXmlStreamReader> +#include <QFile> +#include <QXmlStreamReader> #include "core/Tools.h" #include "crypto/CryptoHash.h" diff --git a/src/keys/FileKey.h b/src/keys/FileKey.h index e4e67985b..f98543364 100644 --- a/src/keys/FileKey.h +++ b/src/keys/FileKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_FILEKEY_H #define KEEPASSX_FILEKEY_H -#include <QtCore/QXmlStreamReader> +#include <QXmlStreamReader> #include "core/Global.h" #include "keys/Key.h" diff --git a/src/keys/Key.h b/src/keys/Key.h index d6d878918..2172f5702 100644 --- a/src/keys/Key.h +++ b/src/keys/Key.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEY_H #define KEEPASSX_KEY_H -#include <QtCore/QByteArray> +#include <QByteArray> class Key { diff --git a/src/keys/PasswordKey.h b/src/keys/PasswordKey.h index df545573b..8c40f7735 100644 --- a/src/keys/PasswordKey.h +++ b/src/keys/PasswordKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_PASSWORDKEY_H #define KEEPASSX_PASSWORDKEY_H -#include <QtCore/QString> +#include <QString> #include "keys/Key.h" diff --git a/src/main.cpp b/src/main.cpp index c32418714..786546c71 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <QtCore/QFile> +#include <QFile> #include "core/ArgumentParser.h" #include "core/Config.h" diff --git a/src/streams/HashedBlockStream.h b/src/streams/HashedBlockStream.h index 106bcf0fa..f38d5716a 100644 --- a/src/streams/HashedBlockStream.h +++ b/src/streams/HashedBlockStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_HASHEDBLOCKSTREAM_H #define KEEPASSX_HASHEDBLOCKSTREAM_H -#include <QtCore/QSysInfo> +#include <QSysInfo> #include "streams/LayeredStream.h" diff --git a/src/streams/LayeredStream.h b/src/streams/LayeredStream.h index 3aca46581..285c16ddf 100644 --- a/src/streams/LayeredStream.h +++ b/src/streams/LayeredStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_LAYEREDSTREAM_H #define KEEPASSX_LAYEREDSTREAM_H -#include <QtCore/QIODevice> +#include <QIODevice> #include "core/Global.h" diff --git a/src/streams/SymmetricCipherStream.h b/src/streams/SymmetricCipherStream.h index 96cb6476d..53e252f24 100644 --- a/src/streams/SymmetricCipherStream.h +++ b/src/streams/SymmetricCipherStream.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_SYMMETRICCIPHERSTREAM_H #define KEEPASSX_SYMMETRICCIPHERSTREAM_H -#include <QtCore/QByteArray> -#include <QtCore/QScopedPointer> +#include <QByteArray> +#include <QScopedPointer> #include "crypto/SymmetricCipher.h" #include "streams/LayeredStream.h" diff --git a/src/streams/qtiocompressor.h b/src/streams/qtiocompressor.h index f325bb663..cebd98293 100644 --- a/src/streams/qtiocompressor.h +++ b/src/streams/qtiocompressor.h @@ -47,7 +47,7 @@ #ifndef QTIOCOMPRESSOR_H #define QTIOCOMPRESSOR_H -#include <QtCore/QIODevice> +#include <QIODevice> class QtIOCompressorPrivate; class QtIOCompressor : public QIODevice |