Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.
2025-08-09 06:52:50 -04:00 · 2013-10-03 15:18:16 +02:00 · 2013-10-03 15:18:16 +02:00 · 6504b6f2bd
commit 6504b6f2bd
parent 035271d469
170 changed files with 332 additions and 339 deletions
--- a/src/gui/AboutDialog.h
+++ b/src/gui/AboutDialog.h
@ -18,8 +18,8 @@
 #ifndef KEEPASSX_ABOUTDIALOG_H
 #define KEEPASSX_ABOUTDIALOG_H

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

 #include "core/Global.h"

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

 #include "Application.h"

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

 #include "autotype/AutoType.h"

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

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

 #include "core/Global.h"

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

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

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

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

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

 #include "Clipboard.h"

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

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

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

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

 #include "core/Global.h"

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

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

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

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

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

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

 #include "gui/DialogyWidget.h"

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

 #include "DatabaseTabWidget.h"

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

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

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

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

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

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

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

 #include "core/Global.h"

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

 #include "DialogyWidget.h"

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

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

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

 #include "core/Global.h"

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

 #include "DragTabBar.h"

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

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

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

 #include "core/Global.h"

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

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

 #include "gui/DialogyWidget.h"

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

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

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

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

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

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

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

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

 #include "core/Global.h"

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

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

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

 #include "KeePass1OpenWidget.h"

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

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

 #include "LineEdit.h"

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

 #include "core/FilePath.h"

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

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

 #include "core/Global.h"

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

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

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

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

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

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

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

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

 #include "core/Global.h"

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

 #include "UnlockDatabaseWidget.h"

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

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

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

 #include "core/Global.h"

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

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

 #include "core/AutoTypeAssociations.h"

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

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

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

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

 #include "gui/EditWidget.h"

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

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

 class CategoryListViewDelegate : public QStyledItemDelegate
 {
--- a/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"

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

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

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

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

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

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

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