diff options
Diffstat (limited to 'src/core/services')
21 files changed, 94 insertions, 94 deletions
diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h index 707aec54d..31f8da3b5 100644 --- a/src/core/services/nullservices_p.h +++ b/src/core/services/nullservices_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_NULLSERVICES_P_H -#define QT3D_NULLSERVICES_P_H +#ifndef QT3DCORE_NULLSERVICES_P_H +#define QT3DCORE_NULLSERVICES_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class NullSystemInformationService : public QSystemInformationService { @@ -113,9 +113,9 @@ public: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_NULLSERVICES_P_H +#endif // QT3DCORE_NULLSERVICES_P_H diff --git a/src/core/services/qabstractcollisionqueryservice.cpp b/src/core/services/qabstractcollisionqueryservice.cpp index f2731cac5..a841abc18 100644 --- a/src/core/services/qabstractcollisionqueryservice.cpp +++ b/src/core/services/qabstractcollisionqueryservice.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAbstractCollisionQueryService::QAbstractCollisionQueryService(const QString &description) : QAbstractServiceProvider(*new QAbstractCollisionQueryServicePrivate(description)) diff --git a/src/core/services/qabstractcollisionqueryservice.h b/src/core/services/qabstractcollisionqueryservice.h index 69afd6d85..04d92c687 100644 --- a/src/core/services/qabstractcollisionqueryservice.h +++ b/src/core/services/qabstractcollisionqueryservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H -#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H +#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H +#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H #include <QVector> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QRay3D; class QAbstractCollisionQueryServicePrivate; @@ -79,6 +79,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QAbstractCollisionQueryService::QueryMode) +Q_DECLARE_METATYPE(Qt3DCore::QAbstractCollisionQueryService::QueryMode) -#endif // QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H +#endif // QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H diff --git a/src/core/services/qabstractcollisionqueryservice_p.h b/src/core/services/qabstractcollisionqueryservice_p.h index 08a76cb36..2f2abdc5a 100644 --- a/src/core/services/qabstractcollisionqueryservice_p.h +++ b/src/core/services/qabstractcollisionqueryservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H -#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H +#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H +#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractCollisionQueryServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,4 +68,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QAbstractCOLLISIONQUERYSERVICE_P_H +#endif // QT3DCORE_QAbstractCOLLISIONQUERYSERVICE_P_H diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp index 04197527f..c163cdf7f 100644 --- a/src/core/services/qabstractframeadvanceservice.cpp +++ b/src/core/services/qabstractframeadvanceservice.cpp @@ -39,15 +39,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractFrameAdvanceServicePrivate + \class Qt3DCore::QAbstractFrameAdvanceServicePrivate \internal */ /*! - \class Qt3D::QAbstractFrameAdvanceService + \class Qt3DCore::QAbstractFrameAdvanceService \inmodule Qt3DCore \brief Interface for a Qt3D frame advance service @@ -72,19 +72,19 @@ QAbstractFrameAdvanceService::QAbstractFrameAdvanceService(QAbstractFrameAdvance } /*! - \fn qint64 Qt3D::QAbstractFrameAdvanceService::waitForNextTick() + \fn qint64 Qt3DCore::QAbstractFrameAdvanceService::waitForNextTick() Returns the current time, the call may be blocking if waiting for a tick. */ /*! - \fn void Qt3D::QAbstractFrameAdvanceService::start() + \fn void Qt3DCore::QAbstractFrameAdvanceService::start() Starts the service. */ /*! - \fn void Qt3D::QAbstractFrameAdvanceService::stop() + \fn void Qt3DCore::QAbstractFrameAdvanceService::stop() Stops the service, performing any cleanup deemed necessary. */ diff --git a/src/core/services/qabstractframeadvanceservice.h b/src/core/services/qabstractframeadvanceservice.h index c69676096..f72672fd3 100644 --- a/src/core/services/qabstractframeadvanceservice.h +++ b/src/core/services/qabstractframeadvanceservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE -#define QT3D_QABSTRACTFRAMEADVANCESERVICE +#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE +#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractFrameAdvanceServicePrivate; @@ -63,5 +63,5 @@ protected: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE +#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h index ce0bbad70..8e60658ef 100644 --- a/src/core/services/qabstractframeadvanceservice_p.h +++ b/src/core/services/qabstractframeadvanceservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H -#define QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H +#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H +#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractFrameAdvanceServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H +#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H diff --git a/src/core/services/qabstractserviceprovider_p.h b/src/core/services/qabstractserviceprovider_p.h index 4046b5815..a75a42598 100644 --- a/src/core/services/qabstractserviceprovider_p.h +++ b/src/core/services/qabstractserviceprovider_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTSERVICEPROVIDER_P_H -#define QT3D_QABSTRACTSERVICEPROVIDER_P_H +#ifndef QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H +#define QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractServiceProviderPrivate { @@ -70,8 +70,8 @@ public: QString m_description; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QABSTRACTSERVICEPROVIDER_P_H +#endif // QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H diff --git a/src/core/services/qcollisionqueryresult.cpp b/src/core/services/qcollisionqueryresult.cpp index eac2e92ce..baa3ee4a0 100644 --- a/src/core/services/qcollisionqueryresult.cpp +++ b/src/core/services/qcollisionqueryresult.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QCollisionQueryResultPrivate::QCollisionQueryResultPrivate(QCollisionQueryResult *qq) : q_ptr(qq) diff --git a/src/core/services/qcollisionqueryresult.h b/src/core/services/qcollisionqueryresult.h index e74a74411..265869cab 100644 --- a/src/core/services/qcollisionqueryresult.h +++ b/src/core/services/qcollisionqueryresult.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOLLISIONQUERYRESULT_H -#define QT3D_QCOLLISIONQUERYRESULT_H +#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_H +#define QT3DCORE_QCOLLISIONQUERYRESULT_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qnodeid.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { typedef int QQueryHandle; @@ -67,5 +67,5 @@ private: QT_END_NAMESPACE -#endif // QT3D_QCOLLISIONQUERYRESULT_H +#endif // QT3DCORE_QCOLLISIONQUERYRESULT_H diff --git a/src/core/services/qcollisionqueryresult_p.h b/src/core/services/qcollisionqueryresult_p.h index a6a2f5e25..85daad64b 100644 --- a/src/core/services/qcollisionqueryresult_p.h +++ b/src/core/services/qcollisionqueryresult_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCOLLISIONQUERYRESULT_P_H -#define QT3D_QCOLLISIONQUERYRESULT_P_H +#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_P_H +#define QT3DCORE_QCOLLISIONQUERYRESULT_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCollisionQueryResultPrivate { @@ -74,4 +74,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QCOLLISIONQUERYRESULT_P_H +#endif // QT3DCORE_QCOLLISIONQUERYRESULT_P_H diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp index e651d9fbe..c54f3cf30 100644 --- a/src/core/services/qopenglinformationservice.cpp +++ b/src/core/services/qopenglinformationservice.cpp @@ -39,15 +39,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QOpenGLInformationServicePrivate + \class Qt3DCore::QOpenGLInformationServicePrivate \internal */ /*! - \class Qt3D::QOpenGLInformationService + \class Qt3DCore::QOpenGLInformationService \inmodule Qt3DCore \brief Interface for a Qt3D OpenGL information service @@ -76,12 +76,12 @@ QOpenGLInformationService::QOpenGLInformationService(QOpenGLInformationServicePr } /*! - \fn QSurfaceFormat Qt3D::QOpenGLInformationService::format() const + \fn QSurfaceFormat Qt3DCore::QOpenGLInformationService::format() const Subclasses should override this function to return the QSurfaceFormat of the OpenGL context in use. */ -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/services/qopenglinformationservice.h b/src/core/services/qopenglinformationservice.h index ed378ba8a..2bd2ffbab 100644 --- a/src/core/services/qopenglinformationservice.h +++ b/src/core/services/qopenglinformationservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOPENGLINFORMATIONSERVICE_H -#define QT3D_QOPENGLINFORMATIONSERVICE_H +#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_H +#define QT3DCORE_QOPENGLINFORMATIONSERVICE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QOpenGLInformationServicePrivate; @@ -58,8 +58,8 @@ protected: QOpenGLInformationService(QOpenGLInformationServicePrivate &dd); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QOPENGLINFORMATIONSERVICE_H +#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_H diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h index d98313364..c16a34d5c 100644 --- a/src/core/services/qopenglinformationservice_p.h +++ b/src/core/services/qopenglinformationservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QOPENGLINFORMATIONSERVICE_P_H -#define QT3D_QOPENGLINFORMATIONSERVICE_P_H +#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H +#define QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QOpenGLInformationServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QOPENGLINFORMATIONSERVICE_P_H +#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp index f68f0e8fd..da9f32a98 100644 --- a/src/core/services/qservicelocator.cpp +++ b/src/core/services/qservicelocator.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractServiceProvider + \class Qt3DCore::QAbstractServiceProvider \inmodule Qt3DCore */ @@ -96,23 +96,23 @@ public: /*! - \class Qt3D::QServiceLocator + \class Qt3DCore::QServiceLocator \inmodule Qt3DCore \brief Service locator used by aspects to retrieve pointers to concrete service objects - The Qt3D::QServiceLocator class can be used by aspects to obtain pointers to concrete - providers of abstract service interfaces. A subclass of Qt3D::QAbstractServiceProvider + The Qt3DCore::QServiceLocator class can be used by aspects to obtain pointers to concrete + providers of abstract service interfaces. A subclass of Qt3DCore::QAbstractServiceProvider encapsulates a service that can be provided by an aspect for other parts of the system. For example, an aspect may wish to know the current frame number, or how many CPU cores are available in the Qt3D tasking threadpool. - Aspects or the Qt3D::QAspectEngine are able to register objects as providers of services. - The service locator itself can be accessed via the Qt3D::QAbstractAspect::services() + Aspects or the Qt3DCore::QAspectEngine are able to register objects as providers of services. + The service locator itself can be accessed via the Qt3DCore::QAbstractAspect::services() function. As a convenience, the service locator provides methods to access services provided by - built in Qt3D aspects. Currently these are Qt3D::QSystemInformationService and - Qt3D::QOpenGLInformationService. For such services, the service provider will never + built in Qt3D aspects. Currently these are Qt3DCore::QSystemInformationService and + Qt3DCore::QOpenGLInformationService. For such services, the service provider will never return a null pointer. The default implementations of these services are simple null or do nothing implementations. */ @@ -170,7 +170,7 @@ int QServiceLocator::serviceCount() const } /*! - \fn T *Qt3D::QServiceLocator::service(int serviceType) + \fn T *Qt3DCore::QServiceLocator::service(int serviceType) Returns a pointer to the service provider for \a serviceType. If no provider has been explicitly registered, this returns a null pointer for non-Qt3D provided diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator.h index 144154d97..cd19c34be 100644 --- a/src/core/services/qservicelocator.h +++ b/src/core/services/qservicelocator.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSERVICELOCATOR_H -#define QT3D_QSERVICELOCATOR_H +#ifndef QT3DCORE_QSERVICELOCATOR_H +#define QT3DCORE_QSERVICELOCATOR_H #include <Qt3DCore/qt3dcore_global.h> #include <QScopedPointer> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractServiceProviderPrivate; @@ -115,4 +115,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QSERVICELOCATOR_H +#endif // QT3DCORE_QSERVICELOCATOR_H diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp index df2869986..c5a7269d1 100644 --- a/src/core/services/qsysteminformationservice.cpp +++ b/src/core/services/qsysteminformationservice.cpp @@ -39,20 +39,20 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractServiceProviderPrivate + \class Qt3DCore::QAbstractServiceProviderPrivate \internal */ /*! - \class Qt3D::QSystemInformationServicePrivate + \class Qt3DCore::QSystemInformationServicePrivate \internal */ /*! - \class Qt3D::QSystemInformationService + \class Qt3DCore::QSystemInformationService \inmodule Qt3DCore \brief Interface for a Qt3D system information service @@ -79,7 +79,7 @@ QSystemInformationService::QSystemInformationService(QSystemInformationServicePr } /*! - \fn QStringList Qt3D::QSystemInformationService::aspectNames() + \fn QStringList Qt3DCore::QSystemInformationService::aspectNames() Subclasses should override this function and return a string list containing the names of all registered aspects. diff --git a/src/core/services/qsysteminformationservice.h b/src/core/services/qsysteminformationservice.h index eb42f0012..19b515e2e 100644 --- a/src/core/services/qsysteminformationservice.h +++ b/src/core/services/qsysteminformationservice.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_H -#define QT3D_QSYSTEMINFORMATIONSERVICE_H +#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_H +#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qservicelocator.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QSystemInformationServicePrivate; @@ -58,8 +58,8 @@ protected: QSystemInformationService(QSystemInformationServicePrivate &dd); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QSYSTEMINFORMATIONSERVICE_H +#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_H diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h index 43a3d0404..d2aecf1c8 100644 --- a/src/core/services/qsysteminformationservice_p.h +++ b/src/core/services/qsysteminformationservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_P_H -#define QT3D_QSYSTEMINFORMATIONSERVICE_P_H +#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H +#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QSystemInformationServicePrivate : public QAbstractServiceProviderPrivate { @@ -68,5 +68,5 @@ public: QT_END_NAMESPACE -#endif // QT3D_QSYSTEMINFORMATIONSERVICE_P_H +#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp index 85e25bd1d..aebea9745 100644 --- a/src/core/services/qtickclockservice.cpp +++ b/src/core/services/qtickclockservice.cpp @@ -40,9 +40,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QTickClockServicePrivate + \class Qt3DCore::QTickClockServicePrivate \internal */ @@ -60,11 +60,11 @@ public: }; /*! - \class Qt3D::QTickClockService + \class Qt3DCore::QTickClockService \inmodule Qt3DCore - \brief Default Qt3D::QAbstractFrameAdvanceService implementation. + \brief Default Qt3DCore::QAbstractFrameAdvanceService implementation. - This default Qt3D::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz. + This default Qt3DCore::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz. */ QTickClockService::QTickClockService() : QAbstractFrameAdvanceService(*new QTickClockServicePrivate()) diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h index a8fafdcc1..6c1b07722 100644 --- a/src/core/services/qtickclockservice_p.h +++ b/src/core/services/qtickclockservice_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTICKCLOCKSERVICE_P_H -#define QT3D_QTICKCLOCKSERVICE_P_H +#ifndef QT3DCORE_QTICKCLOCKSERVICE_P_H +#define QT3DCORE_QTICKCLOCKSERVICE_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QTickClockServicePrivate; @@ -73,4 +73,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QTICKCLOCKSERVICE_P_H +#endif // QT3DCORE_QTICKCLOCKSERVICE_P_H |