diff options
Diffstat (limited to 'src/core/resources')
-rw-r--r-- | src/core/resources/qboundedcircularbuffer_p.h | 10 | ||||
-rw-r--r-- | src/core/resources/qcircularbuffer_p.h | 12 | ||||
-rw-r--r-- | src/core/resources/qframeallocator_p.h | 7 | ||||
-rw-r--r-- | src/core/resources/qhandlemanager_p.h | 6 | ||||
-rw-r--r-- | src/core/resources/qresourcemanager_p.h | 15 |
5 files changed, 27 insertions, 23 deletions
diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h index f879a4a6f..22299d7da 100644 --- a/src/core/resources/qboundedcircularbuffer_p.h +++ b/src/core/resources/qboundedcircularbuffer_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <Qt3DCore/private/qcircularbuffer_p.h> +#include <QtCore/QReadWriteLock> +#include <QtCore/QReadLocker> +#include <QtCore/QSemaphore> +#include <QtCore/QtGlobal> -#include <QReadWriteLock> -#include <QReadLocker> -#include <QSemaphore> -#include <QtGlobal> +#include <Qt3DCore/private/qcircularbuffer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h index 08665f4b5..e10b7236d 100644 --- a/src/core/resources/qcircularbuffer_p.h +++ b/src/core/resources/qcircularbuffer_p.h @@ -51,21 +51,23 @@ // We mean it. // +#include <Qt3DCore/qt3dcore_global.h> +#include <QtCore/QtGlobal> #include <QtCore/qlist.h> #include <QtCore/qpair.h> #include <QtCore/qshareddata.h> #include <QtCore/qvector.h> #include <algorithm> -#ifdef Q_COMPILER_INITIALIZER_LISTS -# include <initializer_list> -#endif #include <iterator> #include <limits> #include <memory> #include <new> -#include <QtGlobal> -#include <Qt3DCore/qt3dcore_global.h> + + +#ifdef Q_COMPILER_INITIALIZER_LISTS +# include <initializer_list> +#endif QT_BEGIN_NAMESPACE diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h index cd0fa504c..b3ded0760 100644 --- a/src/core/resources/qframeallocator_p.h +++ b/src/core/resources/qframeallocator_p.h @@ -56,9 +56,10 @@ #include <valgrind/memcheck.h> #endif -#include <QDebug> -#include <QScopedPointer> -#include <QVector> +#include <QtCore/QDebug> +#include <QtCore/QScopedPointer> +#include <QtCore/QVector> + #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/resources/qhandlemanager_p.h b/src/core/resources/qhandlemanager_p.h index b41fc75b1..0c3609bb9 100644 --- a/src/core/resources/qhandlemanager_p.h +++ b/src/core/resources/qhandlemanager_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <QtGlobal> #include <Qt3DCore/qt3dcore_global.h> -#include "qhandle_p.h" - +#include <QtCore/QtGlobal> #include <QtCore/QVector> +#include <Qt3DCore/private/qhandle_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index 1b79434fd..8ddc1c0a4 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -51,14 +51,15 @@ // We mean it. // -#include <QtGlobal> -#include <QReadWriteLock> -#include <QReadLocker> -#include <QMutex> -#include <QHash> #include <Qt3DCore/qt3dcore_global.h> -#include "qhandle_p.h" -#include "qhandlemanager_p.h" +#include <QtCore/QHash> +#include <QtCore/QMutex> +#include <QtCore/QReadLocker> +#include <QtCore/QReadWriteLock> +#include <QtCore/QtGlobal> + +#include <Qt3DCore/private/qhandle_p.h> +#include <Qt3DCore/private/qhandlemanager_p.h> // Silence complaints about unreferenced local variables in // ArrayAllocatingPolicy::deallocateBuckets() when the compiler |