Tidy up the scene_ai headers to stop libassimp leaking to public headers

Change-Id: I5f5415bdab164e5530caa6976755349479d19ea4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

14 files changed, 34 insertions, 30 deletions

diff --git a/src/threed/scene/qglabstractscene.cpp b/src/threed/scene/qglabstractscene.cpp
index 7a624cb79..f124e405b 100644
--- a/src/threed/scene/qglabstractscene.cpp
+++ b/src/threed/scene/qglabstractscene.cpp
@@ -43,7 +43,7 @@
 #include "qglsceneformatplugin.h"
 #include "qglpicknode.h"
 
-#include "qaiscenehandler.h"
+#include "qaiscenehandler_p.h"
 #include "qglbezierscenehandler.h"
 
 #include <QtCore/qfile.h>
diff --git a/src/threed/scene_ai/ailoaderiostream.cpp b/src/threed/scene_ai/ailoaderiostream.cpp
index 799882879..988c2ce76 100644
--- a/src/threed/scene_ai/ailoaderiostream.cpp
+++ b/src/threed/scene_ai/ailoaderiostream.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "ailoaderiostream.h"
+#include "ailoaderiostream_p.h"
 
 #include <QtCore/qiodevice.h>
 
diff --git a/src/threed/scene_ai/ailoaderiostream.h b/src/threed/scene_ai/ailoaderiostream_p.h
index c114247b2..c114247b2 100644
--- a/src/threed/scene_ai/ailoaderiostream.h
+++ b/src/threed/scene_ai/ailoaderiostream_p.h
diff --git a/src/threed/scene_ai/ailoaderiosystem.cpp b/src/threed/scene_ai/ailoaderiosystem.cpp
index 40447782e..37a6dbbc2 100644
--- a/src/threed/scene_ai/ailoaderiosystem.cpp
+++ b/src/threed/scene_ai/ailoaderiosystem.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "ailoaderiosystem.h"
-#include "ailoaderiostream.h"
+#include "ailoaderiosystem_p.h"
+#include "ailoaderiostream_p.h"
 #include "DefaultLogger.h"
 
 #include <QtCore/qfile.h>
diff --git a/src/threed/scene_ai/ailoaderiosystem.h b/src/threed/scene_ai/ailoaderiosystem_p.h
index 467479a8c..467479a8c 100644
--- a/src/threed/scene_ai/ailoaderiosystem.h
+++ b/src/threed/scene_ai/ailoaderiosystem_p.h
diff --git a/src/threed/scene_ai/qailoader.cpp b/src/threed/scene_ai/qailoader.cpp
index ff2065493..500d991ae 100644
--- a/src/threed/scene_ai/qailoader.cpp
+++ b/src/threed/scene_ai/qailoader.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qailoader.h"
-#include "qaiscenehandler.h"
-#include "qaiscene.h"
-#include "qaimesh.h"
+#include "qailoader_p.h"
+#include "qaiscenehandler_p.h"
+#include "qaiscene_p.h"
+#include "qaimesh_p.h"
 
 #include "qgeometrydata.h"
 #include "qgltwosidedmaterial.h"
diff --git a/src/threed/scene_ai/qailoader.h b/src/threed/scene_ai/qailoader_p.h
index 71d32a8a2..51bb4ebb1 100644
--- a/src/threed/scene_ai/qailoader.h
+++ b/src/threed/scene_ai/qailoader_p.h
@@ -46,11 +46,12 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qmap.h>
 
-#include "aiScene.h"
-
 #include <Qt3D/qglbuilder.h>
 
 struct aiMaterial;
+struct aiMesh;
+struct aiNode;
+struct aiScene;
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/threed/scene_ai/qaimesh.cpp b/src/threed/scene_ai/qaimesh.cpp
index 2a5718e99..737766fe2 100644
--- a/src/threed/scene_ai/qaimesh.cpp
+++ b/src/threed/scene_ai/qaimesh.cpp
@@ -39,13 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qaimesh.h"
-#include "qglscenenode.h"
-#include "qglmaterialcollection.h"
-#include "qglbuilder.h"
+#include "qaimesh_p.h"
+#include <qglscenenode.h>
+#include <qglmaterialcollection.h>
+#include <qglbuilder.h>
 
 #include <QtGui/qmatrix4x4.h>
 #include <QtCore/qmath.h>
+#include <QtCore/qsharedpointer.h>
 
 #include "aiMesh.h"
 #include "DefaultLogger.h"
diff --git a/src/threed/scene_ai/qaimesh.h b/src/threed/scene_ai/qaimesh_p.h
index a97bfe4db..9309bde66 100644
--- a/src/threed/scene_ai/qaimesh.h
+++ b/src/threed/scene_ai/qaimesh_p.h
@@ -42,7 +42,6 @@
 #ifndef QAIMESH_H
 #define QAIMESH_H
 
-#include <Qt3D/qaiscenehandler.h>
 #include <Qt3D/qgeometrydata.h>
 
 struct aiMesh;
diff --git a/src/threed/scene_ai/qaiscene.cpp b/src/threed/scene_ai/qaiscene.cpp
index de93be762..103f970ec 100644
--- a/src/threed/scene_ai/qaiscene.cpp
+++ b/src/threed/scene_ai/qaiscene.cpp
@@ -39,11 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qaiscene.h"
-#include "qaimesh.h"
-#include "qailoader.h"
+#include "qaiscene_p.h"
+#include "qaimesh_p.h"
+#include "qailoader_p.h"
 
-#include "qglscenenode.h"
+#include <qglmaterialcollection.h>
+#include <qglscenenode.h>
+
+#include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/threed/scene_ai/qaiscene.h b/src/threed/scene_ai/qaiscene_p.h
index 22ddbf712..98d8728a3 100644
--- a/src/threed/scene_ai/qaiscene.h
+++ b/src/threed/scene_ai/qaiscene_p.h
@@ -44,7 +44,7 @@
 
 #include <Qt3D/qglabstractscene.h>
 
-#include "aiScene.h"
+struct aiScene;
 
 QT_BEGIN_NAMESPACE
 
@@ -61,7 +61,7 @@ public:
     virtual ~QAiScene();
 
     //load a scene with the current handler
-    void loadScene(const aiScene*scene);
+    void loadScene(const aiScene *scene);
 
     QList<QObject *> objects() const;
     QGLSceneNode *mainNode() const;
diff --git a/src/threed/scene_ai/qaiscenehandler.cpp b/src/threed/scene_ai/qaiscenehandler.cpp
index 6ab95ef90..704a40bc7 100644
--- a/src/threed/scene_ai/qaiscenehandler.cpp
+++ b/src/threed/scene_ai/qaiscenehandler.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qaiscenehandler.h"
-#include "qaiscene.h"
+#include "qaiscenehandler_p.h"
+#include "qaiscene_p.h"
 #include "qdownloadmanager.h"
-#include "ailoaderiosystem.h"
+#include "ailoaderiosystem_p.h"
 
 #include "aiScene.h"
 #include "aiPostProcess.h"
diff --git a/src/threed/scene_ai/qaiscenehandler.h b/src/threed/scene_ai/qaiscenehandler_p.h
index 2118170d7..2118170d7 100644
--- a/src/threed/scene_ai/qaiscenehandler.h
+++ b/src/threed/scene_ai/qaiscenehandler_p.h
diff --git a/src/threed/scene_ai/scene_ai.pri b/src/threed/scene_ai/scene_ai.pri
index 794d990f6..2e384cb83 100644
--- a/src/threed/scene_ai/scene_ai.pri
+++ b/src/threed/scene_ai/scene_ai.pri
@@ -1,12 +1,12 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 HEADERS += \
-    scene_ai/qaiscenehandler.h \
-    scene_ai/qaiscene.h \
-    scene_ai/qaimesh.h \
-    scene_ai/qailoader.h \
-    scene_ai/ailoaderiosystem.h \
-    scene_ai/ailoaderiostream.h
+    scene_ai/qaiscenehandler_p.h \
+    scene_ai/qaiscene_p.h \
+    scene_ai/qaimesh_p.h \
+    scene_ai/qailoader_p.h \
+    scene_ai/ailoaderiosystem_p.h \
+    scene_ai/ailoaderiostream_p.h
 SOURCES += \
     scene_ai/qaiscenehandler.cpp \
     scene_ai/qaiscene.cpp \