diff options
-rw-r--r-- | src/logic/callbackjob.cpp | 5 | ||||
-rw-r--r-- | src/logic/executor.cpp | 4 | ||||
-rw-r--r-- | src/logic/handler.cpp | 6 | ||||
-rw-r--r-- | src/logic/manager.cpp | 11 | ||||
-rw-r--r-- | src/logic/manager_p.h | 3 | ||||
-rw-r--r-- | src/logic/managers_p.h | 5 | ||||
-rw-r--r-- | src/logic/qframeaction.cpp | 1 | ||||
-rw-r--r-- | src/logic/qframeaction_p.h | 2 | ||||
-rw-r--r-- | src/logic/qlogicaspect.cpp | 15 | ||||
-rw-r--r-- | src/logic/qlogicaspect_p.h | 3 |
10 files changed, 33 insertions, 22 deletions
diff --git a/src/logic/callbackjob.cpp b/src/logic/callbackjob.cpp index bc974c792..5c04d8838 100644 --- a/src/logic/callbackjob.cpp +++ b/src/logic/callbackjob.cpp @@ -38,8 +38,9 @@ ****************************************************************************/ #include "callbackjob_p.h" -#include "manager_p.h" -#include "job_common_p.h" + +#include <Qt3DLogic/private/job_common_p.h> +#include <Qt3DLogic/private/manager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp index 74267379e..ab4ac154d 100644 --- a/src/logic/executor.cpp +++ b/src/logic/executor.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "executor_p.h" + #include <Qt3DLogic/qframeaction.h> #include <Qt3DCore/qnode.h> -#include <Qt3DCore/private/qscene_p.h> #include <QtCore/qsemaphore.h> +#include <Qt3DCore/private/qscene_p.h> + QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp index 777637640..884d5f582 100644 --- a/src/logic/handler.cpp +++ b/src/logic/handler.cpp @@ -38,10 +38,12 @@ ****************************************************************************/ #include "handler_p.h" -#include "manager_p.h" -#include "managers_p.h" + #include <Qt3DCore/qnode.h> +#include <Qt3DLogic/private/manager_p.h> +#include <Qt3DLogic/private/managers_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DLogic { diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp index 7f0a6b4eb..7b654ccd4 100644 --- a/src/logic/manager.cpp +++ b/src/logic/manager.cpp @@ -38,15 +38,16 @@ ****************************************************************************/ #include "manager_p.h" -#include "qlogicaspect.h" + +#include <Qt3DLogic/qlogicaspect.h> +#include <QtCore/QDebug> +#include <QtCore/QThread> +#include <QtCore/qcoreapplication.h> + #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DLogic/private/executor_p.h> #include <Qt3DLogic/private/managers_p.h> -#include <QtCore/qcoreapplication.h> - -#include <QDebug> -#include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/logic/manager_p.h b/src/logic/manager_p.h index 58e6e655b..39c0b5342 100644 --- a/src/logic/manager_p.h +++ b/src/logic/manager_p.h @@ -52,12 +52,13 @@ // #include <Qt3DLogic/qt3dlogic_global.h> -#include <Qt3DLogic/private/handle_types_p.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qmutex.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qsemaphore.h> +#include <Qt3DLogic/private/handle_types_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DLogic { diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h index b09104850..6194d260a 100644 --- a/src/logic/managers_p.h +++ b/src/logic/managers_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <QtGlobal> +#include <QtCore/QtGlobal> + +#include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DLogic/private/handle_types_p.h> #include <Qt3DLogic/private/handler_p.h> -#include <Qt3DCore/private/qresourcemanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp index fa4cefe06..f6ae70516 100644 --- a/src/logic/qframeaction.cpp +++ b/src/logic/qframeaction.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qframeaction.h" + #include "qframeaction_p.h" QT_BEGIN_NAMESPACE diff --git a/src/logic/qframeaction_p.h b/src/logic/qframeaction_p.h index 17155ffd3..a83efe77a 100644 --- a/src/logic/qframeaction_p.h +++ b/src/logic/qframeaction_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qcomponent_p.h> +#include <Qt3DCore/private/qcomponent_p.h> QT_BEGIN_NAMESPACE diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp index 369410585..4aabf8888 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -37,21 +37,22 @@ ** ****************************************************************************/ + #include "qlogicaspect.h" #include "qlogicaspect_p.h" -#include "executor_p.h" -#include "handler_p.h" -#include "manager_p.h" -#include "qframeaction.h" +#include <Qt3DLogic/qframeaction.h> #include <Qt3DCore/qnode.h> +#include <QtCore/QThread> +#include <QtGui/QWindow> + +#include <Qt3DLogic/private/executor_p.h> +#include <Qt3DLogic/private/handler_p.h> +#include <Qt3DLogic/private/manager_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qservicelocator_p.h> -#include <QThread> -#include <QWindow> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h index 052fdb244..ee7131a3e 100644 --- a/src/logic/qlogicaspect_p.h +++ b/src/logic/qlogicaspect_p.h @@ -51,9 +51,10 @@ // We mean it. // +#include <QtCore/qsharedpointer.h> + #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DLogic/private/callbackjob_p.h> -#include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE |