diff options
Diffstat (limited to 'src/core/jobs')
-rw-r--r-- | src/core/jobs/dependencyhandler.cpp | 4 | ||||
-rw-r--r-- | src/core/jobs/dependencyhandler_p.h | 16 | ||||
-rw-r--r-- | src/core/jobs/qabstractaspectjobmanager.cpp | 4 | ||||
-rw-r--r-- | src/core/jobs/qabstractaspectjobmanager_p.h | 4 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob.cpp | 6 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob.h | 10 | ||||
-rw-r--r-- | src/core/jobs/qaspectjob_p.h | 8 | ||||
-rw-r--r-- | src/core/jobs/qaspectjobmanager.cpp | 6 | ||||
-rw-r--r-- | src/core/jobs/qaspectjobmanager_p.h | 10 | ||||
-rw-r--r-- | src/core/jobs/qaspectjobproviderinterface.h | 8 | ||||
-rw-r--r-- | src/core/jobs/qthreadpooler.cpp | 6 | ||||
-rw-r--r-- | src/core/jobs/qthreadpooler_p.h | 10 | ||||
-rw-r--r-- | src/core/jobs/task.cpp | 4 | ||||
-rw-r--r-- | src/core/jobs/task_p.h | 10 | ||||
-rw-r--r-- | src/core/jobs/weaverjob.cpp | 4 | ||||
-rw-r--r-- | src/core/jobs/weaverjob_p.h | 10 |
16 files changed, 60 insertions, 60 deletions
diff --git a/src/core/jobs/dependencyhandler.cpp b/src/core/jobs/dependencyhandler.cpp index a805638fe..d39b04ba4 100644 --- a/src/core/jobs/dependencyhandler.cpp +++ b/src/core/jobs/dependencyhandler.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace { template <template <typename T> class Op> @@ -148,6 +148,6 @@ QVector<RunnableInterface *> DependencyHandler::freeDependencies(const RunnableI return freedList; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/dependencyhandler_p.h b/src/core/jobs/dependencyhandler_p.h index 1887cc1ea..8c0c6734e 100644 --- a/src/core/jobs/dependencyhandler_p.h +++ b/src/core/jobs/dependencyhandler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_DEPENDENCYHANDLER_P_H -#define QT3D_DEPENDENCYHANDLER_P_H +#ifndef QT3DCORE_DEPENDENCYHANDLER_P_H +#define QT3DCORE_DEPENDENCYHANDLER_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { struct Dependency { @@ -68,12 +68,12 @@ struct Dependency RunnableInterface *dependee; }; -} // namespace Qt3D +} // namespace Qt3DCore template <> -class QTypeInfo<Qt3D::Dependency> : public QTypeInfoMerger<Qt3D::Dependency, Qt3D::RunnableInterface *> {}; +class QTypeInfo<Qt3DCore::Dependency> : public QTypeInfoMerger<Qt3DCore::Dependency, Qt3DCore::RunnableInterface *> {}; -namespace Qt3D { +namespace Qt3DCore { inline bool operator==(const Dependency &left, const Dependency &right) { @@ -102,9 +102,9 @@ private: QMutex *m_mutex; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_DEPENDENCYHANDLER_P_H +#endif // QT3DCORE_DEPENDENCYHANDLER_P_H diff --git a/src/core/jobs/qabstractaspectjobmanager.cpp b/src/core/jobs/qabstractaspectjobmanager.cpp index a3b768ae4..15d5b92d0 100644 --- a/src/core/jobs/qabstractaspectjobmanager.cpp +++ b/src/core/jobs/qabstractaspectjobmanager.cpp @@ -38,10 +38,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAspectJobManager + \class Qt3DCore::QAbstractAspectJobManager \internal */ QAbstractAspectJobManager::QAbstractAspectJobManager(QObject *parent) diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h index a153471fb..4397c746e 100644 --- a/src/core/jobs/qabstractaspectjobmanager_p.h +++ b/src/core/jobs/qabstractaspectjobmanager_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspectJobManager : public QObject { @@ -71,7 +71,7 @@ public: virtual void waitForPerThreadFunction(JobFunction func, void *arg) = 0; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp index 9f12adb9c..fdd237954 100644 --- a/src/core/jobs/qaspectjob.cpp +++ b/src/core/jobs/qaspectjob.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAspectJobPrivate + \class Qt3DCore::QAspectJobPrivate \internal */ QAspectJobPrivate::QAspectJobPrivate() @@ -77,6 +77,6 @@ QVector<QWeakPointer<QAspectJob> > QAspectJob::dependencies() const return d->m_dependencies; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h index 8db1c9780..042baa46a 100644 --- a/src/core/jobs/qaspectjob.h +++ b/src/core/jobs/qaspectjob.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOB_H -#define QT3D_QASPECTJOB_H +#ifndef QT3DCORE_QASPECTJOB_H +#define QT3DCORE_QASPECTJOB_H #include <Qt3DCore/qt3dcore_global.h> #include <QSharedPointer> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJobPrivate; @@ -68,8 +68,8 @@ private: typedef QSharedPointer<QAspectJob> QAspectJobPtr; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTJOB_H +#endif // QT3DCORE_QASPECTJOB_H diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h index 76bf1fcfd..312479e99 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOB_P_H -#define QT3D_QASPECTJOB_P_H +#ifndef QT3DCORE_QASPECTJOB_P_H +#define QT3DCORE_QASPECTJOB_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJob; @@ -69,4 +69,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTJOB_P_H +#endif // QT3DCORE_QASPECTJOB_P_H diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index 974dec5db..47793e740 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { #ifdef THREAD_WEAVER namespace { @@ -102,7 +102,7 @@ void SynchronizedJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *t #endif /*! - \class Qt3D::QAspectJobManager + \class Qt3DCore::QAspectJobManager \internal */ QAspectJobManager::QAspectJobManager(QObject *parent) @@ -234,6 +234,6 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg) #endif } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h index 772874547..deaa21d55 100644 --- a/src/core/jobs/qaspectjobmanager_p.h +++ b/src/core/jobs/qaspectjobmanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOBMANAGER_P_H -#define QT3D_QASPECTJOBMANAGER_P_H +#ifndef QT3DCORE_QASPECTJOBMANAGER_P_H +#define QT3DCORE_QASPECTJOBMANAGER_P_H // // W A R N I N G @@ -63,7 +63,7 @@ class Queue; QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QThreadPooler; class DependencyHandler; @@ -93,8 +93,8 @@ private: QScopedPointer<DependencyHandler> m_dependencyHandler; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTJOBMANAGER_P_H +#endif // QT3DCORE_QASPECTJOBMANAGER_P_H diff --git a/src/core/jobs/qaspectjobproviderinterface.h b/src/core/jobs/qaspectjobproviderinterface.h index ad05980ae..a8d59d5f3 100644 --- a/src/core/jobs/qaspectjobproviderinterface.h +++ b/src/core/jobs/qaspectjobproviderinterface.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTJOBPROVIDERINTERFACE_H -#define QT3D_QASPECTJOBPROVIDERINTERFACE_H +#ifndef QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H +#define QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qaspectjob.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectJobProviderInterface { @@ -57,4 +57,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTJOBPROVIDERINTERFACE_H +#endif // QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index aea393cab..f38422652 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QThreadPoolerPrivate + \class Qt3DCore::QThreadPoolerPrivate \internal */ QThreadPooler::QThreadPooler(QObject *parent) @@ -169,6 +169,6 @@ int QThreadPooler::maxThreadCount() const return QThreadPool::globalInstance()->maxThreadCount(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index a7a0a8966..7a4253b60 100644 --- a/src/core/jobs/qthreadpooler_p.h +++ b/src/core/jobs/qthreadpooler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QTHREADPOOLER_H -#define QT3D_QTHREADPOOLER_H +#ifndef QT3DCORE_QTHREADPOOLER_H +#define QT3DCORE_QTHREADPOOLER_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QThreadPooler : public QObject { @@ -89,8 +89,8 @@ private: QAtomicInt m_taskCount; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QTHREADPOOLER_H +#endif // QT3DCORE_QTHREADPOOLER_H diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp index 8cfc365fa..731a93f9a 100644 --- a/src/core/jobs/task.cpp +++ b/src/core/jobs/task.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { RunnableInterface::~RunnableInterface() { @@ -123,6 +123,6 @@ DependencyHandler *SyncTaskRunnable::dependencyHandler() return Q_NULLPTR; } -} // namespace Qt3D { +} // namespace Qt3DCore { QT_END_NAMESPACE diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h index 7d6ec744c..37368c2c1 100644 --- a/src/core/jobs/task_p.h +++ b/src/core/jobs/task_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_TASK_P_H -#define QT3D_TASK_P_H +#ifndef QT3DCORE_TASK_P_H +#define QT3DCORE_TASK_P_H // // W A R N I N G @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class JobRunner; class DependencyHandler; @@ -144,9 +144,9 @@ private: int m_id; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_TASK_P_H +#endif // QT3DCORE_TASK_P_H diff --git a/src/core/jobs/weaverjob.cpp b/src/core/jobs/weaverjob.cpp index 4bc6f4585..f006bf438 100644 --- a/src/core/jobs/weaverjob.cpp +++ b/src/core/jobs/weaverjob.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { WeaverJob::WeaverJob() { @@ -52,6 +52,6 @@ void WeaverJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) m_job->run(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/weaverjob_p.h b/src/core/jobs/weaverjob_p.h index 4bebd235a..6cc5702c4 100644 --- a/src/core/jobs/weaverjob_p.h +++ b/src/core/jobs/weaverjob_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_WEAVERJOB_H -#define QT3D_WEAVERJOB_H +#ifndef QT3DCORE_WEAVERJOB_H +#define QT3DCORE_WEAVERJOB_H #include <job.h> #include <Qt3DCore/qaspectjob.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class WeaverJob : public ThreadWeaver::Job { @@ -54,8 +54,8 @@ public: QAspectJobPtr m_job; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_WEAVERJOB_H +#endif // QT3DCORE_WEAVERJOB_H |