Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.
steven4git · Oct 3, 2013 · 6504b6f · 6504b6f
1 parent 035271d
commit 6504b6f
Show file tree

Hide file tree

Showing 170 changed files with 332 additions and 339 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"