Make QCircularBuffer and QBoundedCircularBuffer private

Change-Id: I298fbaf819a118a5da4453082ec7f1484835480a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

10 files changed, 13 insertions, 13 deletions

diff --git a/src/core/resources/qboundedcircularbuffer.h b/src/core/resources/qboundedcircularbuffer_p.h
index 00dd93821..43adbe8e2 100644
--- a/src/core/resources/qboundedcircularbuffer.h
+++ b/src/core/resources/qboundedcircularbuffer_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUNDEDCIRCULARBUFFER_H
-#define QT3D_QBOUNDEDCIRCULARBUFFER_H
+#ifndef QT3D_QBOUNDEDCIRCULARBUFFER_P_H
+#define QT3D_QBOUNDEDCIRCULARBUFFER_P_H
 
-#include <Qt3DCore/qcircularbuffer.h>
+#include <Qt3DCore/private/qcircularbuffer_p.h>
 
 #include <QReadWriteLock>
 #include <QReadLocker>
@@ -137,4 +137,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBOUNDEDCIRCULARBUFFER_H
+#endif // QT3D_QBOUNDEDCIRCULARBUFFER_P_H
diff --git a/src/core/resources/qcircularbuffer.h b/src/core/resources/qcircularbuffer_p.h
index 30dab5dc3..30dab5dc3 100644
--- a/src/core/resources/qcircularbuffer.h
+++ b/src/core/resources/qcircularbuffer_p.h
diff --git a/src/core/resources/resources.pri b/src/core/resources/resources.pri
index d1befe69f..fc9e289e7 100644
--- a/src/core/resources/resources.pri
+++ b/src/core/resources/resources.pri
@@ -2,8 +2,8 @@ HEADERS += \
     $$PWD/qhandle.h \
     $$PWD/qhandlemanager.h \
     $$PWD/qresourcemanager_p.h \
-    $$PWD/qcircularbuffer.h \
-    $$PWD/qboundedcircularbuffer.h \
+    $$PWD/qcircularbuffer_p.h \
+    $$PWD/qboundedcircularbuffer_p.h \
     $$PWD/qframeallocator.h \
     $$PWD/qframeallocator_p.h
 
diff --git a/src/render/backend/renderqueues_p.h b/src/render/backend/renderqueues_p.h
index 63fd0d7e1..0416d5caa 100644
--- a/src/render/backend/renderqueues_p.h
+++ b/src/render/backend/renderqueues_p.h
@@ -46,7 +46,7 @@
 #include <QAtomicInt>
 #include <QtGlobal>
 #include <QMutex>
-#include <Qt3DCore/qboundedcircularbuffer.h>
+#include <Qt3DCore/private/qboundedcircularbuffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/core/qboundedcircularbuffer/qboundedcircularbuffer.pro b/tests/auto/core/qboundedcircularbuffer/qboundedcircularbuffer.pro
index d67dab8ee..80ae30b67 100644
--- a/tests/auto/core/qboundedcircularbuffer/qboundedcircularbuffer.pro
+++ b/tests/auto/core/qboundedcircularbuffer/qboundedcircularbuffer.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qboundedcircularbuffer
 CONFIG += testcase
 TEMPLATE = app
-QT += testlib 3dcore
+QT += testlib 3dcore 3dcore-private
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp b/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
index 2b1e7ccd1..6c76c4de5 100644
--- a/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
+++ b/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
@@ -42,7 +42,7 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include <Qt3DCore/qboundedcircularbuffer.h>
+#include <Qt3DCore/private/qboundedcircularbuffer_p.h>
 
 using namespace Qt3D;
 
diff --git a/tests/auto/core/qcircularbuffer/qcircularbuffer.pro b/tests/auto/core/qcircularbuffer/qcircularbuffer.pro
index 29ca2eca8..24fc35ff3 100644
--- a/tests/auto/core/qcircularbuffer/qcircularbuffer.pro
+++ b/tests/auto/core/qcircularbuffer/qcircularbuffer.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qcircularbuffer
 CONFIG += testcase
 TEMPLATE = app
-QT += testlib 3dcore
+QT += testlib 3dcore 3dcore-private
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp b/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
index fe6e4b356..f2ae5bde6 100644
--- a/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
+++ b/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
@@ -42,7 +42,7 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include <Qt3DCore/qcircularbuffer.h>
+#include <Qt3DCore/private/qcircularbuffer_p.h>
 
 using namespace Qt3D;
 
diff --git a/tests/benchmarks/core/qcircularbuffer/qcircularbuffer.pro b/tests/benchmarks/core/qcircularbuffer/qcircularbuffer.pro
index 1928f5829..4843a99a6 100644
--- a/tests/benchmarks/core/qcircularbuffer/qcircularbuffer.pro
+++ b/tests/benchmarks/core/qcircularbuffer/qcircularbuffer.pro
@@ -1,7 +1,7 @@
 TARGET = tst_bench_qcircularbuffer
 CONFIG += release
 TEMPLATE = app
-QT += testlib 3dcore
+QT += testlib 3dcore 3dcore-private
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
index 6b408bc47..668cde89a 100644
--- a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
+++ b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
@@ -42,7 +42,7 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include <Qt3DCore/qcircularbuffer.h>
+#include <Qt3DCore/private/qcircularbuffer_p.h>
 
 using namespace Qt3D;