From af6205a9ee85c7f0d25fc6f454438a86f60e24c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <morten242@gmail.com>
Date: Tue, 14 May 2019 20:31:49 +0200
Subject: [PATCH] Various namespace fixes
---
examples/render/shared/renderexample.h | 2 ++
examples/runtimerender/testbed/renderwindow.h | 2 ++
.../assetimporters/uip/datamodelparser.cpp | 2 ++
.../uip/keyframegroupgenerator.h | 4 ++++
src/quick3d/qdemoncustommaterial.cpp | 2 ++
src/quick3d/qdemoncustommaterial.h | 2 --
src/quick3d/qdemonscenemanager_p.h | 4 ++--
.../backends/gl/qdemonrenderbackendgl3.cpp | 2 +-
src/render/qdemonrenderbasetypes.h | 21 +++++++++----------
9 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/examples/render/shared/renderexample.h b/examples/render/shared/renderexample.h
index 1a529ac1..ca9efb5e 100644
--- a/examples/render/shared/renderexample.h
+++ b/examples/render/shared/renderexample.h
@@ -38,7 +38,9 @@
#include <QtCore/QElapsedTimer>
#include <QtGui/QOpenGLContext>
+QT_BEGIN_NAMESPACE
class QDemonRenderContext;
+QT_END_NAMESPACE
class QDemonRenderExample : public QWindow
{
diff --git a/examples/runtimerender/testbed/renderwindow.h b/examples/runtimerender/testbed/renderwindow.h
index 9e69f9ef..d965df3a 100644
--- a/examples/runtimerender/testbed/renderwindow.h
+++ b/examples/runtimerender/testbed/renderwindow.h
@@ -7,11 +7,13 @@
#include <QtDemon/qtdemonglobal.h>
#include <QtDemonRuntimeRender/qdemonrendercontextcore.h>
+QT_BEGIN_NAMESPACE
class QDemonRenderContext;
class QDemonRenderLayer;
struct QDemonRenderPresentation;
struct QDemonRenderScene;
struct QDemonRenderModel;
+QT_END_NAMESPACE
class RenderWindow : public QWindow
{
diff --git a/src/plugins/assetimporters/uip/datamodelparser.cpp b/src/plugins/assetimporters/uip/datamodelparser.cpp
index f6b00102..7fccf1e9 100644
--- a/src/plugins/assetimporters/uip/datamodelparser.cpp
+++ b/src/plugins/assetimporters/uip/datamodelparser.cpp
@@ -1,5 +1,7 @@
#include "datamodelparser.h"
+QT_BEGIN_NAMESPACE
+
QDebug operator<<(QDebug dbg, const DataModelParser::Property &prop)
{
QDebugStateSaver saver(dbg);
diff --git a/src/plugins/assetimporters/uip/keyframegroupgenerator.h b/src/plugins/assetimporters/uip/keyframegroupgenerator.h
index eb913983..9651b345 100644
--- a/src/plugins/assetimporters/uip/keyframegroupgenerator.h
+++ b/src/plugins/assetimporters/uip/keyframegroupgenerator.h
@@ -6,6 +6,8 @@
#include "uippresentation.h"
#include "uipparser.h"
+QT_BEGIN_NAMESPACE
+
class KeyframeGroupGenerator
{
public:
@@ -73,4 +75,6 @@ private:
QHash<GraphObject *, KeyframeGroupMap> m_targetKeyframeMap;
};
+QT_END_NAMESPACE
+
#endif // KEYFRAMEGROUPGENERATOR_H
diff --git a/src/quick3d/qdemoncustommaterial.cpp b/src/quick3d/qdemoncustommaterial.cpp
index 7dd30119..bac41d7d 100644
--- a/src/quick3d/qdemoncustommaterial.cpp
+++ b/src/quick3d/qdemoncustommaterial.cpp
@@ -5,6 +5,8 @@
#include "qdemonobject_p.h"
#include "qdemonview3d.h"
+Q_DECLARE_OPAQUE_POINTER(QDemonCustomMaterialTexture)
+
QT_BEGIN_NAMESPACE
template <QVariant::Type>
diff --git a/src/quick3d/qdemoncustommaterial.h b/src/quick3d/qdemoncustommaterial.h
index b1f6c52a..6fd36391 100644
--- a/src/quick3d/qdemoncustommaterial.h
+++ b/src/quick3d/qdemoncustommaterial.h
@@ -90,8 +90,6 @@ Q_SIGNALS:
void textureDirty(QDemonCustomMaterialTexture * texture);
};
-Q_DECLARE_OPAQUE_POINTER(QDemonCustomMaterialTexture)
-
class Q_QUICK3D_EXPORT QDemonCustomMaterialBuffer : public QObject
{
Q_OBJECT
diff --git a/src/quick3d/qdemonscenemanager_p.h b/src/quick3d/qdemonscenemanager_p.h
index 5c6b7187..b9cbe919 100644
--- a/src/quick3d/qdemonscenemanager_p.h
+++ b/src/quick3d/qdemonscenemanager_p.h
@@ -43,8 +43,8 @@ Q_SIGNALS:
void needsUpdate();
};
-QML_DECLARE_TYPE(QDemonSceneManager)
-
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QDemonSceneManager)
+
#endif // QDEMONSCENEMANAGER_P_H
diff --git a/src/render/backends/gl/qdemonrenderbackendgl3.cpp b/src/render/backends/gl/qdemonrenderbackendgl3.cpp
index 5cb094cf..4974a915 100644
--- a/src/render/backends/gl/qdemonrenderbackendgl3.cpp
+++ b/src/render/backends/gl/qdemonrenderbackendgl3.cpp
@@ -779,4 +779,4 @@ void QDemonRenderBackendGL3Impl::waitSync(QDemonRenderBackendSyncObject so, QDem
GL_CALL_EXTRA_FUNCTION(glWaitSync(syncID, 0, GL_TIMEOUT_IGNORED));
}
-QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
diff --git a/src/render/qdemonrenderbasetypes.h b/src/render/qdemonrenderbasetypes.h
index 3a187783..5f710399 100644
--- a/src/render/qdemonrenderbasetypes.h
+++ b/src/render/qdemonrenderbasetypes.h
@@ -1690,17 +1690,6 @@ typedef QDemonRenderGenericVec2<qint32> qint32_2;
typedef QDemonRenderGenericVec3<qint32> qint32_3;
typedef QDemonRenderGenericVec4<qint32> qint32_4;
-Q_DECLARE_METATYPE(bool_2)
-Q_DECLARE_METATYPE(bool_3)
-Q_DECLARE_METATYPE(bool_4)
-Q_DECLARE_METATYPE(quint32_2)
-Q_DECLARE_METATYPE(quint32_3)
-Q_DECLARE_METATYPE(quint32_4)
-Q_DECLARE_METATYPE(qint32_2)
-Q_DECLARE_METATYPE(qint32_3)
-Q_DECLARE_METATYPE(qint32_4)
-
-
enum class QDemonRenderShaderDataType : quint32
{
Unknown = 0,
@@ -2008,4 +1997,14 @@ struct QDemonRenderGenericScopedProperty
QT_END_NAMESPACE
+Q_DECLARE_METATYPE(bool_2)
+Q_DECLARE_METATYPE(bool_3)
+Q_DECLARE_METATYPE(bool_4)
+Q_DECLARE_METATYPE(quint32_2)
+Q_DECLARE_METATYPE(quint32_3)
+Q_DECLARE_METATYPE(quint32_4)
+Q_DECLARE_METATYPE(qint32_2)
+Q_DECLARE_METATYPE(qint32_3)
+Q_DECLARE_METATYPE(qint32_4)
+
#endif
--
GitLab