summaryrefslogtreecommitdiffstats
path: root/src/core/aspects
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/aspects')
-rw-r--r--src/core/aspects/qabstractaspect.cpp8
-rw-r--r--src/core/aspects/qabstractaspect.h10
-rw-r--r--src/core/aspects/qabstractaspect_p.h8
-rw-r--r--src/core/aspects/qaspectengine.cpp24
-rw-r--r--src/core/aspects/qaspectengine.h10
-rw-r--r--src/core/aspects/qaspectengine_p.h8
-rw-r--r--src/core/aspects/qaspectfactory.cpp6
-rw-r--r--src/core/aspects/qaspectfactory.h14
-rw-r--r--src/core/aspects/qaspectfactory_p.h8
-rw-r--r--src/core/aspects/qaspectmanager.cpp6
-rw-r--r--src/core/aspects/qaspectmanager_p.h14
-rw-r--r--src/core/aspects/qaspectthread.cpp4
-rw-r--r--src/core/aspects/qaspectthread.h10
13 files changed, 65 insertions, 65 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 02d8cb16f..806886ad5 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -50,10 +50,10 @@ static QByteArray className(const QMetaObject &obj)
return QByteArray::fromRawData(obj.className(), int(strlen(obj.className())));
}
-namespace Qt3D {
+namespace Qt3DCore {
/*!
- \class Qt3D::QAbstractAspectPrivate
+ \class Qt3DCore::QAbstractAspectPrivate
\internal
*/
QAbstractAspectPrivate::QAbstractAspectPrivate()
@@ -71,7 +71,7 @@ QAbstractAspectPrivate *QAbstractAspectPrivate::get(QAbstractAspect *aspect)
}
/*!
- \class Qt3D::QAbstractAspect
+ \class Qt3DCore::QAbstractAspect
\inmodule Qt3DCore
\brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior.
*/
@@ -203,6 +203,6 @@ void QAbstractAspect::onShutdown()
{
}
-} // of namespace Qt3D
+} // of namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 12d5044a1..cd162dfd2 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QABSTRACTASPECT_H
-#define QT3D_QABSTRACTASPECT_H
+#ifndef QT3DCORE_QABSTRACTASPECT_H
+#define QT3DCORE_QABSTRACTASPECT_H
#include <QObject>
#include <QSharedPointer>
@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QAspectManager;
class QNode;
@@ -118,8 +118,8 @@ void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor)
registerBackendType(Frontend::staticMetaObject, functor);
}
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
-#endif // QT3D_ABSTRACTASPECT_H
+#endif // QT3DCORE_ABSTRACTASPECT_H
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index 77f9d2f02..5676cc8ce 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QABSTRACTASPECT_P_H
-#define QT3D_QABSTRACTASPECT_P_H
+#ifndef QT3DCORE_QABSTRACTASPECT_P_H
+#define QT3DCORE_QABSTRACTASPECT_P_H
//
// W A R N I N G
@@ -55,7 +55,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QAbstractAspect;
class QEntity;
@@ -84,4 +84,4 @@ public:
QT_END_NAMESPACE
-#endif // QT3D_QABSTRACTASPECT_P_H
+#endif // QT3DCORE_QABSTRACTASPECT_P_H
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 9871f558d..6a0836294 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -55,10 +55,10 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
/*!
- \class Qt3D::QAspectEnginePrivate
+ \class Qt3DCore::QAspectEnginePrivate
\internal
*/
QAspectEnginePrivate::QAspectEnginePrivate()
@@ -66,11 +66,11 @@ QAspectEnginePrivate::QAspectEnginePrivate()
, m_postman(Q_NULLPTR)
, m_scene(Q_NULLPTR)
{
- qRegisterMetaType<Qt3D::QAbstractAspect *>();
- qRegisterMetaType<Qt3D::QObserverInterface *>();
- qRegisterMetaType<Qt3D::QEntity *>();
- qRegisterMetaType<Qt3D::QScene *>();
- qRegisterMetaType<Qt3D::QAbstractPostman *>();
+ qRegisterMetaType<Qt3DCore::QAbstractAspect *>();
+ qRegisterMetaType<Qt3DCore::QObserverInterface *>();
+ qRegisterMetaType<Qt3DCore::QEntity *>();
+ qRegisterMetaType<Qt3DCore::QScene *>();
+ qRegisterMetaType<Qt3DCore::QAbstractPostman *>();
}
/*!
@@ -146,10 +146,10 @@ void QAspectEngine::initialize()
QChangeArbiter::createUnmanagedThreadLocalChangeQueue(arbiter);
QMetaObject::invokeMethod(arbiter,
"setPostman",
- Q_ARG(Qt3D::QAbstractPostman*, d->m_postman));
+ Q_ARG(Qt3DCore::QAbstractPostman*, d->m_postman));
QMetaObject::invokeMethod(arbiter,
"setScene",
- Q_ARG(Qt3D::QScene*, d->m_scene));
+ Q_ARG(Qt3DCore::QScene*, d->m_scene));
}
void QAspectEngine::shutdown()
@@ -202,7 +202,7 @@ void QAspectEngine::registerAspect(QAbstractAspect *aspect)
QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(),
"registerAspect",
Qt::BlockingQueuedConnection,
- Q_ARG(Qt3D::QAbstractAspect *, aspect));
+ Q_ARG(Qt3DCore::QAbstractAspect *, aspect));
}
/*!
@@ -256,7 +256,7 @@ void QAspectEngine::setRootEntity(QEntity *root)
QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(),
"setRootEntity",
Qt::BlockingQueuedConnection,
- Q_ARG(Qt3D::QEntity *, root));
+ Q_ARG(Qt3DCore::QEntity *, root));
qCDebug(Aspects) << "Done setting scene root on aspect manager";
}
@@ -278,6 +278,6 @@ void QAspectEngine::setAspectFactory(const QAspectFactory &factory)
d->m_factory = factory;
}
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h
index cdbb01a30..e9e768add 100644
--- a/src/core/aspects/qaspectengine.h
+++ b/src/core/aspects/qaspectengine.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTENGINE_H
-#define QT3D_QASPECTENGINE_H
+#ifndef QT3DCORE_QASPECTENGINE_H
+#define QT3DCORE_QASPECTENGINE_H
#include <QObject>
#include <Qt3DCore/QAspectFactory>
@@ -43,7 +43,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QAbstractAspect;
class QAspectThread;
@@ -81,9 +81,9 @@ private:
void initNodeTree(QNode *node);
};
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
-#endif // QT3D_QASPECTENGINE_H
+#endif // QT3DCORE_QASPECTENGINE_H
diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h
index a8409f2c0..0439058d1 100644
--- a/src/core/aspects/qaspectengine_p.h
+++ b/src/core/aspects/qaspectengine_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTENGINE_P_H
-#define QT3D_QASPECTENGINE_P_H
+#ifndef QT3DCORE_QASPECTENGINE_P_H
+#define QT3DCORE_QASPECTENGINE_P_H
//
// W A R N I N G
@@ -54,7 +54,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QEntity;
class QNode;
@@ -85,4 +85,4 @@ public:
QT_END_NAMESPACE
-#endif // QT3D_QASPECTENGINE_P_H
+#endif // QT3DCORE_QASPECTENGINE_P_H
diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp
index 04e902acf..673ff5bdd 100644
--- a/src/core/aspects/qaspectfactory.cpp
+++ b/src/core/aspects/qaspectfactory.cpp
@@ -43,7 +43,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
typedef QHash<QString, QAspectFactory::CreateFunction> defaultFactories_t;
Q_GLOBAL_STATIC(defaultFactories_t, defaultFactories)
@@ -55,7 +55,7 @@ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QS
}
/*!
- \class Qt3D::QAspectFactoryPrivate
+ \class Qt3DCore::QAspectFactoryPrivate
\internal
*/
QAspectFactoryPrivate::QAspectFactoryPrivate()
@@ -103,6 +103,6 @@ QAbstractAspect *QAspectFactory::createAspect(const QString &aspect, QObject *pa
}
}
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectfactory.h b/src/core/aspects/qaspectfactory.h
index 938e8a967..9280c5340 100644
--- a/src/core/aspects/qaspectfactory.h
+++ b/src/core/aspects/qaspectfactory.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTFACTORY_H
-#define QT3D_QASPECTFACTORY_H
+#ifndef QT3DCORE_QASPECTFACTORY_H
+#define QT3DCORE_QASPECTFACTORY_H
#include <QSharedDataPointer>
#include <QStringList>
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
class QObject;
-namespace Qt3D {
+namespace Qt3DCore {
class QAbstractAspect;
class QAspectFactoryPrivate;
@@ -85,20 +85,20 @@ private:
QSharedDataPointer<QAspectFactoryPrivate> d;
};
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
#define QT3D_REGISTER_NAMESPACED_ASPECT(name, AspectNamespace, AspectType) \
QT_BEGIN_NAMESPACE \
- namespace Qt3D { \
+ namespace Qt3DCore { \
QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QString &, QAspectFactory::CreateFunction); \
} \
QT_END_NAMESPACE \
namespace { \
void qt3d_ ## AspectType ## _registerFunction() \
{ \
- using namespace QT_PREPEND_NAMESPACE(Qt3D); \
+ using namespace QT_PREPEND_NAMESPACE(Qt3DCore); \
qt3d_QAspectFactoryPrivate_addDefaultFactory(QStringLiteral(name), &QAspectFactory::functionHelper<AspectNamespace::AspectType>); \
} \
\
@@ -108,4 +108,4 @@ QT_END_NAMESPACE
#define QT3D_REGISTER_ASPECT(name, AspectType) \
QT3D_REGISTER_NAMESPACED_ASPECT(name, , AspectType)
-#endif // QT3D_QASPECTFACTORY_H
+#endif // QT3DCORE_QASPECTFACTORY_H
diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h
index 7e105fe09..dfe7ccd9e 100644
--- a/src/core/aspects/qaspectfactory_p.h
+++ b/src/core/aspects/qaspectfactory_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTFACTORY_P_H
-#define QT3D_QASPECTFACTORY_P_H
+#ifndef QT3DCORE_QASPECTFACTORY_P_H
+#define QT3DCORE_QASPECTFACTORY_P_H
//
// W A R N I N G
@@ -56,7 +56,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QAspectFactory;
@@ -72,4 +72,4 @@ public:
QT_END_NAMESPACE
-#endif // QT3D_QASPECTFACTORY_P_H
+#endif // QT3DCORE_QASPECTFACTORY_P_H
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index e6752f19c..0c5940ce5 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
QAspectManager::QAspectManager(QObject *parent)
: QObject(parent)
@@ -106,7 +106,7 @@ void QAspectManager::shutdown()
// Aspects must be deleted in the Thread they were created in
}
-void QAspectManager::setRootEntity(Qt3D::QEntity *root)
+void QAspectManager::setRootEntity(Qt3DCore::QEntity *root)
{
qCDebug(Aspects) << Q_FUNC_INFO;
@@ -261,7 +261,7 @@ QServiceLocator *QAspectManager::serviceLocator() const
return m_serviceLocator.data();
}
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index bdf8b9233..8c1e372af 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTMANAGER_P_H
-#define QT3D_QASPECTMANAGER_P_H
+#ifndef QT3DCORE_QASPECTMANAGER_P_H
+#define QT3DCORE_QASPECTMANAGER_P_H
//
// W A R N I N G
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
class QSurface;
-namespace Qt3D {
+namespace Qt3DCore {
class QNode;
class QEntity;
@@ -83,9 +83,9 @@ public Q_SLOTS:
void initialize();
void shutdown();
- void setRootEntity(Qt3D::QEntity *root);
+ void setRootEntity(Qt3DCore::QEntity *root);
void setData(const QVariantMap &data);
- void registerAspect(Qt3D::QAbstractAspect *aspect);
+ void registerAspect(Qt3DCore::QAbstractAspect *aspect);
QVariantMap data() const;
void exec();
@@ -109,8 +109,8 @@ private:
QSemaphore m_waitForEndOfExecLoop;
};
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
-#endif // QT3D_QASPECTMANAGER_P_H
+#endif // QT3DCORE_QASPECTMANAGER_P_H
diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp
index 0b1a969d3..67ce4cf20 100644
--- a/src/core/aspects/qaspectthread.cpp
+++ b/src/core/aspects/qaspectthread.cpp
@@ -43,7 +43,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
QAspectThread::QAspectThread(QObject *parent)
: QThread(parent),
@@ -87,6 +87,6 @@ void QAspectThread::run()
qCDebug(Aspects) << "Exiting void QAspectThread::run()";
}
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread.h
index 8d32e28bd..7bb48771e 100644
--- a/src/core/aspects/qaspectthread.h
+++ b/src/core/aspects/qaspectthread.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QT3D_QASPECTTHREAD_H
-#define QT3D_QASPECTTHREAD_H
+#ifndef QT3DCORE_QASPECTTHREAD_H
+#define QT3DCORE_QASPECTTHREAD_H
#include <QThread>
#include <Qt3DCore/qt3dcore_global.h>
@@ -44,7 +44,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QAspectManager;
@@ -66,8 +66,8 @@ private:
QSemaphore m_semaphore;
};
-} // namespace Qt3D
+} // namespace Qt3DCore
QT_END_NAMESPACE
-#endif // QT3D_QASPECTTHREAD_H
+#endif // QT3DCORE_QASPECTTHREAD_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 06:16:59 +0000