QAxisAlignedBoundingBox is used only in ObjLoader

Change-Id: Iee0c2b50985d6c87f196877544f501eab33f6d37
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

7 files changed, 14 insertions, 25 deletions

diff --git a/src/core/bounds/bounds.pri b/src/core/bounds/bounds.pri
deleted file mode 100644
index fd38d2115..000000000
--- a/src/core/bounds/bounds.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-
-HEADERS += \
-    $$PWD/qaxisalignedboundingbox.h
-
-SOURCES += \
-    $$PWD/qaxisalignedboundingbox.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/core/core.pri b/src/core/core.pri
index 55b46a8f7..17315c7d5 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -8,8 +8,6 @@ include (./jobs/jobs.pri)
 include (./nodes/nodes.pri)
 # Qml Components
 include (./core-components/core-components.pri)
-# Bounds
-include (./bounds/bounds.pri)
 #Transformations
 include (./transforms/transforms.pri)
 # Resources Management
diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index bba72c4c2..e6e05ef29 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -4,6 +4,7 @@ HEADERS += \
     $$PWD/objloader_p.h \
     $$PWD/qabstractsceneloader.h \
     $$PWD/qabstractsceneloader_p.h \
+    $$PWD/qaxisalignedboundingbox_p.h \
     $$PWD/qsceneloader.h \
     $$PWD/scene_p.h \
     $$PWD/scenemanager_p.h \
@@ -15,6 +16,7 @@ HEADERS += \
 SOURCES += \
     $$PWD/objloader.cpp \
     $$PWD/qabstractsceneloader.cpp \
+    $$PWD/qaxisalignedboundingbox.cpp \
     $$PWD/qsceneloader.cpp \
     $$PWD/scene.cpp \
     $$PWD/scenemanager.cpp \
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 7e58ae738..87085c1de 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -39,7 +39,7 @@
 #include "qmesh.h"
 #include "qbuffer.h"
 #include "qattribute.h"
-#include <Qt3DCore/qaxisalignedboundingbox.h>
+#include <Qt3DRender/private/qaxisalignedboundingbox_p.h>
 
 #include <Qt3DRender/private/renderlogging_p.h>
 #include <QFile>
@@ -458,7 +458,7 @@ void ObjLoader::center( QVector<QVector3D>& points )
     if ( points.isEmpty() )
         return;
 
-    Qt3DCore::QAxisAlignedBoundingBox bb(points);
+    QAxisAlignedBoundingBox bb(points);
     QVector3D center = bb.center();
 
     // Translate center of the AABB to the origin
diff --git a/src/core/bounds/qaxisalignedboundingbox.cpp b/src/render/io/qaxisalignedboundingbox.cpp
index afd21348c..8e7aac191 100644
--- a/src/core/bounds/qaxisalignedboundingbox.cpp
+++ b/src/render/io/qaxisalignedboundingbox.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qaxisalignedboundingbox.h"
+#include "qaxisalignedboundingbox_p.h"
 
 #include <QDebug>
 #include <QMatrix4x4>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 void QAxisAlignedBoundingBox::update(const QVector<QVector3D> &points)
 {
@@ -89,6 +89,6 @@ QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c)
     return dbg;
 }
 
-} //namespace Qt3DCore
+} //namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/core/bounds/qaxisalignedboundingbox.h b/src/render/io/qaxisalignedboundingbox_p.h
index 8ef26871b..fec3eb8f5 100644
--- a/src/core/bounds/qaxisalignedboundingbox.h
+++ b/src/render/io/qaxisalignedboundingbox_p.h
@@ -34,10 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
-#define QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
-
-#include <Qt3DCore/qt3dcore_global.h>
+#ifndef QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H
+#define QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H
 
 #include <QMatrix4x4>
 #include <QVector>
@@ -47,9 +45,9 @@ QT_BEGIN_NAMESPACE
 
 class QDebug;
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
-class QT3DCORESHARED_EXPORT QAxisAlignedBoundingBox
+class QAxisAlignedBoundingBox
 {
 public:
     inline QAxisAlignedBoundingBox()
@@ -134,7 +132,7 @@ private:
                            const QAxisAlignedBoundingBox &b);
 };
 
-QT3DCORESHARED_EXPORT QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c);
+QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c);
 
 inline bool intersects(const QAxisAlignedBoundingBox &a,
                        const QAxisAlignedBoundingBox &b)
@@ -150,8 +148,8 @@ inline bool intersects(const QAxisAlignedBoundingBox &a,
     return true;
 }
 
-} // namespace Qt3DCore
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
+#endif // QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H
diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp
index 3a2923c1d..43842a2ee 100644
--- a/src/render/jobs/calcboundingvolumejob.cpp
+++ b/src/render/jobs/calcboundingvolumejob.cpp
@@ -47,7 +47,6 @@
 #include <Qt3DRender/private/attribute_p.h>
 #include <Qt3DRender/private/buffer_p.h>
 #include <Qt3DRender/private/sphere_p.h>
-#include <Qt3DCore/qaxisalignedboundingbox.h>
 
 #include <QtCore/qmath.h>
 #include <QtConcurrent/QtConcurrent>