diff options
Diffstat (limited to 'src/assistant')
73 files changed, 162 insertions, 161 deletions
diff --git a/src/assistant/lib/lib.pro b/src/assistant/lib/lib.pro index f524aaa61..280c77915 100644 --- a/src/assistant/lib/lib.pro +++ b/src/assistant/lib/lib.pro @@ -1,6 +1,7 @@ load(qt_module) -QT += sql \ +QT += widgets \ + sql \ xml \ network \ core-private diff --git a/src/assistant/lib/qhelpcontentwidget.cpp b/src/assistant/lib/qhelpcontentwidget.cpp index 988a909e0..7e3cb93d1 100644 --- a/src/assistant/lib/qhelpcontentwidget.cpp +++ b/src/assistant/lib/qhelpcontentwidget.cpp @@ -48,7 +48,7 @@ #include <QtCore/QStack> #include <QtCore/QThread> #include <QtCore/QMutex> -#include <QtGui/QHeaderView> +#include <QtWidgets/QHeaderView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpcontentwidget.h b/src/assistant/lib/qhelpcontentwidget.h index 0e7567e20..ab7d80a43 100644 --- a/src/assistant/lib/qhelpcontentwidget.h +++ b/src/assistant/lib/qhelpcontentwidget.h @@ -46,7 +46,7 @@ #include <QtCore/QQueue> #include <QtCore/QString> -#include <QtGui/QTreeView> +#include <QtWidgets/QTreeView> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpengine.cpp b/src/assistant/lib/qhelpengine.cpp index f11b52a9c..007cc84a9 100644 --- a/src/assistant/lib/qhelpengine.cpp +++ b/src/assistant/lib/qhelpengine.cpp @@ -51,7 +51,7 @@ #include <QtCore/QFile> #include <QtCore/QLibrary> #include <QtCore/QPluginLoader> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtSql/QSqlQuery> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpenginecore.cpp b/src/assistant/lib/qhelpenginecore.cpp index 1fd22428d..178e11ee6 100644 --- a/src/assistant/lib/qhelpenginecore.cpp +++ b/src/assistant/lib/qhelpenginecore.cpp @@ -50,7 +50,7 @@ #include <QtCore/QPluginLoader> #include <QtCore/QFileInfo> #include <QtCore/QThread> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtSql/QSqlQuery> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpindexwidget.cpp b/src/assistant/lib/qhelpindexwidget.cpp index 82d402442..1b34ca0aa 100644 --- a/src/assistant/lib/qhelpindexwidget.cpp +++ b/src/assistant/lib/qhelpindexwidget.cpp @@ -46,8 +46,8 @@ #include <QtCore/QThread> #include <QtCore/QMutex> -#include <QtGui/QListView> -#include <QtGui/QHeaderView> +#include <QtWidgets/QListView> +#include <QtWidgets/QHeaderView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpindexwidget.h b/src/assistant/lib/qhelpindexwidget.h index 0c4d307aa..41e66f647 100644 --- a/src/assistant/lib/qhelpindexwidget.h +++ b/src/assistant/lib/qhelpindexwidget.h @@ -45,8 +45,8 @@ #include <QtHelp/qhelp_global.h> #include <QtCore/QUrl> -#include <QtGui/QStringListModel> -#include <QtGui/QListView> +#include <QtWidgets/QStringListModel> +#include <QtWidgets/QListView> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpsearchquerywidget.cpp b/src/assistant/lib/qhelpsearchquerywidget.cpp index e6a789a40..55974ada5 100644 --- a/src/assistant/lib/qhelpsearchquerywidget.cpp +++ b/src/assistant/lib/qhelpsearchquerywidget.cpp @@ -46,13 +46,13 @@ #include <QtCore/QStringList> #include <QtCore/QtGlobal> -#include <QtGui/QCompleter> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> #include <QtGui/QFocusEvent> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpsearchquerywidget.h b/src/assistant/lib/qhelpsearchquerywidget.h index e9fb61ceb..e438df0b5 100644 --- a/src/assistant/lib/qhelpsearchquerywidget.h +++ b/src/assistant/lib/qhelpsearchquerywidget.h @@ -49,7 +49,7 @@ #include <QtCore/QString> #include <QtCore/QStringList> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpsearchresultwidget.cpp b/src/assistant/lib/qhelpsearchresultwidget.cpp index 2b5845062..964185b5e 100644 --- a/src/assistant/lib/qhelpsearchresultwidget.cpp +++ b/src/assistant/lib/qhelpsearchresultwidget.cpp @@ -46,15 +46,15 @@ #include <QtCore/QPointer> #include <QtCore/QStringList> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> #include <QtGui/QMouseEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QSpacerItem> -#include <QtGui/QToolButton> -#include <QtGui/QTreeWidget> -#include <QtGui/QTextBrowser> -#include <QtGui/QTreeWidgetItem> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QTreeWidgetItem> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpsearchresultwidget.h b/src/assistant/lib/qhelpsearchresultwidget.h index cd6ac1051..f9300e979 100644 --- a/src/assistant/lib/qhelpsearchresultwidget.h +++ b/src/assistant/lib/qhelpsearchresultwidget.h @@ -49,7 +49,7 @@ #include <QtCore/QPoint> #include <QtCore/QObject> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/assistant/tools/assistant/aboutdialog.cpp b/src/assistant/tools/assistant/aboutdialog.cpp index b4c390e90..d306812bb 100644 --- a/src/assistant/tools/assistant/aboutdialog.cpp +++ b/src/assistant/tools/assistant/aboutdialog.cpp @@ -46,12 +46,12 @@ #include <QtCore/QBuffer> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QLayout> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> -#include <QtGui/QMessageBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLayout> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QMessageBox> #include <QtGui/QDesktopServices> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/aboutdialog.h b/src/assistant/tools/assistant/aboutdialog.h index 292312d05..70b315714 100644 --- a/src/assistant/tools/assistant/aboutdialog.h +++ b/src/assistant/tools/assistant/aboutdialog.h @@ -42,8 +42,8 @@ #ifndef ABOUTDIALOG_H #define ABOUTDIALOG_H -#include <QtGui/QTextBrowser> -#include <QtGui/QDialog> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/tools/assistant/assistant.pro index eeee0ad46..dc8928bad 100644 --- a/src/assistant/tools/assistant/assistant.pro +++ b/src/assistant/tools/assistant/assistant.pro @@ -10,7 +10,7 @@ TARGET = assistant CONFIG += qt \ warn_on \ help -QT += network help +QT += widgets network help PROJECTNAME = Assistant DESTDIR = $$QT.designer.bins target.path = $$[QT_INSTALL_BINS] diff --git a/src/assistant/tools/assistant/bookmarkdialog.cpp b/src/assistant/tools/assistant/bookmarkdialog.cpp index d2f88f968..e3cd9ac60 100644 --- a/src/assistant/tools/assistant/bookmarkdialog.cpp +++ b/src/assistant/tools/assistant/bookmarkdialog.cpp @@ -46,7 +46,7 @@ #include "tracer.h" #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.h b/src/assistant/tools/assistant/bookmarkfiltermodel.h index 65ed12f20..310e27512 100644 --- a/src/assistant/tools/assistant/bookmarkfiltermodel.h +++ b/src/assistant/tools/assistant/bookmarkfiltermodel.h @@ -43,8 +43,8 @@ #include <QtCore/QPersistentModelIndex> -#include <QtGui/QAbstractProxyModel> -#include <QtGui/QSortFilterProxyModel> +#include <QtWidgets/QAbstractProxyModel> +#include <QtWidgets/QSortFilterProxyModel> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanager.cpp b/src/assistant/tools/assistant/bookmarkmanager.cpp index 87331463b..29d8567a7 100644 --- a/src/assistant/tools/assistant/bookmarkmanager.cpp +++ b/src/assistant/tools/assistant/bookmarkmanager.cpp @@ -49,11 +49,11 @@ #include "centralwidget.h" #include "helpenginewrapper.h" -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QToolBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QSortFilterProxyModel> +#include <QtWidgets/QToolBar> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanager.h b/src/assistant/tools/assistant/bookmarkmanager.h index f5823a7fa..0b6275af9 100644 --- a/src/assistant/tools/assistant/bookmarkmanager.h +++ b/src/assistant/tools/assistant/bookmarkmanager.h @@ -42,7 +42,7 @@ #define BOOKMARKMANAGER_H #include <QtCore/QMutex> -#include <QtGui/QTreeView> +#include <QtWidgets/QTreeView> #include "ui_bookmarkwidget.h" diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp b/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp index dd410d3a2..87a1f65be 100644 --- a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp +++ b/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp @@ -49,10 +49,10 @@ #include <QtCore/QUrl> #include <QtGui/QCloseEvent> -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> #include <QtGui/QKeySequence> -#include <QtGui/QMessageBox> -#include <QtGui/QShortcut> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QShortcut> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.h b/src/assistant/tools/assistant/bookmarkmanagerwidget.h index a0dec72a6..5c461b937 100644 --- a/src/assistant/tools/assistant/bookmarkmanagerwidget.h +++ b/src/assistant/tools/assistant/bookmarkmanagerwidget.h @@ -45,7 +45,7 @@ #include <QtCore/QPersistentModelIndex> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmodel.cpp b/src/assistant/tools/assistant/bookmarkmodel.cpp index 5a02aa03d..d27731642 100644 --- a/src/assistant/tools/assistant/bookmarkmodel.cpp +++ b/src/assistant/tools/assistant/bookmarkmodel.cpp @@ -44,9 +44,9 @@ #include <QtCore/QMimeData> #include <QtCore/QStack> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QTreeView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QStyle> +#include <QtWidgets/QTreeView> const quint32 VERSION = 0xe53798; const QLatin1String MIMETYPE("application/bookmarks.assistant"); diff --git a/src/assistant/tools/assistant/bookmarkmodel.h b/src/assistant/tools/assistant/bookmarkmodel.h index 33c9e981d..e23e9c41a 100644 --- a/src/assistant/tools/assistant/bookmarkmodel.h +++ b/src/assistant/tools/assistant/bookmarkmodel.h @@ -43,7 +43,7 @@ #include <QtCore/QAbstractItemModel> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/centralwidget.cpp b/src/assistant/tools/assistant/centralwidget.cpp index c8c454f60..da27f033d 100644 --- a/src/assistant/tools/assistant/centralwidget.cpp +++ b/src/assistant/tools/assistant/centralwidget.cpp @@ -51,14 +51,14 @@ #include <QtCore/QTimer> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QPageSetupDialog> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrintPreviewDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QPageSetupDialog> +#include <QtWidgets/QPrintDialog> +#include <QtWidgets/QPrintPreviewDialog> #include <QtGui/QPrinter> -#include <QtGui/QStackedWidget> -#include <QtGui/QTextBrowser> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QVBoxLayout> #include <QtHelp/QHelpSearchEngine> diff --git a/src/assistant/tools/assistant/centralwidget.h b/src/assistant/tools/assistant/centralwidget.h index 2645fa8df..cdf132a1f 100644 --- a/src/assistant/tools/assistant/centralwidget.h +++ b/src/assistant/tools/assistant/centralwidget.h @@ -44,8 +44,8 @@ #include <QtCore/QUrl> -#include <QtGui/QTabBar> -#include <QtGui/QWidget> +#include <QtWidgets/QTabBar> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/cmdlineparser.cpp b/src/assistant/tools/assistant/cmdlineparser.cpp index 6a239d305..bc498a9d3 100644 --- a/src/assistant/tools/assistant/cmdlineparser.cpp +++ b/src/assistant/tools/assistant/cmdlineparser.cpp @@ -42,7 +42,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QStringBuilder> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "cmdlineparser.h" diff --git a/src/assistant/tools/assistant/contentwindow.cpp b/src/assistant/tools/assistant/contentwindow.cpp index fbf70aa1f..3fb1555e0 100644 --- a/src/assistant/tools/assistant/contentwindow.cpp +++ b/src/assistant/tools/assistant/contentwindow.cpp @@ -47,9 +47,9 @@ #include "openpagesmanager.h" #include "tracer.h" -#include <QtGui/QLayout> +#include <QtWidgets/QLayout> #include <QtGui/QFocusEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtHelp/QHelpContentWidget> diff --git a/src/assistant/tools/assistant/contentwindow.h b/src/assistant/tools/assistant/contentwindow.h index b8bdc8fee..9c7f4c24f 100644 --- a/src/assistant/tools/assistant/contentwindow.h +++ b/src/assistant/tools/assistant/contentwindow.h @@ -44,7 +44,7 @@ #include <QtCore/QUrl> #include <QtCore/QModelIndex> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/filternamedialog.cpp b/src/assistant/tools/assistant/filternamedialog.cpp index 1d9563d2f..d1424ee2a 100644 --- a/src/assistant/tools/assistant/filternamedialog.cpp +++ b/src/assistant/tools/assistant/filternamedialog.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "tracer.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> #include "filternamedialog.h" diff --git a/src/assistant/tools/assistant/filternamedialog.h b/src/assistant/tools/assistant/filternamedialog.h index 35575421e..bf65a7e15 100644 --- a/src/assistant/tools/assistant/filternamedialog.h +++ b/src/assistant/tools/assistant/filternamedialog.h @@ -42,7 +42,7 @@ #ifndef FILTERNAMEDIALOG_H #define FILTERNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_filternamedialog.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/findwidget.cpp b/src/assistant/tools/assistant/findwidget.cpp index d45ed30b0..296da0c8d 100644 --- a/src/assistant/tools/assistant/findwidget.cpp +++ b/src/assistant/tools/assistant/findwidget.cpp @@ -41,14 +41,14 @@ #include "tracer.h" #include "findwidget.h" -#include <QtGui/QApplication> -#include <QtGui/QCheckBox> +#include <QtWidgets/QApplication> +#include <QtWidgets/QCheckBox> #include <QtGui/QHideEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/findwidget.h b/src/assistant/tools/assistant/findwidget.h index d3be0f587..b24e88019 100644 --- a/src/assistant/tools/assistant/findwidget.h +++ b/src/assistant/tools/assistant/findwidget.h @@ -41,7 +41,7 @@ #ifndef FINDWIDGET_H #define FINDWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/globalactions.cpp b/src/assistant/tools/assistant/globalactions.cpp index 7fc59ebcd..6b8b8ea29 100644 --- a/src/assistant/tools/assistant/globalactions.cpp +++ b/src/assistant/tools/assistant/globalactions.cpp @@ -45,8 +45,8 @@ #include "helpviewer.h" #include "tracer.h" -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> #if !defined(QT_NO_WEBKIT) #include <QtWebKit/QWebHistory> diff --git a/src/assistant/tools/assistant/helpviewer.h b/src/assistant/tools/assistant/helpviewer.h index bba01d0e6..a5f4de668 100644 --- a/src/assistant/tools/assistant/helpviewer.h +++ b/src/assistant/tools/assistant/helpviewer.h @@ -47,11 +47,11 @@ #include <QtCore/QUrl> #include <QtCore/QVariant> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <QtGui/QFont> #if defined(QT_NO_WEBKIT) -#include <QtGui/QTextBrowser> +#include <QtWidgets/QTextBrowser> #else #include <QtWebKit/QWebView> #endif diff --git a/src/assistant/tools/assistant/helpviewer_p.h b/src/assistant/tools/assistant/helpviewer_p.h index 378871197..8beeb94b2 100644 --- a/src/assistant/tools/assistant/helpviewer_p.h +++ b/src/assistant/tools/assistant/helpviewer_p.h @@ -48,7 +48,7 @@ #include <QtCore/QObject> #ifdef QT_NO_WEBKIT -#include <QtGui/QTextBrowser> +#include <QtWidgets/QTextBrowser> #endif QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/helpviewer_qtb.cpp b/src/assistant/tools/assistant/helpviewer_qtb.cpp index 0a6325cb5..d3d128b74 100644 --- a/src/assistant/tools/assistant/helpviewer_qtb.cpp +++ b/src/assistant/tools/assistant/helpviewer_qtb.cpp @@ -50,9 +50,9 @@ #include <QtCore/QStringBuilder> #include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QClipboard> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/helpviewer_qwv.cpp b/src/assistant/tools/assistant/helpviewer_qwv.cpp index efb9b5900..662177631 100644 --- a/src/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/src/assistant/tools/assistant/helpviewer_qwv.cpp @@ -51,8 +51,8 @@ #include <QtCore/QString> #include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QWheelEvent> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWheelEvent> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/indexwindow.cpp b/src/assistant/tools/assistant/indexwindow.cpp index 38bc8b96a..069e821cd 100644 --- a/src/assistant/tools/assistant/indexwindow.cpp +++ b/src/assistant/tools/assistant/indexwindow.cpp @@ -48,13 +48,13 @@ #include "topicchooser.h" #include "tracer.h" -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QContextMenuEvent> -#include <QtGui/QListWidgetItem> +#include <QtWidgets/QListWidgetItem> #include <QtHelp/QHelpIndexWidget> diff --git a/src/assistant/tools/assistant/indexwindow.h b/src/assistant/tools/assistant/indexwindow.h index 6c1c4e14e..1873cd6e4 100644 --- a/src/assistant/tools/assistant/indexwindow.h +++ b/src/assistant/tools/assistant/indexwindow.h @@ -43,8 +43,8 @@ #define INDEXWINDOW_H #include <QtCore/QUrl> -#include <QtGui/QWidget> -#include <QtGui/QLineEdit> +#include <QtWidgets/QWidget> +#include <QtWidgets/QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/installdialog.cpp b/src/assistant/tools/assistant/installdialog.cpp index 29473a2f9..82c0ccaa9 100644 --- a/src/assistant/tools/assistant/installdialog.cpp +++ b/src/assistant/tools/assistant/installdialog.cpp @@ -49,8 +49,8 @@ #include <QtCore/QFile> #include <QtCore/QCryptographicHash> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QFileDialog> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/installdialog.h b/src/assistant/tools/assistant/installdialog.h index 0fb45a130..0f57b9ef0 100644 --- a/src/assistant/tools/assistant/installdialog.h +++ b/src/assistant/tools/assistant/installdialog.h @@ -43,7 +43,7 @@ #define INSTALLDIALOG_H #include <QtCore/QQueue> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <QtNetwork/QHttpResponseHeader> #include "ui_installdialog.h" diff --git a/src/assistant/tools/assistant/main.cpp b/src/assistant/tools/assistant/main.cpp index 84972c546..d6e78d473 100644 --- a/src/assistant/tools/assistant/main.cpp +++ b/src/assistant/tools/assistant/main.cpp @@ -49,7 +49,7 @@ #include <QtCore/QTranslator> #include <QtCore/QUrl> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QDesktopServices> #include <QtHelp/QHelpEngine> diff --git a/src/assistant/tools/assistant/mainwindow.cpp b/src/assistant/tools/assistant/mainwindow.cpp index 342fc76da..18a215ecd 100644 --- a/src/assistant/tools/assistant/mainwindow.cpp +++ b/src/assistant/tools/assistant/mainwindow.cpp @@ -66,23 +66,23 @@ #include <QtCore/QTextStream> #include <QtCore/QTimer> -#include <QtGui/QAction> -#include <QtGui/QComboBox> +#include <QtWidgets/QAction> +#include <QtWidgets/QComboBox> #include <QtGui/QDesktopServices> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDockWidget> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QDockWidget> #include <QtGui/QFontDatabase> -#include <QtGui/QFileDialog> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QProgressBar> -#include <QtGui/QShortcut> -#include <QtGui/QStatusBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QShortcut> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QToolButton> #include <QtHelp/QHelpContentModel> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/mainwindow.h b/src/assistant/tools/assistant/mainwindow.h index 6fe10ec45..1ea0bbaf2 100644 --- a/src/assistant/tools/assistant/mainwindow.h +++ b/src/assistant/tools/assistant/mainwindow.h @@ -44,7 +44,7 @@ #include <QtCore/QList> #include <QtCore/QUrl> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesmanager.cpp b/src/assistant/tools/assistant/openpagesmanager.cpp index 272d9e242..7bafeeafc 100644 --- a/src/assistant/tools/assistant/openpagesmanager.cpp +++ b/src/assistant/tools/assistant/openpagesmanager.cpp @@ -50,8 +50,8 @@ #include "tracer.h" #include "../shared/collectionconfiguration.h" -#include <QtGui/QApplication> -#include <QtGui/QTreeView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesswitcher.cpp b/src/assistant/tools/assistant/openpagesswitcher.cpp index 8e7f29bf0..b1f70d784 100644 --- a/src/assistant/tools/assistant/openpagesswitcher.cpp +++ b/src/assistant/tools/assistant/openpagesswitcher.cpp @@ -49,7 +49,7 @@ #include <QtCore/QEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QVBoxLayout> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesswitcher.h b/src/assistant/tools/assistant/openpagesswitcher.h index 80c7e965d..c3e3a33ce 100644 --- a/src/assistant/tools/assistant/openpagesswitcher.h +++ b/src/assistant/tools/assistant/openpagesswitcher.h @@ -42,7 +42,7 @@ #ifndef OPENPAGESSWITCHER_H #define OPENPAGESSWITCHER_H -#include <QtGui/QFrame> +#include <QtWidgets/QFrame> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpageswidget.cpp b/src/assistant/tools/assistant/openpageswidget.cpp index db037125b..6947c312c 100644 --- a/src/assistant/tools/assistant/openpageswidget.cpp +++ b/src/assistant/tools/assistant/openpageswidget.cpp @@ -45,11 +45,11 @@ #include "openpagesmodel.h" #include "tracer.h" -#include <QtGui/QApplication> -#include <QtGui/QHeaderView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QHeaderView> #include <QtGui/QKeyEvent> #include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QPainter> #ifdef Q_WS_MAC diff --git a/src/assistant/tools/assistant/openpageswidget.h b/src/assistant/tools/assistant/openpageswidget.h index 6041fe22d..e629e4ffe 100644 --- a/src/assistant/tools/assistant/openpageswidget.h +++ b/src/assistant/tools/assistant/openpageswidget.h @@ -42,8 +42,8 @@ #ifndef OPENPAGESWIDGET_H #define OPENPAGESWIDGET_H -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QTreeView> +#include <QtWidgets/QStyledItemDelegate> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/preferencesdialog.cpp b/src/assistant/tools/assistant/preferencesdialog.cpp index 9bfd35c00..64fc3c42d 100644 --- a/src/assistant/tools/assistant/preferencesdialog.cpp +++ b/src/assistant/tools/assistant/preferencesdialog.cpp @@ -51,12 +51,12 @@ #include <QtCore/QtAlgorithms> #include <QtCore/QFileSystemWatcher> -#include <QtGui/QDesktopWidget> -#include <QtGui/QFileDialog> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QFileDialog> #include <QtGui/QFontDatabase> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMessageBox> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/preferencesdialog.h b/src/assistant/tools/assistant/preferencesdialog.h index f9b445e72..04bfcf8c3 100644 --- a/src/assistant/tools/assistant/preferencesdialog.h +++ b/src/assistant/tools/assistant/preferencesdialog.h @@ -42,7 +42,7 @@ #ifndef PREFERENCESDIALOG_H #define PREFERENCESDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_preferencesdialog.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/remotecontrol.cpp b/src/assistant/tools/assistant/remotecontrol.cpp index 5d93fbc2e..0990a357f 100644 --- a/src/assistant/tools/assistant/remotecontrol.cpp +++ b/src/assistant/tools/assistant/remotecontrol.cpp @@ -53,8 +53,8 @@ #include <QtCore/QTextStream> #include <QtCore/QSocketNotifier> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QApplication> #include <QtHelp/QHelpEngine> #include <QtHelp/QHelpIndexWidget> diff --git a/src/assistant/tools/assistant/searchwidget.cpp b/src/assistant/tools/assistant/searchwidget.cpp index 627d9e745..31b8e739d 100644 --- a/src/assistant/tools/assistant/searchwidget.cpp +++ b/src/assistant/tools/assistant/searchwidget.cpp @@ -47,12 +47,12 @@ #include <QtCore/QString> #include <QtCore/QStringList> -#include <QtGui/QMenu> -#include <QtGui/QLayout> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLayout> #include <QtGui/QKeyEvent> #include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QTextBrowser> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTextBrowser> #include <QtHelp/QHelpSearchEngine> #include <QtHelp/QHelpSearchQueryWidget> diff --git a/src/assistant/tools/assistant/searchwidget.h b/src/assistant/tools/assistant/searchwidget.h index 077c78771..c53498c94 100644 --- a/src/assistant/tools/assistant/searchwidget.h +++ b/src/assistant/tools/assistant/searchwidget.h @@ -45,7 +45,7 @@ #include <QtCore/QUrl> #include <QtCore/QPoint> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/topicchooser.h b/src/assistant/tools/assistant/topicchooser.h index a80f1963d..6ac59f008 100644 --- a/src/assistant/tools/assistant/topicchooser.h +++ b/src/assistant/tools/assistant/topicchooser.h @@ -49,7 +49,7 @@ #include <QtCore/QString> #include <QtCore/QUrl> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.cpp b/src/assistant/tools/qhelpconverter/conversionwizard.cpp index 1df9facc5..0a80a0e71 100644 --- a/src/assistant/tools/qhelpconverter/conversionwizard.cpp +++ b/src/assistant/tools/qhelpconverter/conversionwizard.cpp @@ -43,7 +43,7 @@ #include <QtCore/QDir> #include <QtCore/QVariant> #include <QtCore/QTimer> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QMouseEvent> #include "conversionwizard.h" diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.h b/src/assistant/tools/qhelpconverter/conversionwizard.h index eb9b3f556..ff66d271e 100644 --- a/src/assistant/tools/qhelpconverter/conversionwizard.h +++ b/src/assistant/tools/qhelpconverter/conversionwizard.h @@ -42,7 +42,7 @@ #ifndef CONVERSIONWIZARD_H #define CONVERSIONWIZARD_H -#include <QtGui/QWizard> +#include <QtWidgets/QWizard> #include "adpreader.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filespage.h b/src/assistant/tools/qhelpconverter/filespage.h index 393c3d5e1..07022e898 100644 --- a/src/assistant/tools/qhelpconverter/filespage.h +++ b/src/assistant/tools/qhelpconverter/filespage.h @@ -42,7 +42,7 @@ #ifndef FILESPAGE_H #define FILESPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_filespage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filterpage.cpp b/src/assistant/tools/qhelpconverter/filterpage.cpp index 3b22ca0d1..efe32c79e 100644 --- a/src/assistant/tools/qhelpconverter/filterpage.cpp +++ b/src/assistant/tools/qhelpconverter/filterpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "filterpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filterpage.h b/src/assistant/tools/qhelpconverter/filterpage.h index 0281a1ed3..336c650de 100644 --- a/src/assistant/tools/qhelpconverter/filterpage.h +++ b/src/assistant/tools/qhelpconverter/filterpage.h @@ -42,7 +42,7 @@ #ifndef FILTERPAGE_H #define FILTERPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_filterpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/finishpage.cpp b/src/assistant/tools/qhelpconverter/finishpage.cpp index a7fa89e2e..cdbd634e6 100644 --- a/src/assistant/tools/qhelpconverter/finishpage.cpp +++ b/src/assistant/tools/qhelpconverter/finishpage.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include <QtGui/QTextEdit> -#include <QtGui/QLayout> -#include <QtGui/QSpacerItem> -#include <QtGui/QApplication> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QLayout> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QApplication> #include "finishpage.h" diff --git a/src/assistant/tools/qhelpconverter/finishpage.h b/src/assistant/tools/qhelpconverter/finishpage.h index 15b0c4a55..41dec54ca 100644 --- a/src/assistant/tools/qhelpconverter/finishpage.h +++ b/src/assistant/tools/qhelpconverter/finishpage.h @@ -42,7 +42,7 @@ #ifndef FINISHPAGE_H #define FINISHPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/generalpage.cpp b/src/assistant/tools/qhelpconverter/generalpage.cpp index 4b32cbbf9..ad0171270 100644 --- a/src/assistant/tools/qhelpconverter/generalpage.cpp +++ b/src/assistant/tools/qhelpconverter/generalpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "generalpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/generalpage.h b/src/assistant/tools/qhelpconverter/generalpage.h index 413a798df..c9a8b2452 100644 --- a/src/assistant/tools/qhelpconverter/generalpage.h +++ b/src/assistant/tools/qhelpconverter/generalpage.h @@ -42,7 +42,7 @@ #ifndef GENERALPAGE_H #define GENERALPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_generalpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/helpwindow.cpp b/src/assistant/tools/qhelpconverter/helpwindow.cpp index 9fa33585e..5212092f7 100644 --- a/src/assistant/tools/qhelpconverter/helpwindow.cpp +++ b/src/assistant/tools/qhelpconverter/helpwindow.cpp @@ -41,9 +41,9 @@ #include <QtCore/QFile> #include <QtCore/QTextStream> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QTextEdit> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTextEdit> #include "helpwindow.h" diff --git a/src/assistant/tools/qhelpconverter/helpwindow.h b/src/assistant/tools/qhelpconverter/helpwindow.h index ba176ed72..9a45f06e0 100644 --- a/src/assistant/tools/qhelpconverter/helpwindow.h +++ b/src/assistant/tools/qhelpconverter/helpwindow.h @@ -42,7 +42,7 @@ #ifndef HELPWINDOW_H #define HELPWINDOW_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/identifierpage.h b/src/assistant/tools/qhelpconverter/identifierpage.h index c05eb8f72..05de35ca9 100644 --- a/src/assistant/tools/qhelpconverter/identifierpage.h +++ b/src/assistant/tools/qhelpconverter/identifierpage.h @@ -42,7 +42,7 @@ #ifndef IDENTIFIERPAGE_H #define IDENTIFIERPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_identifierpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/inputpage.cpp b/src/assistant/tools/qhelpconverter/inputpage.cpp index aa180b90e..9abbbe74b 100644 --- a/src/assistant/tools/qhelpconverter/inputpage.cpp +++ b/src/assistant/tools/qhelpconverter/inputpage.cpp @@ -42,13 +42,13 @@ #include <QtCore/QFile> #include <QtCore/QVariant> -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QApplication> #include "inputpage.h" #include "adpreader.h" diff --git a/src/assistant/tools/qhelpconverter/inputpage.h b/src/assistant/tools/qhelpconverter/inputpage.h index 4489dc781..185b7b2b2 100644 --- a/src/assistant/tools/qhelpconverter/inputpage.h +++ b/src/assistant/tools/qhelpconverter/inputpage.h @@ -42,7 +42,7 @@ #ifndef INPUTPAGE_H #define INPUTPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_inputpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/main.cpp b/src/assistant/tools/qhelpconverter/main.cpp index 38f6ffc4e..1c2d1bf12 100644 --- a/src/assistant/tools/qhelpconverter/main.cpp +++ b/src/assistant/tools/qhelpconverter/main.cpp @@ -43,7 +43,7 @@ #include <QtCore/QTranslator> #include <QtCore/QLocale> #include <QtCore/QLibraryInfo> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "conversionwizard.h" diff --git a/src/assistant/tools/qhelpconverter/outputpage.cpp b/src/assistant/tools/qhelpconverter/outputpage.cpp index d8a6bd13f..434357b34 100644 --- a/src/assistant/tools/qhelpconverter/outputpage.cpp +++ b/src/assistant/tools/qhelpconverter/outputpage.cpp @@ -41,7 +41,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QDir> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "outputpage.h" diff --git a/src/assistant/tools/qhelpconverter/outputpage.h b/src/assistant/tools/qhelpconverter/outputpage.h index 535729bf8..e45afae10 100644 --- a/src/assistant/tools/qhelpconverter/outputpage.h +++ b/src/assistant/tools/qhelpconverter/outputpage.h @@ -42,7 +42,7 @@ #ifndef OUTPUTPAGE_H #define OUTPUTPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_outputpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/pathpage.cpp b/src/assistant/tools/qhelpconverter/pathpage.cpp index e5391eb80..a9ddf53a5 100644 --- a/src/assistant/tools/qhelpconverter/pathpage.cpp +++ b/src/assistant/tools/qhelpconverter/pathpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> #include "pathpage.h" diff --git a/src/assistant/tools/qhelpconverter/pathpage.h b/src/assistant/tools/qhelpconverter/pathpage.h index aad387976..90b24236c 100644 --- a/src/assistant/tools/qhelpconverter/pathpage.h +++ b/src/assistant/tools/qhelpconverter/pathpage.h @@ -42,7 +42,7 @@ #ifndef PATHPAGE_H #define PATHPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_pathpage.h" QT_BEGIN_NAMESPACE |