From 6504b6f2bdd818e1ff7c1a2b1d680f3216c09ebf Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 3 Oct 2013 15:18:16 +0200 Subject: [PATCH] Drop Qt module name from include statements. This is a preparation to be able to build KeePassX against Qt 5. --- CMakeLists.txt | 11 ++--------- src/autotype/AutoType.cpp | 4 ++-- src/autotype/AutoType.h | 6 +++--- src/autotype/AutoTypeAction.h | 4 ++-- src/autotype/AutoTypePlatformPlugin.h | 2 +- src/autotype/AutoTypeSelectDialog.cpp | 10 +++++----- src/autotype/AutoTypeSelectDialog.h | 6 +++--- src/autotype/AutoTypeSelectView.cpp | 2 +- src/autotype/ShortcutWidget.cpp | 2 +- src/autotype/ShortcutWidget.h | 2 +- src/autotype/WildcardMatcher.cpp | 2 +- src/autotype/WildcardMatcher.h | 2 +- src/autotype/WindowSelectComboBox.cpp | 2 +- src/autotype/WindowSelectComboBox.h | 2 +- src/autotype/test/AutoTypeTest.h | 2 +- src/autotype/x11/AutoTypeX11.h | 10 +++++----- src/core/ArgumentParser.h | 4 ++-- src/core/AutoTypeAssociations.h | 2 +- src/core/Config.cpp | 10 +++++----- src/core/Config.h | 4 ++-- src/core/Database.cpp | 6 +++--- src/core/Database.h | 4 ++-- src/core/DatabaseIcons.h | 8 ++++---- src/core/Endian.cpp | 4 ++-- src/core/Endian.h | 4 ++-- src/core/Entry.h | 16 ++++++++-------- src/core/EntryAttachments.h | 4 ++-- src/core/EntryAttributes.h | 8 ++++---- src/core/FilePath.cpp | 6 +++--- src/core/FilePath.h | 6 +++--- src/core/Global.h | 2 +- src/core/Group.h | 8 ++++---- src/core/ListDeleter.h | 2 +- src/core/Metadata.h | 10 +++++----- src/core/PasswordGenerator.h | 6 +++--- src/core/SignalMultiplexer.h | 4 ++-- src/core/TimeDelta.cpp | 2 +- src/core/TimeDelta.h | 2 +- src/core/TimeInfo.h | 2 +- src/core/Tools.cpp | 14 +++++++------- src/core/Tools.h | 6 +++--- src/core/Uuid.cpp | 2 +- src/core/Uuid.h | 4 ++-- src/core/qsavefile.cpp | 6 +++--- src/core/qsavefile.h | 4 ++-- src/core/qsavefile_p.h | 2 +- src/crypto/Crypto.cpp | 2 +- src/crypto/CryptoHash.h | 2 +- src/crypto/Random.h | 2 +- src/crypto/SymmetricCipher.h | 4 ++-- src/crypto/SymmetricCipherBackend.h | 2 +- src/format/KeePass1.h | 2 +- src/format/KeePass1Reader.cpp | 6 +++--- src/format/KeePass1Reader.h | 6 +++--- src/format/KeePass2.h | 2 +- src/format/KeePass2RandomStream.h | 2 +- src/format/KeePass2Reader.cpp | 6 +++--- src/format/KeePass2Reader.h | 2 +- src/format/KeePass2Writer.cpp | 6 +++--- src/format/KeePass2XmlReader.cpp | 4 ++-- src/format/KeePass2XmlReader.h | 12 ++++++------ src/format/KeePass2XmlWriter.cpp | 4 ++-- src/format/KeePass2XmlWriter.h | 8 ++++---- src/gui/AboutDialog.h | 4 ++-- src/gui/Application.cpp | 2 +- src/gui/Application.h | 2 +- src/gui/ChangeMasterKeyWidget.cpp | 2 +- src/gui/ChangeMasterKeyWidget.h | 2 +- src/gui/Clipboard.cpp | 10 +++++----- src/gui/Clipboard.h | 2 +- src/gui/DatabaseOpenWidget.cpp | 2 +- src/gui/DatabaseOpenWidget.h | 2 +- src/gui/DatabaseSettingsWidget.h | 2 +- src/gui/DatabaseTabWidget.cpp | 6 +++--- src/gui/DatabaseTabWidget.h | 4 ++-- src/gui/DatabaseWidget.cpp | 16 ++++++++-------- src/gui/DatabaseWidget.h | 4 ++-- src/gui/DialogyWidget.cpp | 6 +++--- src/gui/DialogyWidget.h | 4 ++-- src/gui/DragTabBar.cpp | 6 +++--- src/gui/DragTabBar.h | 2 +- src/gui/EditWidget.h | 2 +- src/gui/EditWidgetIcons.cpp | 4 ++-- src/gui/EditWidgetIcons.h | 2 +- src/gui/EditWidgetProperties.h | 2 +- src/gui/FileDialog.h | 2 +- src/gui/IconModels.h | 4 ++-- src/gui/KeePass1OpenWidget.cpp | 6 +++--- src/gui/LineEdit.cpp | 4 ++-- src/gui/LineEdit.h | 2 +- src/gui/MainWindow.cpp | 4 ++-- src/gui/MainWindow.h | 4 ++-- src/gui/PasswordGeneratorWidget.h | 2 +- src/gui/SortFilterHideProxyModel.h | 4 ++-- src/gui/UnlockDatabaseWidget.cpp | 2 +- src/gui/WelcomeWidget.h | 2 +- src/gui/entry/AutoTypeAssociationsModel.h | 2 +- src/gui/entry/EditEntryWidget.cpp | 10 +++++----- src/gui/entry/EditEntryWidget.h | 4 ++-- src/gui/entry/EditEntryWidget_p.h | 8 ++++---- src/gui/entry/EntryAttachmentsModel.h | 2 +- src/gui/entry/EntryAttributesModel.h | 2 +- src/gui/entry/EntryHistoryModel.h | 2 +- src/gui/entry/EntryModel.cpp | 4 ++-- src/gui/entry/EntryModel.h | 2 +- src/gui/entry/EntryView.cpp | 2 +- src/gui/entry/EntryView.h | 2 +- src/gui/group/EditGroupWidget.h | 4 ++-- src/gui/group/GroupModel.cpp | 4 ++-- src/gui/group/GroupModel.h | 2 +- src/gui/group/GroupView.cpp | 4 ++-- src/gui/group/GroupView.h | 2 +- src/keys/CompositeKey.cpp | 4 ++-- src/keys/CompositeKey.h | 2 +- src/keys/CompositeKey_p.h | 2 +- src/keys/FileKey.cpp | 4 ++-- src/keys/FileKey.h | 2 +- src/keys/Key.h | 2 +- src/keys/PasswordKey.h | 2 +- src/main.cpp | 2 +- src/streams/HashedBlockStream.h | 2 +- src/streams/LayeredStream.h | 2 +- src/streams/SymmetricCipherStream.h | 4 ++-- src/streams/qtiocompressor.h | 2 +- tests/TestArgumentParser.cpp | 2 +- tests/TestArgumentParser.h | 4 ++-- tests/TestAutoType.cpp | 4 ++-- tests/TestAutoType.h | 2 +- tests/TestCryptoHash.cpp | 2 +- tests/TestCryptoHash.h | 2 +- tests/TestDeletedObjects.cpp | 2 +- tests/TestDeletedObjects.h | 2 +- tests/TestEntry.cpp | 2 +- tests/TestEntry.h | 2 +- tests/TestEntryModel.cpp | 4 ++-- tests/TestEntryModel.h | 2 +- tests/TestGroup.cpp | 6 +++--- tests/TestGroup.h | 2 +- tests/TestGroupModel.cpp | 4 ++-- tests/TestGroupModel.h | 2 +- tests/TestHashedBlockStream.cpp | 4 ++-- tests/TestHashedBlockStream.h | 2 +- tests/TestKeePass1Reader.cpp | 4 ++-- tests/TestKeePass1Reader.h | 4 ++-- tests/TestKeePass2RandomStream.cpp | 2 +- tests/TestKeePass2RandomStream.h | 2 +- tests/TestKeePass2Reader.cpp | 2 +- tests/TestKeePass2Reader.h | 2 +- tests/TestKeePass2Writer.cpp | 4 ++-- tests/TestKeePass2Writer.h | 2 +- tests/TestKeePass2XmlReader.cpp | 4 ++-- tests/TestKeePass2XmlReader.h | 4 ++-- tests/TestKeys.cpp | 4 ++-- tests/TestKeys.h | 2 +- tests/TestModified.cpp | 4 ++-- tests/TestModified.h | 2 +- tests/TestQSaveFile.cpp | 2 +- tests/TestQSaveFile.h | 2 +- tests/TestSymmetricCipher.cpp | 4 ++-- tests/TestSymmetricCipher.h | 2 +- tests/TestWildcardMatcher.cpp | 2 +- tests/TestWildcardMatcher.h | 2 +- tests/gui/TestGui.cpp | 20 ++++++++++---------- tests/gui/TestGui.h | 4 ++-- tests/gui/TestGuiPixmaps.cpp | 2 +- tests/gui/TestGuiPixmaps.h | 6 +++--- tests/modeltest.cpp | 4 ++-- tests/modeltest.h | 6 +++--- tests/tests.h | 2 +- utils/kdbx-extract.cpp | 8 ++++---- 170 files changed, 332 insertions(+), 339 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddcd1051..3ec60231 100644 --- 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) diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp index 7da91936..dbf0dacc 100644 --- a/src/autotype/AutoType.cpp +++ b/src/autotype/AutoType.cpp @@ -17,8 +17,8 @@ #include "AutoType.h" -#include -#include +#include +#include #include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypeSelectDialog.h" diff --git a/src/autotype/AutoType.h b/src/autotype/AutoType.h index 51b6a540..0916698e 100644 --- a/src/autotype/AutoType.h +++ b/src/autotype/AutoType.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_AUTOTYPE_H #define KEEPASSX_AUTOTYPE_H -#include -#include -#include +#include +#include +#include #include "core/Global.h" diff --git a/src/autotype/AutoTypeAction.h b/src/autotype/AutoTypeAction.h index 1bd061c1..07e050b1 100644 --- a/src/autotype/AutoTypeAction.h +++ b/src/autotype/AutoTypeAction.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_AUTOTYPEACTION_H #define KEEPASSX_AUTOTYPEACTION_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/autotype/AutoTypePlatformPlugin.h b/src/autotype/AutoTypePlatformPlugin.h index 28115393..03960fd3 100644 --- a/src/autotype/AutoTypePlatformPlugin.h +++ b/src/autotype/AutoTypePlatformPlugin.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_AUTOTYPEPLATFORMPLUGIN_H #define KEEPASSX_AUTOTYPEPLATFORMPLUGIN_H -#include +#include #include "autotype/AutoTypeAction.h" diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp index 4d60c1dc..36125dec 100644 --- a/src/autotype/AutoTypeSelectDialog.cpp +++ b/src/autotype/AutoTypeSelectDialog.cpp @@ -17,11 +17,11 @@ #include "AutoTypeSelectDialog.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "autotype/AutoTypeSelectView.h" #include "core/FilePath.h" diff --git a/src/autotype/AutoTypeSelectDialog.h b/src/autotype/AutoTypeSelectDialog.h index 44e909bb..4f455c75 100644 --- a/src/autotype/AutoTypeSelectDialog.h +++ b/src/autotype/AutoTypeSelectDialog.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_AUTOTYPESELECTDIALOG_H #define KEEPASSX_AUTOTYPESELECTDIALOG_H -#include -#include -#include +#include +#include +#include #include "core/Global.h" diff --git a/src/autotype/AutoTypeSelectView.cpp b/src/autotype/AutoTypeSelectView.cpp index 88d73e26..717e20a3 100644 --- a/src/autotype/AutoTypeSelectView.cpp +++ b/src/autotype/AutoTypeSelectView.cpp @@ -17,7 +17,7 @@ #include "AutoTypeSelectView.h" -#include +#include AutoTypeSelectView::AutoTypeSelectView(QWidget* parent) : EntryView(parent) diff --git a/src/autotype/ShortcutWidget.cpp b/src/autotype/ShortcutWidget.cpp index 11e6ad9a..56a37401 100644 --- a/src/autotype/ShortcutWidget.cpp +++ b/src/autotype/ShortcutWidget.cpp @@ -17,7 +17,7 @@ #include "ShortcutWidget.h" -#include +#include #include "autotype/AutoType.h" diff --git a/src/autotype/ShortcutWidget.h b/src/autotype/ShortcutWidget.h index 8dba02b3..5ff306c0 100644 --- a/src/autotype/ShortcutWidget.h +++ b/src/autotype/ShortcutWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_SHORTCUTWIDGET_H #define KEEPASSX_SHORTCUTWIDGET_H -#include +#include #include "core/Global.h" diff --git a/src/autotype/WildcardMatcher.cpp b/src/autotype/WildcardMatcher.cpp index d7e01a50..3d7cc751 100644 --- a/src/autotype/WildcardMatcher.cpp +++ b/src/autotype/WildcardMatcher.cpp @@ -17,7 +17,7 @@ #include "WildcardMatcher.h" -#include +#include const QChar WildcardMatcher::Wildcard = '*'; const Qt::CaseSensitivity WildcardMatcher::Sensitivity = Qt::CaseInsensitive; diff --git a/src/autotype/WildcardMatcher.h b/src/autotype/WildcardMatcher.h index 8fe85eea..6ef48743 100644 --- a/src/autotype/WildcardMatcher.h +++ b/src/autotype/WildcardMatcher.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_WILDCARDMATCHER_H #define KEEPASSX_WILDCARDMATCHER_H -#include +#include class WildcardMatcher { diff --git a/src/autotype/WindowSelectComboBox.cpp b/src/autotype/WindowSelectComboBox.cpp index 6c26b762..c02c83a7 100644 --- a/src/autotype/WindowSelectComboBox.cpp +++ b/src/autotype/WindowSelectComboBox.cpp @@ -17,7 +17,7 @@ #include "WindowSelectComboBox.h" -#include +#include #include "autotype/AutoType.h" diff --git a/src/autotype/WindowSelectComboBox.h b/src/autotype/WindowSelectComboBox.h index 6fb839ab..661bc84e 100644 --- a/src/autotype/WindowSelectComboBox.h +++ b/src/autotype/WindowSelectComboBox.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_WINDOWSELECTCOMBOBOX_H #define KEEPASSX_WINDOWSELECTCOMBOBOX_H -#include +#include #include "core/Global.h" diff --git a/src/autotype/test/AutoTypeTest.h b/src/autotype/test/AutoTypeTest.h index cda9397c..a39269b0 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 +#include #include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypeAction.h" diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index ab8e9cfb..7e67dc83 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/core/ArgumentParser.h b/src/core/ArgumentParser.h index 3c027916..b03f976b 100644 --- a/src/core/ArgumentParser.h +++ b/src/core/ArgumentParser.h @@ -20,8 +20,8 @@ #include "core/Global.h" -#include -#include +#include +#include class ArgumentParser { diff --git a/src/core/AutoTypeAssociations.h b/src/core/AutoTypeAssociations.h index c71a45b4..1b5871b3 100644 --- a/src/core/AutoTypeAssociations.h +++ b/src/core/AutoTypeAssociations.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_AUTOTYPEASSOCIATIONS_H #define KEEPASSX_AUTOTYPEASSOCIATIONS_H -#include +#include #include "core/Global.h" diff --git a/src/core/Config.cpp b/src/core/Config.cpp index c06250c4..48803d69 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -17,11 +17,11 @@ #include "Config.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include Config* Config::m_instance(Q_NULLPTR); diff --git a/src/core/Config.h b/src/core/Config.h index 0a775bdf..ee308268 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_CONFIG_H #define KEEPASSX_CONFIG_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/core/Database.cpp b/src/core/Database.cpp index 3e656873..80d16822 100644 --- a/src/core/Database.cpp +++ b/src/core/Database.cpp @@ -17,9 +17,9 @@ #include "Database.h" -#include -#include -#include +#include +#include +#include #include "core/Group.h" #include "core/Metadata.h" diff --git a/src/core/Database.h b/src/core/Database.h index f4173441..267d6b0b 100644 --- a/src/core/Database.h +++ b/src/core/Database.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_DATABASE_H #define KEEPASSX_DATABASE_H -#include -#include +#include +#include #include "core/Uuid.h" #include "keys/CompositeKey.h" diff --git a/src/core/DatabaseIcons.h b/src/core/DatabaseIcons.h index cc840df4..68d1e0cb 100644 --- a/src/core/DatabaseIcons.h +++ b/src/core/DatabaseIcons.h @@ -18,10 +18,10 @@ #ifndef KEEPASSX_DATABASEICONS_H #define KEEPASSX_DATABASEICONS_H -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Global.h" diff --git a/src/core/Endian.cpp b/src/core/Endian.cpp index f96301a4..bf838abc 100644 --- a/src/core/Endian.cpp +++ b/src/core/Endian.cpp @@ -17,8 +17,8 @@ #include "Endian.h" -#include -#include +#include +#include namespace Endian { diff --git a/src/core/Endian.h b/src/core/Endian.h index 152cf9a1..0cea617c 100644 --- a/src/core/Endian.h +++ b/src/core/Endian.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_ENDIAN_H #define KEEPASSX_ENDIAN_H -#include -#include +#include +#include class QIODevice; diff --git a/src/core/Entry.h b/src/core/Entry.h index d8677521..d4a52933 100644 --- a/src/core/Entry.h +++ b/src/core/Entry.h @@ -18,14 +18,14 @@ #ifndef KEEPASSX_ENTRY_H #define KEEPASSX_ENTRY_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "core/AutoTypeAssociations.h" #include "core/EntryAttachments.h" diff --git a/src/core/EntryAttachments.h b/src/core/EntryAttachments.h index 31b0c4ce..b482f42e 100644 --- a/src/core/EntryAttachments.h +++ b/src/core/EntryAttachments.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_ENTRYATTACHMENTS_H #define KEEPASSX_ENTRYATTACHMENTS_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h index 8d17eb81..420c085f 100644 --- a/src/core/EntryAttributes.h +++ b/src/core/EntryAttributes.h @@ -18,10 +18,10 @@ #ifndef KEEPASSX_ENTRYATTRIBUTES_H #define KEEPASSX_ENTRYATTRIBUTES_H -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Global.h" diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp index 6e488ac0..dd300ec1 100644 --- a/src/core/FilePath.cpp +++ b/src/core/FilePath.cpp @@ -17,9 +17,9 @@ #include "FilePath.h" -#include -#include -#include +#include +#include +#include #include "config-keepassx.h" diff --git a/src/core/FilePath.h b/src/core/FilePath.h index d2d8c739..411cbbc7 100644 --- a/src/core/FilePath.h +++ b/src/core/FilePath.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_FILEPATH_H #define KEEPASSX_FILEPATH_H -#include -#include -#include +#include +#include +#include #include "core/Global.h" diff --git a/src/core/Global.h b/src/core/Global.h index cb9cf5df..0b1ed214 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 +#include #ifdef Q_CC_CLANG # if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) diff --git a/src/core/Group.h b/src/core/Group.h index d22b6ef2..b1a51d18 100644 --- a/src/core/Group.h +++ b/src/core/Group.h @@ -18,10 +18,10 @@ #ifndef KEEPASSX_GROUP_H #define KEEPASSX_GROUP_H -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Database.h" #include "core/Entry.h" diff --git a/src/core/ListDeleter.h b/src/core/ListDeleter.h index 76c7bda9..5687cbb1 100644 --- a/src/core/ListDeleter.h +++ b/src/core/ListDeleter.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_LISTDELETER_H #define KEEPASSX_LISTDELETER_H -#include +#include template class ListDeleter diff --git a/src/core/Metadata.h b/src/core/Metadata.h index 8e9e8a7d..ec3c692e 100644 --- a/src/core/Metadata.h +++ b/src/core/Metadata.h @@ -18,11 +18,11 @@ #ifndef KEEPASSX_METADATA_H #define KEEPASSX_METADATA_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "core/Global.h" #include "core/Uuid.h" diff --git a/src/core/PasswordGenerator.h b/src/core/PasswordGenerator.h index a9a21acd..2a9a47b8 100644 --- a/src/core/PasswordGenerator.h +++ b/src/core/PasswordGenerator.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_PASSWORDGENERATOR_H #define KEEPASSX_PASSWORDGENERATOR_H -#include -#include -#include +#include +#include +#include #include "core/Global.h" diff --git a/src/core/SignalMultiplexer.h b/src/core/SignalMultiplexer.h index 1c5e44f4..6d39cd5b 100644 --- a/src/core/SignalMultiplexer.h +++ b/src/core/SignalMultiplexer.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_SIGNALMULTIPLEXER_H #define KEEPASSX_SIGNALMULTIPLEXER_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/core/TimeDelta.cpp b/src/core/TimeDelta.cpp index 989d744b..e2dbdac4 100644 --- a/src/core/TimeDelta.cpp +++ b/src/core/TimeDelta.cpp @@ -17,7 +17,7 @@ #include "TimeDelta.h" -#include +#include 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 c8fa9fd0..d52ba72e 100644 --- a/src/core/TimeDelta.h +++ b/src/core/TimeDelta.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TIMEDELTA_H #define KEEPASSX_TIMEDELTA_H -#include +#include class QDateTime; class TimeDelta; diff --git a/src/core/TimeInfo.h b/src/core/TimeInfo.h index 2c8d505c..455c002c 100644 --- a/src/core/TimeInfo.h +++ b/src/core/TimeInfo.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TIMEINFO_H #define KEEPASSX_TIMEINFO_H -#include +#include class TimeInfo { diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp index 04d053bb..37ef50c4 100644 --- a/src/core/Tools.cpp +++ b/src/core/Tools.cpp @@ -17,16 +17,16 @@ #include "Tools.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) -#include +#include #else -#include +#include #endif #ifdef Q_OS_WIN diff --git a/src/core/Tools.h b/src/core/Tools.h index 86c8338c..8058f251 100644 --- a/src/core/Tools.h +++ b/src/core/Tools.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_TOOLS_H #define KEEPASSX_TOOLS_H -#include -#include -#include +#include +#include +#include #include "core/Global.h" diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp index ae8b2dc5..8cd6a9b8 100644 --- a/src/core/Uuid.cpp +++ b/src/core/Uuid.cpp @@ -17,7 +17,7 @@ #include "Uuid.h" -#include +#include #include "crypto/Random.h" diff --git a/src/core/Uuid.h b/src/core/Uuid.h index ddcd39c8..8c39a7cb 100644 --- a/src/core/Uuid.h +++ b/src/core/Uuid.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_UUID_H #define KEEPASSX_UUID_H -#include -#include +#include +#include class Uuid { diff --git a/src/core/qsavefile.cpp b/src/core/qsavefile.cpp index 51ef0c33..24753500 100644 --- a/src/core/qsavefile.cpp +++ b/src/core/qsavefile.cpp @@ -42,9 +42,9 @@ #include "qsavefile.h" #include "qsavefile_p.h" -#include -#include -#include +#include +#include +#include QSaveFilePrivate::QSaveFilePrivate() : tempFile(0), error(QFile::NoError) diff --git a/src/core/qsavefile.h b/src/core/qsavefile.h index 48a8bf32..84d5a245 100644 --- a/src/core/qsavefile.h +++ b/src/core/qsavefile.h @@ -42,8 +42,8 @@ #ifndef QSAVEFILE_H #define QSAVEFILE_H -#include -#include +#include +#include #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 7c7cfe66..549ecc1b 100644 --- a/src/core/qsavefile_p.h +++ b/src/core/qsavefile_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include class QSaveFilePrivate { diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp index bedd49fc..6ad7fb0f 100644 --- a/src/crypto/Crypto.cpp +++ b/src/crypto/Crypto.cpp @@ -17,7 +17,7 @@ #include "Crypto.h" -#include +#include #include diff --git a/src/crypto/CryptoHash.h b/src/crypto/CryptoHash.h index 3eec9981..80df056f 100644 --- a/src/crypto/CryptoHash.h +++ b/src/crypto/CryptoHash.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_CRYPTOHASH_H #define KEEPASSX_CRYPTOHASH_H -#include +#include class CryptoHashPrivate; diff --git a/src/crypto/Random.h b/src/crypto/Random.h index 987ba6fd..6728e99f 100644 --- a/src/crypto/Random.h +++ b/src/crypto/Random.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_RANDOM_H #define KEEPASSX_RANDOM_H -#include +#include class Random { diff --git a/src/crypto/SymmetricCipher.h b/src/crypto/SymmetricCipher.h index a6cc9162..d036e532 100644 --- a/src/crypto/SymmetricCipher.h +++ b/src/crypto/SymmetricCipher.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_SYMMETRICCIPHER_H #define KEEPASSX_SYMMETRICCIPHER_H -#include -#include +#include +#include #include "core/Global.h" #include "crypto/SymmetricCipherBackend.h" diff --git a/src/crypto/SymmetricCipherBackend.h b/src/crypto/SymmetricCipherBackend.h index 7b737839..fbad9b06 100644 --- a/src/crypto/SymmetricCipherBackend.h +++ b/src/crypto/SymmetricCipherBackend.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_SYMMETRICCIPHERBACKEND_H #define KEEPASSX_SYMMETRICCIPHERBACKEND_H -#include +#include class SymmetricCipherBackend { diff --git a/src/format/KeePass1.h b/src/format/KeePass1.h index 0a1c56e5..fa220da0 100644 --- a/src/format/KeePass1.h +++ b/src/format/KeePass1.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEEPASS1_H #define KEEPASSX_KEEPASS1_H -#include +#include namespace KeePass1 { diff --git a/src/format/KeePass1Reader.cpp b/src/format/KeePass1Reader.cpp index 92639929..d4760b9e 100644 --- a/src/format/KeePass1Reader.cpp +++ b/src/format/KeePass1Reader.cpp @@ -17,9 +17,9 @@ #include "KeePass1Reader.h" -#include -#include -#include +#include +#include +#include #include "core/Database.h" #include "core/Endian.h" diff --git a/src/format/KeePass1Reader.h b/src/format/KeePass1Reader.h index 056a2150..e98dd7d1 100644 --- a/src/format/KeePass1Reader.h +++ b/src/format/KeePass1Reader.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_KEEPASS1READER_H #define KEEPASSX_KEEPASS1READER_H -#include -#include -#include +#include +#include +#include class Database; class Entry; diff --git a/src/format/KeePass2.h b/src/format/KeePass2.h index d0002ddf..b49ae4f6 100644 --- a/src/format/KeePass2.h +++ b/src/format/KeePass2.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEEPASS2_H #define KEEPASSX_KEEPASS2_H -#include +#include #include "core/Uuid.h" diff --git a/src/format/KeePass2RandomStream.h b/src/format/KeePass2RandomStream.h index 9f196952..c5bcf8cd 100644 --- a/src/format/KeePass2RandomStream.h +++ b/src/format/KeePass2RandomStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEEPASS2RANDOMSTREAM_H #define KEEPASSX_KEEPASS2RANDOMSTREAM_H -#include +#include #include "crypto/SymmetricCipher.h" diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index 91482316..72b4d8e0 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -17,9 +17,9 @@ #include "KeePass2Reader.h" -#include -#include -#include +#include +#include +#include #include "core/Database.h" #include "core/Endian.h" diff --git a/src/format/KeePass2Reader.h b/src/format/KeePass2Reader.h index 8af87ade..2c9daab2 100644 --- a/src/format/KeePass2Reader.h +++ b/src/format/KeePass2Reader.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEEPASS2READER_H #define KEEPASSX_KEEPASS2READER_H -#include +#include #include "keys/CompositeKey.h" diff --git a/src/format/KeePass2Writer.cpp b/src/format/KeePass2Writer.cpp index 2a6b4eb9..c22412a1 100644 --- a/src/format/KeePass2Writer.cpp +++ b/src/format/KeePass2Writer.cpp @@ -17,9 +17,9 @@ #include "KeePass2Writer.h" -#include -#include -#include +#include +#include +#include #include "core/Database.h" #include "core/Endian.h" diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp index ecf5c048..6e9aa582 100644 --- a/src/format/KeePass2XmlReader.cpp +++ b/src/format/KeePass2XmlReader.cpp @@ -17,8 +17,8 @@ #include "KeePass2XmlReader.h" -#include -#include +#include +#include #include "core/Database.h" #include "core/DatabaseIcons.h" diff --git a/src/format/KeePass2XmlReader.h b/src/format/KeePass2XmlReader.h index 1eb41898..4520d42b 100644 --- a/src/format/KeePass2XmlReader.h +++ b/src/format/KeePass2XmlReader.h @@ -18,12 +18,12 @@ #ifndef KEEPASSX_KEEPASS2XMLREADER_H #define KEEPASSX_KEEPASS2XMLREADER_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "core/Global.h" #include "core/TimeInfo.h" diff --git a/src/format/KeePass2XmlWriter.cpp b/src/format/KeePass2XmlWriter.cpp index d582476c..fa7c4d95 100644 --- a/src/format/KeePass2XmlWriter.cpp +++ b/src/format/KeePass2XmlWriter.cpp @@ -17,8 +17,8 @@ #include "KeePass2XmlWriter.h" -#include -#include +#include +#include #include "core/Metadata.h" #include "format/KeePass2RandomStream.h" diff --git a/src/format/KeePass2XmlWriter.h b/src/format/KeePass2XmlWriter.h index 78842cac..16812fb9 100644 --- a/src/format/KeePass2XmlWriter.h +++ b/src/format/KeePass2XmlWriter.h @@ -18,10 +18,10 @@ #ifndef KEEPASSX_KEEPASS2XMLWRITER_H #define KEEPASSX_KEEPASS2XMLWRITER_H -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Database.h" #include "core/Entry.h" diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h index 051e831d..1436aee4 100644 --- a/src/gui/AboutDialog.h +++ b/src/gui/AboutDialog.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_ABOUTDIALOG_H #define KEEPASSX_ABOUTDIALOG_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index 50e34176..2dede3f8 100644 --- a/src/gui/Application.cpp +++ b/src/gui/Application.cpp @@ -18,7 +18,7 @@ #include "Application.h" -#include +#include #include "autotype/AutoType.h" diff --git a/src/gui/Application.h b/src/gui/Application.h index ef3646f1..a5f55d4d 100644 --- a/src/gui/Application.h +++ b/src/gui/Application.h @@ -19,7 +19,7 @@ #ifndef KEEPASSX_APPLICATION_H #define KEEPASSX_APPLICATION_H -#include +#include #include "core/Global.h" diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp index b03f5f72..e3cf8023 100644 --- a/src/gui/ChangeMasterKeyWidget.cpp +++ b/src/gui/ChangeMasterKeyWidget.cpp @@ -18,7 +18,7 @@ #include "ChangeMasterKeyWidget.h" #include "ui_ChangeMasterKeyWidget.h" -#include +#include #include "keys/FileKey.h" #include "keys/PasswordKey.h" diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h index 4995d031..384aad2d 100644 --- a/src/gui/ChangeMasterKeyWidget.h +++ b/src/gui/ChangeMasterKeyWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_CHANGEMASTERKEYWIDGET_H #define KEEPASSX_CHANGEMASTERKEYWIDGET_H -#include +#include #include "gui/DialogyWidget.h" #include "keys/CompositeKey.h" diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp index 8783c1b5..eb77d2b3 100644 --- a/src/gui/Clipboard.cpp +++ b/src/gui/Clipboard.cpp @@ -17,13 +17,13 @@ #include "Clipboard.h" -#include -#include -#include +#include +#include +#include #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -#include -#include +#include +#include #endif #include "core/Config.h" diff --git a/src/gui/Clipboard.h b/src/gui/Clipboard.h index 7c73ab34..bc2a19d3 100644 --- a/src/gui/Clipboard.h +++ b/src/gui/Clipboard.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_CLIPBOARD_H #define KEEPASSX_CLIPBOARD_H -#include +#include #include "core/Global.h" diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index 4c1e0b4c..bed1eb26 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -18,7 +18,7 @@ #include "DatabaseOpenWidget.h" #include "ui_DatabaseOpenWidget.h" -#include +#include #include "core/Config.h" #include "core/Database.h" diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h index 0216de58..e957cd7d 100644 --- a/src/gui/DatabaseOpenWidget.h +++ b/src/gui/DatabaseOpenWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_DATABASEOPENWIDGET_H #define KEEPASSX_DATABASEOPENWIDGET_H -#include +#include #include "gui/DialogyWidget.h" #include "keys/CompositeKey.h" diff --git a/src/gui/DatabaseSettingsWidget.h b/src/gui/DatabaseSettingsWidget.h index 1b6e36ab..a7d28326 100644 --- a/src/gui/DatabaseSettingsWidget.h +++ b/src/gui/DatabaseSettingsWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_DATABASESETTINGSWIDGET_H #define KEEPASSX_DATABASESETTINGSWIDGET_H -#include +#include #include "gui/DialogyWidget.h" diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index d11effbc..f6b608b0 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -17,9 +17,9 @@ #include "DatabaseTabWidget.h" -#include -#include -#include +#include +#include +#include #include "autotype/AutoType.h" #include "core/Config.h" diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h index 4ac9bf41..9261a065 100644 --- a/src/gui/DatabaseTabWidget.h +++ b/src/gui/DatabaseTabWidget.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_DATABASETABWIDGET_H #define KEEPASSX_DATABASETABWIDGET_H -#include -#include +#include +#include #include "format/KeePass2Writer.h" #include "gui/DatabaseWidget.h" diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 50c9106e..d51dec94 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -18,14 +18,14 @@ #include "DatabaseWidget.h" #include "ui_SearchWidget.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "autotype/AutoType.h" #include "core/FilePath.h" diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h index a3cbe70e..c1e1a94c 100644 --- a/src/gui/DatabaseWidget.h +++ b/src/gui/DatabaseWidget.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_DATABASEWIDGET_H #define KEEPASSX_DATABASEWIDGET_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/gui/DialogyWidget.cpp b/src/gui/DialogyWidget.cpp index 8c1e7303..61722498 100644 --- a/src/gui/DialogyWidget.cpp +++ b/src/gui/DialogyWidget.cpp @@ -17,9 +17,9 @@ #include "DialogyWidget.h" -#include -#include -#include +#include +#include +#include DialogyWidget::DialogyWidget(QWidget* parent) : QWidget(parent) diff --git a/src/gui/DialogyWidget.h b/src/gui/DialogyWidget.h index b7fc45c8..9dd05283 100644 --- a/src/gui/DialogyWidget.h +++ b/src/gui/DialogyWidget.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_DIALOGYWIDGET_H #define KEEPASSX_DIALOGYWIDGET_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/gui/DragTabBar.cpp b/src/gui/DragTabBar.cpp index 0fff6912..a19031a8 100644 --- a/src/gui/DragTabBar.cpp +++ b/src/gui/DragTabBar.cpp @@ -17,9 +17,9 @@ #include "DragTabBar.h" -#include -#include -#include +#include +#include +#include DragTabBar::DragTabBar(QWidget* parent) : QTabBar(parent) diff --git a/src/gui/DragTabBar.h b/src/gui/DragTabBar.h index d4fd42c3..1b6005df 100644 --- a/src/gui/DragTabBar.h +++ b/src/gui/DragTabBar.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_DRAGTABBAR_H #define KEEPASSX_DRAGTABBAR_H -#include +#include #include "core/Global.h" diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h index 1dfe3a24..c99acfb1 100644 --- a/src/gui/EditWidget.h +++ b/src/gui/EditWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_EDITWIDGET_H #define KEEPASSX_EDITWIDGET_H -#include +#include #include "gui/DialogyWidget.h" diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index db4a2917..d5e824f1 100644 --- a/src/gui/EditWidgetIcons.cpp +++ b/src/gui/EditWidgetIcons.cpp @@ -18,8 +18,8 @@ #include "EditWidgetIcons.h" #include "ui_EditWidgetIcons.h" -#include -#include +#include +#include #include "core/Group.h" #include "core/Metadata.h" diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h index 50eec603..e18f4440 100644 --- a/src/gui/EditWidgetIcons.h +++ b/src/gui/EditWidgetIcons.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_EDITWIDGETICONS_H #define KEEPASSX_EDITWIDGETICONS_H -#include +#include #include "core/Global.h" #include "core/Uuid.h" diff --git a/src/gui/EditWidgetProperties.h b/src/gui/EditWidgetProperties.h index e9a25304..c5d0eb03 100644 --- a/src/gui/EditWidgetProperties.h +++ b/src/gui/EditWidgetProperties.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_EDITWIDGETPROPERTIES_H #define KEEPASSX_EDITWIDGETPROPERTIES_H -#include +#include #include "core/Global.h" #include "core/TimeInfo.h" diff --git a/src/gui/FileDialog.h b/src/gui/FileDialog.h index 99db198b..e2e848aa 100644 --- a/src/gui/FileDialog.h +++ b/src/gui/FileDialog.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_FILEDIALOG_H #define KEEPASSX_FILEDIALOG_H -#include +#include #include "core/Global.h" diff --git a/src/gui/IconModels.h b/src/gui/IconModels.h index ff65bf1f..a04efa20 100644 --- a/src/gui/IconModels.h +++ b/src/gui/IconModels.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_ICONMODELS_H #define KEEPASSX_ICONMODELS_H -#include -#include +#include +#include #include "core/Global.h" #include "core/Uuid.h" diff --git a/src/gui/KeePass1OpenWidget.cpp b/src/gui/KeePass1OpenWidget.cpp index f167e3bb..3de8e88e 100644 --- a/src/gui/KeePass1OpenWidget.cpp +++ b/src/gui/KeePass1OpenWidget.cpp @@ -17,9 +17,9 @@ #include "KeePass1OpenWidget.h" -#include -#include -#include +#include +#include +#include #include "ui_DatabaseOpenWidget.h" #include "core/Database.h" diff --git a/src/gui/LineEdit.cpp b/src/gui/LineEdit.cpp index ac43a2ac..148dc3d1 100644 --- a/src/gui/LineEdit.cpp +++ b/src/gui/LineEdit.cpp @@ -19,8 +19,8 @@ #include "LineEdit.h" -#include -#include +#include +#include #include "core/FilePath.h" diff --git a/src/gui/LineEdit.h b/src/gui/LineEdit.h index 1dbfe78d..2672aae7 100644 --- a/src/gui/LineEdit.h +++ b/src/gui/LineEdit.h @@ -20,7 +20,7 @@ #ifndef KEEPASSX_LINEEDIT_H #define KEEPASSX_LINEEDIT_H -#include +#include #include "core/Global.h" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d7127e9e..b9ac27e0 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -18,8 +18,8 @@ #include "MainWindow.h" #include "ui_MainWindow.h" -#include -#include +#include +#include #include "autotype/AutoType.h" #include "core/Config.h" diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index 8e96ec9b..74952687 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_MAINWINDOW_H #define KEEPASSX_MAINWINDOW_H -#include -#include +#include +#include #include "core/SignalMultiplexer.h" #include "gui/DatabaseWidget.h" diff --git a/src/gui/PasswordGeneratorWidget.h b/src/gui/PasswordGeneratorWidget.h index 064cb666..8451bbc5 100644 --- a/src/gui/PasswordGeneratorWidget.h +++ b/src/gui/PasswordGeneratorWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_PASSWORDGENERATORWIDGET_H #define KEEPASSX_PASSWORDGENERATORWIDGET_H -#include +#include #include "core/Global.h" #include "core/PasswordGenerator.h" diff --git a/src/gui/SortFilterHideProxyModel.h b/src/gui/SortFilterHideProxyModel.h index 0b212dec..a6f1e712 100644 --- a/src/gui/SortFilterHideProxyModel.h +++ b/src/gui/SortFilterHideProxyModel.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_SORTFILTERHIDEPROXYMODEL_H #define KEEPASSX_SORTFILTERHIDEPROXYMODEL_H -#include -#include +#include +#include #include "core/Global.h" diff --git a/src/gui/UnlockDatabaseWidget.cpp b/src/gui/UnlockDatabaseWidget.cpp index 547b35be..133dd421 100644 --- a/src/gui/UnlockDatabaseWidget.cpp +++ b/src/gui/UnlockDatabaseWidget.cpp @@ -17,7 +17,7 @@ #include "UnlockDatabaseWidget.h" -#include +#include #include "ui_DatabaseOpenWidget.h" #include "core/Database.h" diff --git a/src/gui/WelcomeWidget.h b/src/gui/WelcomeWidget.h index 43497ebf..983aaa04 100644 --- a/src/gui/WelcomeWidget.h +++ b/src/gui/WelcomeWidget.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_WELCOMEWIDGET_H #define KEEPASSX_WELCOMEWIDGET_H -#include +#include #include "core/Global.h" diff --git a/src/gui/entry/AutoTypeAssociationsModel.h b/src/gui/entry/AutoTypeAssociationsModel.h index 046c826a..ecb4247b 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 +#include #include "core/AutoTypeAssociations.h" diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index cbb572c7..e043e356 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "core/Database.h" #include "core/Entry.h" diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index 7a3aaa8a..bfdde163 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 -#include +#include +#include #include "gui/EditWidget.h" diff --git a/src/gui/entry/EditEntryWidget_p.h b/src/gui/entry/EditEntryWidget_p.h index 4619eeec..cdae8bd3 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 -#include -#include -#include +#include +#include +#include +#include class CategoryListViewDelegate : public QStyledItemDelegate { diff --git a/src/gui/entry/EntryAttachmentsModel.h b/src/gui/entry/EntryAttachmentsModel.h index 7668013f..177cde06 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 +#include #include "core/Global.h" diff --git a/src/gui/entry/EntryAttributesModel.h b/src/gui/entry/EntryAttributesModel.h index 421921f4..f6ac6514 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 +#include #include "core/Global.h" diff --git a/src/gui/entry/EntryHistoryModel.h b/src/gui/entry/EntryHistoryModel.h index dd013f82..6c8073ac 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 +#include #include "core/Global.h" diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp index 5de746da..04273bd8 100644 --- a/src/gui/entry/EntryModel.cpp +++ b/src/gui/entry/EntryModel.cpp @@ -17,8 +17,8 @@ #include "EntryModel.h" -#include -#include +#include +#include #include "core/DatabaseIcons.h" #include "core/Entry.h" diff --git a/src/gui/entry/EntryModel.h b/src/gui/entry/EntryModel.h index 94e48b45..20bcad99 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 +#include #include "core/Global.h" diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp index 90384795..7c64557a 100644 --- a/src/gui/entry/EntryView.cpp +++ b/src/gui/entry/EntryView.cpp @@ -17,7 +17,7 @@ #include "EntryView.h" -#include +#include #include "gui/SortFilterHideProxyModel.h" diff --git a/src/gui/entry/EntryView.h b/src/gui/entry/EntryView.h index 45187a9e..b5f056aa 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 +#include #include "core/Global.h" diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h index 454b2fb5..de075be8 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 -#include +#include +#include #include "core/Group.h" #include "gui/EditWidget.h" diff --git a/src/gui/group/GroupModel.cpp b/src/gui/group/GroupModel.cpp index db63079c..73b9a59d 100644 --- a/src/gui/group/GroupModel.cpp +++ b/src/gui/group/GroupModel.cpp @@ -17,8 +17,8 @@ #include "GroupModel.h" -#include -#include +#include +#include #include "core/Database.h" #include "core/DatabaseIcons.h" diff --git a/src/gui/group/GroupModel.h b/src/gui/group/GroupModel.h index f3ef5164..173ea3a2 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 +#include #include "core/Global.h" diff --git a/src/gui/group/GroupView.cpp b/src/gui/group/GroupView.cpp index 42a68036..3c936622 100644 --- a/src/gui/group/GroupView.cpp +++ b/src/gui/group/GroupView.cpp @@ -17,8 +17,8 @@ #include "GroupView.h" -#include -#include +#include +#include #include "core/Database.h" #include "core/Group.h" diff --git a/src/gui/group/GroupView.h b/src/gui/group/GroupView.h index eff83aef..98073f63 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 +#include #include "core/Global.h" diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp index 905a6dbe..8f6c5319 100644 --- a/src/keys/CompositeKey.cpp +++ b/src/keys/CompositeKey.cpp @@ -18,8 +18,8 @@ #include "CompositeKey.h" #include "CompositeKey_p.h" -#include -#include +#include +#include #include "crypto/CryptoHash.h" #include "crypto/SymmetricCipher.h" diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h index 1d3233cc..ff738e61 100644 --- a/src/keys/CompositeKey.h +++ b/src/keys/CompositeKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_COMPOSITEKEY_H #define KEEPASSX_COMPOSITEKEY_H -#include +#include #include "keys/Key.h" diff --git a/src/keys/CompositeKey_p.h b/src/keys/CompositeKey_p.h index c704f086..27fa7abc 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 +#include class TransformKeyBenchmarkThread : public QThread { diff --git a/src/keys/FileKey.cpp b/src/keys/FileKey.cpp index 5a97c9b1..77687ba7 100644 --- a/src/keys/FileKey.cpp +++ b/src/keys/FileKey.cpp @@ -17,8 +17,8 @@ #include "FileKey.h" -#include -#include +#include +#include #include "core/Tools.h" #include "crypto/CryptoHash.h" diff --git a/src/keys/FileKey.h b/src/keys/FileKey.h index e4e67985..f9854336 100644 --- a/src/keys/FileKey.h +++ b/src/keys/FileKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_FILEKEY_H #define KEEPASSX_FILEKEY_H -#include +#include #include "core/Global.h" #include "keys/Key.h" diff --git a/src/keys/Key.h b/src/keys/Key.h index d6d87891..2172f570 100644 --- a/src/keys/Key.h +++ b/src/keys/Key.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_KEY_H #define KEEPASSX_KEY_H -#include +#include class Key { diff --git a/src/keys/PasswordKey.h b/src/keys/PasswordKey.h index df545573..8c40f773 100644 --- a/src/keys/PasswordKey.h +++ b/src/keys/PasswordKey.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_PASSWORDKEY_H #define KEEPASSX_PASSWORDKEY_H -#include +#include #include "keys/Key.h" diff --git a/src/main.cpp b/src/main.cpp index c3241871..786546c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include +#include #include "core/ArgumentParser.h" #include "core/Config.h" diff --git a/src/streams/HashedBlockStream.h b/src/streams/HashedBlockStream.h index 106bcf0f..f38d5716 100644 --- a/src/streams/HashedBlockStream.h +++ b/src/streams/HashedBlockStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_HASHEDBLOCKSTREAM_H #define KEEPASSX_HASHEDBLOCKSTREAM_H -#include +#include #include "streams/LayeredStream.h" diff --git a/src/streams/LayeredStream.h b/src/streams/LayeredStream.h index 3aca4658..285c16dd 100644 --- a/src/streams/LayeredStream.h +++ b/src/streams/LayeredStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_LAYEREDSTREAM_H #define KEEPASSX_LAYEREDSTREAM_H -#include +#include #include "core/Global.h" diff --git a/src/streams/SymmetricCipherStream.h b/src/streams/SymmetricCipherStream.h index 96cb6476..53e252f2 100644 --- a/src/streams/SymmetricCipherStream.h +++ b/src/streams/SymmetricCipherStream.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_SYMMETRICCIPHERSTREAM_H #define KEEPASSX_SYMMETRICCIPHERSTREAM_H -#include -#include +#include +#include #include "crypto/SymmetricCipher.h" #include "streams/LayeredStream.h" diff --git a/src/streams/qtiocompressor.h b/src/streams/qtiocompressor.h index f325bb66..cebd9829 100644 --- a/src/streams/qtiocompressor.h +++ b/src/streams/qtiocompressor.h @@ -47,7 +47,7 @@ #ifndef QTIOCOMPRESSOR_H #define QTIOCOMPRESSOR_H -#include +#include class QtIOCompressorPrivate; class QtIOCompressor : public QIODevice diff --git a/tests/TestArgumentParser.cpp b/tests/TestArgumentParser.cpp index 60bd6344..fd8d8fd1 100644 --- a/tests/TestArgumentParser.cpp +++ b/tests/TestArgumentParser.cpp @@ -17,7 +17,7 @@ #include "TestArgumentParser.h" -#include +#include #include "tests.h" #include "core/ArgumentParser.h" diff --git a/tests/TestArgumentParser.h b/tests/TestArgumentParser.h index 8fb1e7a0..9ac8f2a2 100644 --- a/tests/TestArgumentParser.h +++ b/tests/TestArgumentParser.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_TEST_ARGUMENT_PARSER_H #define KEEPASSX_TEST_ARGUMENT_PARSER_H -#include -#include +#include +#include class TestArgumentParser : public QObject { diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp index cd7b379f..2fb53359 100644 --- a/tests/TestAutoType.cpp +++ b/tests/TestAutoType.cpp @@ -17,8 +17,8 @@ #include "TestAutoType.h" -#include -#include +#include +#include #include "tests.h" #include "core/FilePath.h" diff --git a/tests/TestAutoType.h b/tests/TestAutoType.h index 9f4445ae..fba7fde1 100644 --- a/tests/TestAutoType.h +++ b/tests/TestAutoType.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTAUTOTYPE_H #define KEEPASSX_TESTAUTOTYPE_H -#include +#include class AutoType; class AutoTypePlatformInterface; diff --git a/tests/TestCryptoHash.cpp b/tests/TestCryptoHash.cpp index 0083c3c5..8ff3c367 100644 --- a/tests/TestCryptoHash.cpp +++ b/tests/TestCryptoHash.cpp @@ -17,7 +17,7 @@ #include "TestCryptoHash.h" -#include +#include #include "tests.h" #include "crypto/Crypto.h" diff --git a/tests/TestCryptoHash.h b/tests/TestCryptoHash.h index 1abcd5e1..05700f34 100644 --- a/tests/TestCryptoHash.h +++ b/tests/TestCryptoHash.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTCRYPTOHASH_H #define KEEPASSX_TESTCRYPTOHASH_H -#include +#include class TestCryptoHash : public QObject { diff --git a/tests/TestDeletedObjects.cpp b/tests/TestDeletedObjects.cpp index f1256654..914096ce 100644 --- a/tests/TestDeletedObjects.cpp +++ b/tests/TestDeletedObjects.cpp @@ -17,7 +17,7 @@ #include "TestDeletedObjects.h" -#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/TestDeletedObjects.h b/tests/TestDeletedObjects.h index ba905b47..27b70cce 100644 --- a/tests/TestDeletedObjects.h +++ b/tests/TestDeletedObjects.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTDELETEDOBJECTS_H #define KEEPASSX_TESTDELETEDOBJECTS_H -#include +#include class Database; diff --git a/tests/TestEntry.cpp b/tests/TestEntry.cpp index fdba1c81..e3c46b10 100644 --- a/tests/TestEntry.cpp +++ b/tests/TestEntry.cpp @@ -17,7 +17,7 @@ #include "TestEntry.h" -#include +#include #include "tests.h" #include "core/Entry.h" diff --git a/tests/TestEntry.h b/tests/TestEntry.h index d873f636..fe303a60 100644 --- a/tests/TestEntry.h +++ b/tests/TestEntry.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTENTRY_H #define KEEPASSX_TESTENTRY_H -#include +#include class Entry; diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp index 3ac22c99..fab63db6 100644 --- a/tests/TestEntryModel.cpp +++ b/tests/TestEntryModel.cpp @@ -17,8 +17,8 @@ #include "TestEntryModel.h" -#include -#include +#include +#include #include "modeltest.h" #include "tests.h" diff --git a/tests/TestEntryModel.h b/tests/TestEntryModel.h index ffca78eb..778392f2 100644 --- a/tests/TestEntryModel.h +++ b/tests/TestEntryModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTENTRYMODEL_H #define KEEPASSX_TESTENTRYMODEL_H -#include +#include class TestEntryModel : public QObject { diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp index cc1cb241..22845af1 100644 --- a/tests/TestGroup.cpp +++ b/tests/TestGroup.cpp @@ -17,9 +17,9 @@ #include "TestGroup.h" -#include -#include -#include +#include +#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/TestGroup.h b/tests/TestGroup.h index eb901724..40351468 100644 --- a/tests/TestGroup.h +++ b/tests/TestGroup.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTGROUP_H #define KEEPASSX_TESTGROUP_H -#include +#include class TestGroup : public QObject { diff --git a/tests/TestGroupModel.cpp b/tests/TestGroupModel.cpp index 453aa145..a16386c7 100644 --- a/tests/TestGroupModel.cpp +++ b/tests/TestGroupModel.cpp @@ -17,8 +17,8 @@ #include "TestGroupModel.h" -#include -#include +#include +#include #include "modeltest.h" #include "tests.h" diff --git a/tests/TestGroupModel.h b/tests/TestGroupModel.h index 4711d9fa..093af9e0 100644 --- a/tests/TestGroupModel.h +++ b/tests/TestGroupModel.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTGROUPMODEL_H #define KEEPASSX_TESTGROUPMODEL_H -#include +#include class TestGroupModel : public QObject { diff --git a/tests/TestHashedBlockStream.cpp b/tests/TestHashedBlockStream.cpp index b0c97606..ab7d386a 100644 --- a/tests/TestHashedBlockStream.cpp +++ b/tests/TestHashedBlockStream.cpp @@ -17,8 +17,8 @@ #include "TestHashedBlockStream.h" -#include -#include +#include +#include #include "tests.h" #include "crypto/Crypto.h" diff --git a/tests/TestHashedBlockStream.h b/tests/TestHashedBlockStream.h index e3c6f36a..d672664c 100644 --- a/tests/TestHashedBlockStream.h +++ b/tests/TestHashedBlockStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTHASHEDBLOCKSTREAM_H #define KEEPASSX_TESTHASHEDBLOCKSTREAM_H -#include +#include class TestHashedBlockStream : public QObject { diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp index 2bcd72c7..3ec4e783 100644 --- a/tests/TestKeePass1Reader.cpp +++ b/tests/TestKeePass1Reader.cpp @@ -17,8 +17,8 @@ #include "TestKeePass1Reader.h" -#include -#include +#include +#include #include "config-keepassx-tests.h" #include "tests.h" diff --git a/tests/TestKeePass1Reader.h b/tests/TestKeePass1Reader.h index 4088d9f0..20acd4bb 100644 --- a/tests/TestKeePass1Reader.h +++ b/tests/TestKeePass1Reader.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_TESTKEEPASS1READER_H #define KEEPASSX_TESTKEEPASS1READER_H -#include -#include +#include +#include class Database; diff --git a/tests/TestKeePass2RandomStream.cpp b/tests/TestKeePass2RandomStream.cpp index e7fee8f4..74a15406 100644 --- a/tests/TestKeePass2RandomStream.cpp +++ b/tests/TestKeePass2RandomStream.cpp @@ -17,7 +17,7 @@ #include "TestKeePass2RandomStream.h" -#include +#include #include "tests.h" #include "crypto/Crypto.h" diff --git a/tests/TestKeePass2RandomStream.h b/tests/TestKeePass2RandomStream.h index f323dfb0..b001a05a 100644 --- a/tests/TestKeePass2RandomStream.h +++ b/tests/TestKeePass2RandomStream.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H #define KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H -#include +#include class TestKeePass2RandomStream : public QObject { diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp index ee28dfc7..6b1ee1e9 100644 --- a/tests/TestKeePass2Reader.cpp +++ b/tests/TestKeePass2Reader.cpp @@ -17,7 +17,7 @@ #include "TestKeePass2Reader.h" -#include +#include #include "config-keepassx-tests.h" #include "tests.h" diff --git a/tests/TestKeePass2Reader.h b/tests/TestKeePass2Reader.h index 8de873f9..6f090de3 100644 --- a/tests/TestKeePass2Reader.h +++ b/tests/TestKeePass2Reader.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTKEEPASS2READER_H #define KEEPASSX_TESTKEEPASS2READER_H -#include +#include class TestKeePass2Reader : public QObject { diff --git a/tests/TestKeePass2Writer.cpp b/tests/TestKeePass2Writer.cpp index 23363488..bbc4992a 100644 --- a/tests/TestKeePass2Writer.cpp +++ b/tests/TestKeePass2Writer.cpp @@ -17,8 +17,8 @@ #include "TestKeePass2Writer.h" -#include -#include +#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/TestKeePass2Writer.h b/tests/TestKeePass2Writer.h index f11403d2..b6a08dc5 100644 --- a/tests/TestKeePass2Writer.h +++ b/tests/TestKeePass2Writer.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTKEEPASS2WRITER_H #define KEEPASSX_TESTKEEPASS2WRITER_H -#include +#include class Database; diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp index 186010c4..3f338fd4 100644 --- a/tests/TestKeePass2XmlReader.cpp +++ b/tests/TestKeePass2XmlReader.cpp @@ -17,8 +17,8 @@ #include "TestKeePass2XmlReader.h" -#include -#include +#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/TestKeePass2XmlReader.h b/tests/TestKeePass2XmlReader.h index 7b0f786a..6a6c6195 100644 --- a/tests/TestKeePass2XmlReader.h +++ b/tests/TestKeePass2XmlReader.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_TESTKEEPASS2XMLREADER_H #define KEEPASSX_TESTKEEPASS2XMLREADER_H -#include -#include +#include +#include class Database; diff --git a/tests/TestKeys.cpp b/tests/TestKeys.cpp index 107b6741..00b2ffa3 100644 --- a/tests/TestKeys.cpp +++ b/tests/TestKeys.cpp @@ -17,8 +17,8 @@ #include "TestKeys.h" -#include -#include +#include +#include #include "config-keepassx-tests.h" #include "tests.h" diff --git a/tests/TestKeys.h b/tests/TestKeys.h index d1b62db8..f6677ec7 100644 --- a/tests/TestKeys.h +++ b/tests/TestKeys.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTKEYS_H #define KEEPASSX_TESTKEYS_H -#include +#include class TestKeys : public QObject { diff --git a/tests/TestModified.cpp b/tests/TestModified.cpp index a2c4d680..864ea1c3 100644 --- a/tests/TestModified.cpp +++ b/tests/TestModified.cpp @@ -17,8 +17,8 @@ #include "TestModified.h" -#include -#include +#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/TestModified.h b/tests/TestModified.h index fc9290d1..ee598add 100644 --- a/tests/TestModified.h +++ b/tests/TestModified.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTMODIFIED_H #define KEEPASSX_TESTMODIFIED_H -#include +#include class TestModified : public QObject { diff --git a/tests/TestQSaveFile.cpp b/tests/TestQSaveFile.cpp index a796bbe5..bccee0ec 100644 --- a/tests/TestQSaveFile.cpp +++ b/tests/TestQSaveFile.cpp @@ -18,7 +18,7 @@ #include "TestQSaveFile.h" -#include +#include #include diff --git a/tests/TestQSaveFile.h b/tests/TestQSaveFile.h index a21557d0..8e1caf0e 100644 --- a/tests/TestQSaveFile.h +++ b/tests/TestQSaveFile.h @@ -19,7 +19,7 @@ #ifndef KEEPASSX_TESTQSAVEFILE_H #define KEEPASSX_TESTQSAVEFILE_H -#include +#include class TestQSaveFile : public QObject { diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp index 5772b940..b47a0057 100644 --- a/tests/TestSymmetricCipher.cpp +++ b/tests/TestSymmetricCipher.cpp @@ -17,8 +17,8 @@ #include "TestSymmetricCipher.h" -#include -#include +#include +#include #include "tests.h" #include "crypto/Crypto.h" diff --git a/tests/TestSymmetricCipher.h b/tests/TestSymmetricCipher.h index 2d8f00be..e90fe600 100644 --- a/tests/TestSymmetricCipher.h +++ b/tests/TestSymmetricCipher.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTSYMMETRICCIPHER_H #define KEEPASSX_TESTSYMMETRICCIPHER_H -#include +#include class TestSymmetricCipher : public QObject { diff --git a/tests/TestWildcardMatcher.cpp b/tests/TestWildcardMatcher.cpp index b10a9f7c..e06125b8 100644 --- a/tests/TestWildcardMatcher.cpp +++ b/tests/TestWildcardMatcher.cpp @@ -17,7 +17,7 @@ #include "TestWildcardMatcher.h" -#include +#include #include "tests.h" #include "autotype/WildcardMatcher.h" diff --git a/tests/TestWildcardMatcher.h b/tests/TestWildcardMatcher.h index 779bb6cb..a1f8b5f5 100644 --- a/tests/TestWildcardMatcher.h +++ b/tests/TestWildcardMatcher.h @@ -18,7 +18,7 @@ #ifndef KEEPASSX_TESTWILDCARDMATCHER_H #define KEEPASSX_TESTWILDCARDMATCHER_H -#include +#include class WildcardMatcher; diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 266f905c..0d097e30 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -17,16 +17,16 @@ #include "TestGui.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "config-keepassx-tests.h" #include "tests.h" diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h index 7e823708..38e4505c 100644 --- a/tests/gui/TestGui.h +++ b/tests/gui/TestGui.h @@ -18,8 +18,8 @@ #ifndef KEEPASSX_TESTGUI_H #define KEEPASSX_TESTGUI_H -#include -#include +#include +#include class Database; class DatabaseTabWidget; diff --git a/tests/gui/TestGuiPixmaps.cpp b/tests/gui/TestGuiPixmaps.cpp index 483fb3c8..401f68bc 100644 --- a/tests/gui/TestGuiPixmaps.cpp +++ b/tests/gui/TestGuiPixmaps.cpp @@ -17,7 +17,7 @@ #include "TestGuiPixmaps.h" -#include +#include #include "tests.h" #include "core/Database.h" diff --git a/tests/gui/TestGuiPixmaps.h b/tests/gui/TestGuiPixmaps.h index 99af8a4e..ef0b664b 100644 --- a/tests/gui/TestGuiPixmaps.h +++ b/tests/gui/TestGuiPixmaps.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_TESTGUIPIXMAPS_H #define KEEPASSX_TESTGUIPIXMAPS_H -#include -#include -#include +#include +#include +#include class TestGuiPixmaps : public QObject { diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp index a68021a6..19f02d9d 100644 --- a/tests/modeltest.cpp +++ b/tests/modeltest.cpp @@ -41,8 +41,8 @@ #include "modeltest.h" -#include -#include +#include +#include Q_DECLARE_METATYPE ( QModelIndex ) diff --git a/tests/modeltest.h b/tests/modeltest.h index 46c3336e..9eb343d7 100644 --- a/tests/modeltest.h +++ b/tests/modeltest.h @@ -43,9 +43,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include -#include -#include +#include +#include +#include class ModelTest : public QObject { diff --git a/tests/tests.h b/tests/tests.h index 0714a3b6..e719a0bf 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -19,7 +19,7 @@ #ifndef KEEPASSX_TESTS_H #define KEEPASSX_TESTS_H -#include +#include // backport QTEST_GUILESS_MAIN, QTRY_VERIFY and QTRY_COMPARE from Qt 5 diff --git a/utils/kdbx-extract.cpp b/utils/kdbx-extract.cpp index 97ae88f4..beee71dc 100644 --- a/utils/kdbx-extract.cpp +++ b/utils/kdbx-extract.cpp @@ -17,10 +17,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Database.h" #include "crypto/Crypto.h"