From 96690963d3aea75a8a72447b142f644120b7a558 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 17 Feb 2010 11:56:12 +0100
Subject: [PATCH] Fix compilation with namespaced Qt.
---
src/plugins/debugger/debuggermainwindow.h | 3 +--
src/plugins/debugger/debuggeruiswitcher.h | 8 ++++----
.../components/itemlibrary/itemlibrarymodel.h | 2 +-
.../components/itemlibrary/itemlibrarytreeview.h | 2 +-
src/plugins/qmlinspector/inspectoroutputpane.h | 4 ++--
src/plugins/qmlinspector/qmlinspector.h | 3 +--
src/plugins/qmlinspector/qmlinspectorplugin.h | 12 ++++--------
7 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index 8ebc099cccd..536cba8f955 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -4,8 +4,7 @@
#include "debuggeruiswitcher.h"
#include <utils/fancymainwindow.h>
-
-class QMenu;
+QT_FORWARD_DECLARE_CLASS(QMenu);
namespace Debugger {
diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h
index 85e09af9d66..7ace45b40ef 100644
--- a/src/plugins/debugger/debuggeruiswitcher.h
+++ b/src/plugins/debugger/debuggeruiswitcher.h
@@ -13,10 +13,10 @@ namespace Core {
class Command;
}
-class QAction;
-class QDockWidget;
-class QStackedWidget;
-class QComboBox;
+QT_FORWARD_DECLARE_CLASS(Action);
+QT_FORWARD_DECLARE_CLASS(QDockWidget);
+QT_FORWARD_DECLARE_CLASS(QStackedWidget);
+QT_FORWARD_DECLARE_CLASS(QComboBox);
namespace Debugger {
class DebuggerMainWindow;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 22a1beef7aa..07c51ccdd56 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -7,7 +7,7 @@
#include <QScriptEngine>
#include <private/qmllistmodel_p.h>
-class QMimeData;
+QT_FORWARD_DECLARE_CLASS(QMimeData);
namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h
index 61edc0367ce..a041f063878 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h
@@ -36,7 +36,7 @@
#include <QDebug>
#include <QTimeLine>
-class QLabel;
+QT_FORWARD_DECLARE_CLASS(QLabel);
namespace QmlDesigner {
diff --git a/src/plugins/qmlinspector/inspectoroutputpane.h b/src/plugins/qmlinspector/inspectoroutputpane.h
index e1add1ff032..0bc53d32312 100644
--- a/src/plugins/qmlinspector/inspectoroutputpane.h
+++ b/src/plugins/qmlinspector/inspectoroutputpane.h
@@ -33,8 +33,8 @@
#include <QtCore/QObject>
-class QTextEdit;
-class RunControl;
+QT_FORWARD_DECLARE_CLASS(QTextEdit);
+QT_FORWARD_DECLARE_CLASS(RunControl);
namespace Qml {
diff --git a/src/plugins/qmlinspector/qmlinspector.h b/src/plugins/qmlinspector/qmlinspector.h
index d9a8eddde92..8db7b233a61 100644
--- a/src/plugins/qmlinspector/qmlinspector.h
+++ b/src/plugins/qmlinspector/qmlinspector.h
@@ -55,6 +55,7 @@ class ObjectPropertiesView;
class CanvasFrameRate;
class ExpressionQueryWidget;
+QT_END_NAMESPACE
namespace Qml {
class EngineSpinBox;
@@ -112,6 +113,4 @@ private:
}
-QT_END_NAMESPACE
-
#endif
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.h b/src/plugins/qmlinspector/qmlinspectorplugin.h
index 77f17d05ab8..5625e2d1a81 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.h
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.h
@@ -35,18 +35,16 @@
#include <QtCore/QPointer>
#include <QtCore/QTimer>
-QT_BEGIN_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QStringList);
-class QStringList;
+namespace Core {
+ class IMode;
+}
namespace ProjectExplorer {
class Project;
}
-namespace Core {
- class IMode;
-}
-
namespace Qml {
class QmlInspector;
class InspectorOutputPane;
@@ -83,6 +81,4 @@ private:
}
-QT_END_NAMESPACE
-
#endif // QMLINSPECTORPLUGIN_H
--
GitLab