VariousPlugins: Fix forward declarations

The pattern is to use QT_[BEGIN/END]_NAMESPACE, instead of
QT_FORWARD_DECLARE_CLASS.

Change-Id: I9da39ee003e1d477a5f56980c218e275706bb3f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

17 files changed, 40 insertions, 23 deletions

diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h
index 2d4786e0da..17d39b7353 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.h
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.h
@@ -12,7 +12,9 @@
 
 #include <atomic>
 
-QT_FORWARD_DECLARE_CLASS(QDir)
+QT_BEGIN_NAMESPACE
+class QDir;
+QT_END_NAMESPACE
 
 namespace AutotoolsProjectManager::Internal {
 
diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h
index c27d296ab0..31e3cdcb32 100644
--- a/src/plugins/designer/qtcreatorintegration.h
+++ b/src/plugins/designer/qtcreatorintegration.h
@@ -6,7 +6,9 @@
 #include <QtGlobal>
 #include <QDesignerIntegration>
 
-QT_FORWARD_DECLARE_CLASS(QUrl)
+QT_BEGIN_NAMESPACE
+class QUrl;
+QT_END_NAMESPACE
 
 namespace Designer {
 namespace Internal {
diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h
index 6a7e72ae37..287e53de59 100644
--- a/src/plugins/diffeditor/diffeditordocument.h
+++ b/src/plugins/diffeditor/diffeditordocument.h
@@ -8,8 +8,6 @@
 #include <coreplugin/patchtool.h>
 #include <coreplugin/textdocument.h>
 
-QT_FORWARD_DECLARE_CLASS(QMenu)
-
 namespace DiffEditor {
 
 class DiffEditorController;
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.h b/src/plugins/diffeditor/diffeditorwidgetcontroller.h
index 81baef980a..7364cf1a63 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.h
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.h
@@ -12,7 +12,9 @@
 #include <QTextCharFormat>
 #include <QTimer>
 
-QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_BEGIN_NAMESPACE
+class QMenu;
+QT_END_NAMESPACE
 
 namespace Core { class IDocument; }
 namespace TextEditor { class FontSettings; }
diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h
index 9028f83c63..07e4c1d186 100644
--- a/src/plugins/diffeditor/diffview.h
+++ b/src/plugins/diffeditor/diffview.h
@@ -11,7 +11,9 @@
 #include <QString>
 #include <QObject>
 
-QT_FORWARD_DECLARE_CLASS(QWidget)
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
 
 namespace TextEditor { class TextEditorWidget; }
 
diff --git a/src/plugins/emacskeys/emacskeysplugin.h b/src/plugins/emacskeys/emacskeysplugin.h
index ab124b47ce..1e5300ff1b 100644
--- a/src/plugins/emacskeys/emacskeysplugin.h
+++ b/src/plugins/emacskeys/emacskeysplugin.h
@@ -30,9 +30,10 @@
 
 #include <QTextCursor>
 
-// forward declarations
-QT_FORWARD_DECLARE_CLASS(QAction)
-QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
+QT_BEGIN_NAMESPACE
+class QAction;
+class QPlainTextEdit;
+QT_END_NAMESPACE
 
 namespace Core {
 class IEditor;
diff --git a/src/plugins/emacskeys/emacskeysstate.h b/src/plugins/emacskeys/emacskeysstate.h
index a0de7ceffd..43b6587667 100644
--- a/src/plugins/emacskeys/emacskeysstate.h
+++ b/src/plugins/emacskeys/emacskeysstate.h
@@ -26,7 +26,9 @@
 
 #include <QObject>
 
-QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
+QT_BEGIN_NAMESPACE
+class QPlainTextEdit;
+QT_END_NAMESPACE
 
 namespace EmacsKeys {
 namespace Internal {
diff --git a/src/plugins/git/gerrit/gerritparameters.h b/src/plugins/git/gerrit/gerritparameters.h
index 75806aa4f5..38a6577885 100644
--- a/src/plugins/git/gerrit/gerritparameters.h
+++ b/src/plugins/git/gerrit/gerritparameters.h
@@ -7,7 +7,9 @@
 
 #include <utils/filepath.h>
 
-QT_FORWARD_DECLARE_CLASS(QSettings)
+QT_BEGIN_NAMESPACE
+class QSettings;
+QT_END_NAMESPACE
 
 namespace Gerrit {
 namespace Internal {
diff --git a/src/plugins/help/searchtaskhandler.h b/src/plugins/help/searchtaskhandler.h
index 09e03f1e06..e813afb902 100644
--- a/src/plugins/help/searchtaskhandler.h
+++ b/src/plugins/help/searchtaskhandler.h
@@ -5,7 +5,9 @@
 
 #include <projectexplorer/itaskhandler.h>
 
-QT_FORWARD_DECLARE_CLASS(QUrl)
+QT_BEGIN_NAMESPACE
+class QUrl;
+QT_END_NAMESPACE
 
 namespace Help {
 namespace Internal {
diff --git a/src/plugins/imageviewer/exportdialog.h b/src/plugins/imageviewer/exportdialog.h
index 5868cc7ef7..f9e7cf939b 100644
--- a/src/plugins/imageviewer/exportdialog.h
+++ b/src/plugins/imageviewer/exportdialog.h
@@ -5,7 +5,9 @@
 
 #include <QDialog>
 
-QT_FORWARD_DECLARE_CLASS(QSpinBox)
+QT_BEGIN_NAMESPACE
+class QSpinBox;
+QT_END_NAMESPACE
 
 namespace Utils {
 class FilePath;
diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h
index 6bee8e3243..e5cf20ea80 100644
--- a/src/plugins/imageviewer/imageview.h
+++ b/src/plugins/imageviewer/imageview.h
@@ -8,7 +8,9 @@
 
 #include <QGraphicsView>
 
-QT_FORWARD_DECLARE_CLASS(QImage)
+QT_BEGIN_NAMESPACE
+class QImage;
+QT_END_NAMESPACE
 
 namespace Utils {
 class QtcSettings;
diff --git a/src/plugins/imageviewer/multiexportdialog.h b/src/plugins/imageviewer/multiexportdialog.h
index bd8ed32b1a..74eb33f4ca 100644
--- a/src/plugins/imageviewer/multiexportdialog.h
+++ b/src/plugins/imageviewer/multiexportdialog.h
@@ -8,7 +8,9 @@
 #include <QSize>
 #include <QVector>
 
-QT_FORWARD_DECLARE_CLASS(QLineEdit)
+QT_BEGIN_NAMESPACE
+class QLineEdit;
+QT_END_NAMESPACE
 
 namespace Utils {
 class FilePath;
diff --git a/src/plugins/mcusupport/mcupackage.h b/src/plugins/mcusupport/mcupackage.h
index 1bd3b26fb4..df0f80ba65 100644
--- a/src/plugins/mcusupport/mcupackage.h
+++ b/src/plugins/mcusupport/mcupackage.h
@@ -12,8 +12,6 @@
 
 #include <QObject>
 
-QT_FORWARD_DECLARE_CLASS(QWidget)
-
 namespace ProjectExplorer {
 class ToolChain;
 }
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 1090f87100..5823bed452 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -13,8 +13,6 @@
 #include <QObject>
 #include <QVersionNumber>
 
-QT_FORWARD_DECLARE_CLASS(QWidget)
-
 namespace Utils {
 class FilePath;
 class PathChooser;
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
index 2cbab6c50d..723d06f708 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
@@ -5,8 +5,6 @@
 
 #include <QListView>
 
-QT_FORWARD_DECLARE_CLASS(QModelIndex)
-
 namespace QmakeProjectManager {
 namespace Internal {
 class ClassModel;
diff --git a/src/plugins/qtsupport/codegensettings.h b/src/plugins/qtsupport/codegensettings.h
index 6199754e36..a247ea4348 100644
--- a/src/plugins/qtsupport/codegensettings.h
+++ b/src/plugins/qtsupport/codegensettings.h
@@ -5,7 +5,9 @@
 
 #include "qtsupport_global.h"
 
-QT_FORWARD_DECLARE_CLASS(QSettings)
+QT_BEGIN_NAMESPACE
+class QSettings;
+QT_END_NAMESPACE
 
 namespace QtSupport {
 
diff --git a/src/plugins/todo/settings.h b/src/plugins/todo/settings.h
index 0caae568e8..57dc13990c 100644
--- a/src/plugins/todo/settings.h
+++ b/src/plugins/todo/settings.h
@@ -6,7 +6,9 @@
 
 #include "keyword.h"
 
-QT_FORWARD_DECLARE_CLASS(QSettings)
+QT_BEGIN_NAMESPACE
+class QSettings;
+QT_END_NAMESPACE
 
 namespace Todo {
 namespace Internal {