aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-09-28 16:17:44 +0200
committerEike Ziller <eike.ziller@qt.io>2020-09-29 08:58:12 +0000
commit4dc9d92b1e501a6779878b477140590d73fb95cc (patch)
tree9df6d4317993a43e7d0b8c04c666b54160b2e368
parent07851d0e44e73c83b15b304e49ee194ff44cccff (diff)
Remove unneeded QStringList forward declarations
Fixes build issue with Qt6, for which QStringList is now a QList<QString>. Task-number: QTCREATORBUG-24098 Change-Id: I0c81aa5bae413b836dbedea0bb6117b46f6f24c2 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter_p.h4
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/definition.h1
-rw-r--r--src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h4
-rw-r--r--src/libs/extensionsystem/pluginspec.h1
-rw-r--r--src/libs/qmljs/persistenttrie.h1
-rw-r--r--src/libs/utils/codegeneration.h3
-rw-r--r--src/libs/utils/mimetypes/mimetype.h1
-rw-r--r--src/libs/utils/shellcommand.h1
-rw-r--r--src/libs/utils/textfileformat.h4
-rw-r--r--src/plugins/clangpchmanager/projectupdater.h2
-rw-r--r--src/plugins/coreplugin/diffservice.h2
-rw-r--r--src/plugins/coreplugin/documentmanager.h4
-rw-r--r--src/plugins/coreplugin/helpmanager.h1
-rw-r--r--src/plugins/cpptools/includeutils.h1
-rw-r--r--src/plugins/cpptools/typehierarchybuilder.h2
-rw-r--r--src/plugins/debugger/shared/peutils.h7
-rw-r--r--src/plugins/designer/codemodelhelpers.h7
-rw-r--r--src/plugins/designer/cpp/newclasswidget.h4
-rw-r--r--src/plugins/qtsupport/gettingstartedwelcomepage.h1
-rw-r--r--src/plugins/valgrind/callgrind/callgrindparsedata.h1
-rw-r--r--src/plugins/vcsbase/vcsbaseeditorconfig.h1
21 files changed, 6 insertions, 47 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter_p.h b/src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter_p.h
index c36932c29d..f1492df786 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter_p.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/abstracthighlighter_p.h
@@ -27,10 +27,6 @@
#include "definition.h"
#include "theme.h"
-QT_BEGIN_NAMESPACE
-class QStringList;
-QT_END_NAMESPACE
-
namespace KSyntaxHighlighting
{
class ContextSwitch;
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.h b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.h
index e17dfb97a4..3219bf03b9 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.h
@@ -33,7 +33,6 @@
QT_BEGIN_NAMESPACE
class QChar;
class QString;
-class QStringList;
QT_END_NAMESPACE
namespace KSyntaxHighlighting
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h b/src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h
index fbc1686143..1156ce981a 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/state_p.h
@@ -30,10 +30,6 @@
#include "definitionref_p.h"
-QT_BEGIN_NAMESPACE
-class QStringList;
-QT_END_NAMESPACE
-
namespace KSyntaxHighlighting
{
class Context;
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index 4ad702b216..d8d85ba520 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -32,7 +32,6 @@
#include <QVector>
QT_BEGIN_NAMESPACE
-class QStringList;
class QRegularExpression;
QT_END_NAMESPACE
diff --git a/src/libs/qmljs/persistenttrie.h b/src/libs/qmljs/persistenttrie.h
index 184525b13e..19d7c3a0e7 100644
--- a/src/libs/qmljs/persistenttrie.h
+++ b/src/libs/qmljs/persistenttrie.h
@@ -34,7 +34,6 @@
#include <utility>
QT_FORWARD_DECLARE_CLASS(QString)
-QT_FORWARD_DECLARE_CLASS(QStringList)
QT_FORWARD_DECLARE_CLASS(QDebug)
namespace QmlJS {
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index 2738d7b27a..06d0ca258d 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -27,9 +27,10 @@
#include "utils_global.h"
+#include <QStringList>
+
QT_BEGIN_NAMESPACE
class QTextStream;
-class QStringList;
QT_END_NAMESPACE
namespace Utils {
diff --git a/src/libs/utils/mimetypes/mimetype.h b/src/libs/utils/mimetypes/mimetype.h
index b4ac5b4c39..4d64de3275 100644
--- a/src/libs/utils/mimetypes/mimetype.h
+++ b/src/libs/utils/mimetypes/mimetype.h
@@ -46,7 +46,6 @@
QT_BEGIN_NAMESPACE
class QFileinfo;
-class QStringList;
QT_END_NAMESPACE
namespace Utils {
diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h
index a54e8fb401..df89abad6e 100644
--- a/src/libs/utils/shellcommand.h
+++ b/src/libs/utils/shellcommand.h
@@ -35,7 +35,6 @@
QT_BEGIN_NAMESPACE
class QMutex;
-class QStringList;
class QVariant;
class QProcessEnvironment;
template <typename T>
diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h
index 9ac452a6e5..f95d1e7913 100644
--- a/src/libs/utils/textfileformat.h
+++ b/src/libs/utils/textfileformat.h
@@ -27,10 +27,10 @@
#include "utils_global.h"
+#include <QStringList>
+
QT_BEGIN_NAMESPACE
class QTextCodec;
-class QStringList;
-class QString;
class QByteArray;
QT_END_NAMESPACE
diff --git a/src/plugins/clangpchmanager/projectupdater.h b/src/plugins/clangpchmanager/projectupdater.h
index 16d662004f..0b3865d7b4 100644
--- a/src/plugins/clangpchmanager/projectupdater.h
+++ b/src/plugins/clangpchmanager/projectupdater.h
@@ -55,8 +55,6 @@ namespace ClangBackEnd {
class ProjectManagementServerInterface;
}
-QT_FORWARD_DECLARE_CLASS(QStringList)
-
#include <vector>
namespace ClangPchManager {
diff --git a/src/plugins/coreplugin/diffservice.h b/src/plugins/coreplugin/diffservice.h
index 1c241364dc..d397c1e00a 100644
--- a/src/plugins/coreplugin/diffservice.h
+++ b/src/plugins/coreplugin/diffservice.h
@@ -29,8 +29,6 @@
#include <QObject>
-QT_FORWARD_DECLARE_CLASS(QStringList)
-
namespace Core {
class CORE_EXPORT DiffService
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index e9b9d66adb..f05c7d0f10 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -32,10 +32,6 @@
#include <QObject>
#include <QPair>
-QT_BEGIN_NAMESPACE
-class QStringList;
-QT_END_NAMESPACE
-
namespace Utils { class FilePath; }
namespace Core {
diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h
index ac948b633d..6a02e405a9 100644
--- a/src/plugins/coreplugin/helpmanager.h
+++ b/src/plugins/coreplugin/helpmanager.h
@@ -31,7 +31,6 @@
#include <QMap>
QT_BEGIN_NAMESPACE
-class QStringList;
class QUrl;
QT_END_NAMESPACE
diff --git a/src/plugins/cpptools/includeutils.h b/src/plugins/cpptools/includeutils.h
index 310bb251c8..59ff8b81a7 100644
--- a/src/plugins/cpptools/includeutils.h
+++ b/src/plugins/cpptools/includeutils.h
@@ -33,7 +33,6 @@
#include <QList>
#include <QString>
-QT_FORWARD_DECLARE_CLASS(QStringList)
QT_FORWARD_DECLARE_CLASS(QTextDocument)
namespace CppTools {
diff --git a/src/plugins/cpptools/typehierarchybuilder.h b/src/plugins/cpptools/typehierarchybuilder.h
index fc1a628515..4f623d2fdb 100644
--- a/src/plugins/cpptools/typehierarchybuilder.h
+++ b/src/plugins/cpptools/typehierarchybuilder.h
@@ -33,8 +33,6 @@
#include <QList>
#include <QSet>
-QT_FORWARD_DECLARE_CLASS(QStringList)
-
namespace CppTools {
class CPPTOOLS_EXPORT TypeHierarchy
diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h
index 0d25d8ace1..a50136fe4a 100644
--- a/src/plugins/debugger/shared/peutils.h
+++ b/src/plugins/debugger/shared/peutils.h
@@ -25,12 +25,7 @@
#pragma once
-#include <qnamespace.h>
-
-QT_BEGIN_NAMESPACE
-class QStringList;
-class QString;
-QT_END_NAMESPACE
+#include <QStringList>
/* Helper functions to extract information from PE Win32 executable
* files (cf dumpbin utility). */
diff --git a/src/plugins/designer/codemodelhelpers.h b/src/plugins/designer/codemodelhelpers.h
index 9e3e845d74..a0596e0cb9 100644
--- a/src/plugins/designer/codemodelhelpers.h
+++ b/src/plugins/designer/codemodelhelpers.h
@@ -25,12 +25,7 @@
#pragma once
-#include <QtGlobal>
-
-QT_BEGIN_NAMESPACE
-class QString;
-class QStringList;
-QT_END_NAMESPACE
+#include <QStringList>
namespace Designer {
namespace Internal {
diff --git a/src/plugins/designer/cpp/newclasswidget.h b/src/plugins/designer/cpp/newclasswidget.h
index 91868c13cf..112c2cefb2 100644
--- a/src/plugins/designer/cpp/newclasswidget.h
+++ b/src/plugins/designer/cpp/newclasswidget.h
@@ -27,10 +27,6 @@
#include <QWidget>
-QT_BEGIN_NAMESPACE
-class QStringList;
-QT_END_NAMESPACE
-
namespace Designer {
namespace Internal {
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h
index 213292dc75..db2bab2407 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.h
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h
@@ -29,7 +29,6 @@
QT_BEGIN_NAMESPACE
class QFileInfo;
-class QStringList;
QT_END_NAMESPACE
namespace QtSupport {
diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.h b/src/plugins/valgrind/callgrind/callgrindparsedata.h
index 00fb9b7911..02fbc29e49 100644
--- a/src/plugins/valgrind/callgrind/callgrindparsedata.h
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.h
@@ -29,7 +29,6 @@
QT_BEGIN_NAMESPACE
class QString;
-class QStringList;
QT_END_NAMESPACE
namespace Valgrind {
diff --git a/src/plugins/vcsbase/vcsbaseeditorconfig.h b/src/plugins/vcsbase/vcsbaseeditorconfig.h
index 9a8f4d493f..8f1ebaee19 100644
--- a/src/plugins/vcsbase/vcsbaseeditorconfig.h
+++ b/src/plugins/vcsbase/vcsbaseeditorconfig.h
@@ -33,7 +33,6 @@
QT_BEGIN_NAMESPACE
class QComboBox;
class QToolButton;
-class QStringList;
QT_END_NAMESPACE
namespace VcsBase {