Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.
2025-12-04 15:39:34 +01:00 · 2013-10-03 15:18:16 +02:00
parent 035271d469
commit 6504b6f2bd
170 changed files with 332 additions and 339 deletions
--- a/tests/TestArgumentParser.cpp
+++ b/tests/TestArgumentParser.cpp
@@ -17,7 +17,7 @@

 #include "TestArgumentParser.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "core/ArgumentParser.h"
--- 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 <QtCore/QObject>
-#include <QtCore/QHash>
+#include <QHash>
+#include <QObject>

 class TestArgumentParser : public QObject
 {
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -17,8 +17,8 @@

 #include "TestAutoType.h"

-#include <QtCore/QPluginLoader>
-#include <QtTest/QTest>
+#include <QPluginLoader>
+#include <QTest>

 #include "tests.h"
 #include "core/FilePath.h"
--- a/tests/TestAutoType.h
+++ b/tests/TestAutoType.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTAUTOTYPE_H
 #define KEEPASSX_TESTAUTOTYPE_H

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

 class AutoType;
 class AutoTypePlatformInterface;
--- a/tests/TestCryptoHash.cpp
+++ b/tests/TestCryptoHash.cpp
@@ -17,7 +17,7 @@

 #include "TestCryptoHash.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "crypto/Crypto.h"
--- a/tests/TestCryptoHash.h
+++ b/tests/TestCryptoHash.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTCRYPTOHASH_H
 #define KEEPASSX_TESTCRYPTOHASH_H

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

 class TestCryptoHash : public QObject
 {
--- a/tests/TestDeletedObjects.cpp
+++ b/tests/TestDeletedObjects.cpp
@@ -17,7 +17,7 @@

 #include "TestDeletedObjects.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/TestDeletedObjects.h
+++ b/tests/TestDeletedObjects.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTDELETEDOBJECTS_H
 #define KEEPASSX_TESTDELETEDOBJECTS_H

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

 class Database;

--- a/tests/TestEntry.cpp
+++ b/tests/TestEntry.cpp
@@ -17,7 +17,7 @@

 #include "TestEntry.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "core/Entry.h"
--- a/tests/TestEntry.h
+++ b/tests/TestEntry.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTENTRY_H
 #define KEEPASSX_TESTENTRY_H

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

 class Entry;

--- a/tests/TestEntryModel.cpp
+++ b/tests/TestEntryModel.cpp
@@ -17,8 +17,8 @@

 #include "TestEntryModel.h"

-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>

 #include "modeltest.h"
 #include "tests.h"
--- a/tests/TestEntryModel.h
+++ b/tests/TestEntryModel.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTENTRYMODEL_H
 #define KEEPASSX_TESTENTRYMODEL_H

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

 class TestEntryModel : public QObject
 {
--- a/tests/TestGroup.cpp
+++ b/tests/TestGroup.cpp
@@ -17,9 +17,9 @@

 #include "TestGroup.h"

-#include <QtCore/QPointer>
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QPointer>
+#include <QSignalSpy>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/TestGroup.h
+++ b/tests/TestGroup.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTGROUP_H
 #define KEEPASSX_TESTGROUP_H

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

 class TestGroup : public QObject
 {
--- a/tests/TestGroupModel.cpp
+++ b/tests/TestGroupModel.cpp
@@ -17,8 +17,8 @@

 #include "TestGroupModel.h"

-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>

 #include "modeltest.h"
 #include "tests.h"
--- a/tests/TestGroupModel.h
+++ b/tests/TestGroupModel.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTGROUPMODEL_H
 #define KEEPASSX_TESTGROUPMODEL_H

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

 class TestGroupModel : public QObject
 {
--- a/tests/TestHashedBlockStream.cpp
+++ b/tests/TestHashedBlockStream.cpp
@@ -17,8 +17,8 @@

 #include "TestHashedBlockStream.h"

-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>

 #include "tests.h"
 #include "crypto/Crypto.h"
--- a/tests/TestHashedBlockStream.h
+++ b/tests/TestHashedBlockStream.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTHASHEDBLOCKSTREAM_H
 #define KEEPASSX_TESTHASHEDBLOCKSTREAM_H

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

 class TestHashedBlockStream : public QObject
 {
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -17,8 +17,8 @@

 #include "TestKeePass1Reader.h"

-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>

 #include "config-keepassx-tests.h"
 #include "tests.h"
--- a/tests/TestKeePass1Reader.h
+++ b/tests/TestKeePass1Reader.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTKEEPASS1READER_H
 #define KEEPASSX_TESTKEEPASS1READER_H

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

 class Database;

--- a/tests/TestKeePass2RandomStream.cpp
+++ b/tests/TestKeePass2RandomStream.cpp
@@ -17,7 +17,7 @@

 #include "TestKeePass2RandomStream.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "crypto/Crypto.h"
--- a/tests/TestKeePass2RandomStream.h
+++ b/tests/TestKeePass2RandomStream.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H
 #define KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H

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

 class TestKeePass2RandomStream : public QObject
 {
--- a/tests/TestKeePass2Reader.cpp
+++ b/tests/TestKeePass2Reader.cpp
@@ -17,7 +17,7 @@

 #include "TestKeePass2Reader.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "config-keepassx-tests.h"
 #include "tests.h"
--- a/tests/TestKeePass2Reader.h
+++ b/tests/TestKeePass2Reader.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2READER_H
 #define KEEPASSX_TESTKEEPASS2READER_H

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

 class TestKeePass2Reader : public QObject
 {
--- a/tests/TestKeePass2Writer.cpp
+++ b/tests/TestKeePass2Writer.cpp
@@ -17,8 +17,8 @@

 #include "TestKeePass2Writer.h"

-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/TestKeePass2Writer.h
+++ b/tests/TestKeePass2Writer.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2WRITER_H
 #define KEEPASSX_TESTKEEPASS2WRITER_H

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

 class Database;

--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -17,8 +17,8 @@

 #include "TestKeePass2XmlReader.h"

-#include <QtCore/QFile>
-#include <QtTest/QTest>
+#include <QFile>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/TestKeePass2XmlReader.h
+++ b/tests/TestKeePass2XmlReader.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTKEEPASS2XMLREADER_H
 #define KEEPASSX_TESTKEEPASS2XMLREADER_H

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

 class Database;

--- a/tests/TestKeys.cpp
+++ b/tests/TestKeys.cpp
@@ -17,8 +17,8 @@

 #include "TestKeys.h"

-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>

 #include "config-keepassx-tests.h"
 #include "tests.h"
--- a/tests/TestKeys.h
+++ b/tests/TestKeys.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEYS_H
 #define KEEPASSX_TESTKEYS_H

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

 class TestKeys : public QObject
 {
--- a/tests/TestModified.cpp
+++ b/tests/TestModified.cpp
@@ -17,8 +17,8 @@

 #include "TestModified.h"

-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/TestModified.h
+++ b/tests/TestModified.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTMODIFIED_H
 #define KEEPASSX_TESTMODIFIED_H

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

 class TestModified : public QObject
 {
--- a/tests/TestQSaveFile.cpp
+++ b/tests/TestQSaveFile.cpp
@@ -18,7 +18,7 @@

 #include "TestQSaveFile.h"

-#include <QtTest/QtTest>
+#include <QtTest>

 #include <unistd.h>

--- a/tests/TestQSaveFile.h
+++ b/tests/TestQSaveFile.h
@@ -19,7 +19,7 @@
 #ifndef KEEPASSX_TESTQSAVEFILE_H
 #define KEEPASSX_TESTQSAVEFILE_H

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

 class TestQSaveFile : public QObject
 {
--- a/tests/TestSymmetricCipher.cpp
+++ b/tests/TestSymmetricCipher.cpp
@@ -17,8 +17,8 @@

 #include "TestSymmetricCipher.h"

-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>

 #include "tests.h"
 #include "crypto/Crypto.h"
--- a/tests/TestSymmetricCipher.h
+++ b/tests/TestSymmetricCipher.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTSYMMETRICCIPHER_H
 #define KEEPASSX_TESTSYMMETRICCIPHER_H

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

 class TestSymmetricCipher : public QObject
 {
--- a/tests/TestWildcardMatcher.cpp
+++ b/tests/TestWildcardMatcher.cpp
@@ -17,7 +17,7 @@

 #include "TestWildcardMatcher.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "autotype/WildcardMatcher.h"
--- a/tests/TestWildcardMatcher.h
+++ b/tests/TestWildcardMatcher.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTWILDCARDMATCHER_H
 #define KEEPASSX_TESTWILDCARDMATCHER_H

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

 class WildcardMatcher;

--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -17,16 +17,16 @@

 #include "TestGui.h"

-#include <QtCore/QTemporaryFile>
-#include <QtTest/QTest>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
+#include <QAction>
+#include <QApplication>
+#include <QDialogButtonBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTemporaryFile>
+#include <QTest>
+#include <QToolBar>
+#include <QToolButton>

 #include "config-keepassx-tests.h"
 #include "tests.h"
--- a/tests/gui/TestGui.h
+++ b/tests/gui/TestGui.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTGUI_H
 #define KEEPASSX_TESTGUI_H

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

 class Database;
 class DatabaseTabWidget;
--- a/tests/gui/TestGuiPixmaps.cpp
+++ b/tests/gui/TestGuiPixmaps.cpp
@@ -17,7 +17,7 @@

 #include "TestGuiPixmaps.h"

-#include <QtTest/QTest>
+#include <QTest>

 #include "tests.h"
 #include "core/Database.h"
--- a/tests/gui/TestGuiPixmaps.h
+++ b/tests/gui/TestGuiPixmaps.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSX_TESTGUIPIXMAPS_H
 #define KEEPASSX_TESTGUIPIXMAPS_H

-#include <QtCore/QObject>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
+#include <QImage>
+#include <QObject>
+#include <QPixmap>

 class TestGuiPixmaps : public QObject
 {
--- a/tests/modeltest.cpp
+++ b/tests/modeltest.cpp
@@ -41,8 +41,8 @@

 #include "modeltest.h"

-#include <QtCore/QDebug>
-#include <QtTest/QTest>
+#include <QDebug>
+#include <QTest>

 Q_DECLARE_METATYPE ( QModelIndex )

--- a/tests/modeltest.h
+++ b/tests/modeltest.h
@@ -43,9 +43,9 @@
 #ifndef MODELTEST_H
 #define MODELTEST_H

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

 class ModelTest : public QObject
 {
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -19,7 +19,7 @@
 #ifndef KEEPASSX_TESTS_H
 #define KEEPASSX_TESTS_H

-#include <QtTest/QTest>
+#include <QTest>

 // backport QTEST_GUILESS_MAIN, QTRY_VERIFY and QTRY_COMPARE from Qt 5