Rename Q3DSPresentation to Q3DSUipPresentation

Sigh. The 3DS1 public API has a Q3DSPresentation so it's best to
avoid using that name in our private API.

Change-Id: Id0aa90748ee3730a3bbdf14acae87bbc3e975a47
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

6 files changed, 15 insertions, 16 deletions

diff --git a/tools/q3dsviewer/q3dsmainwindow.cpp b/tools/q3dsviewer/q3dsmainwindow.cpp
index b7b6043..da7c1f8 100644
--- a/tools/q3dsviewer/q3dsmainwindow.cpp
+++ b/tools/q3dsviewer/q3dsmainwindow.cpp
@@ -130,7 +130,7 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
     depthTexAction->setCheckable(true);
     depthTexAction->setChecked(false);
     connect(depthTexAction, &QAction::toggled, [=]() {
-        Q3DSPresentation::forAllLayers(view->engine()->presentation()->scene(),
+        Q3DSUipPresentation::forAllLayers(view->engine()->presentation()->scene(),
                                        [=](Q3DSLayerNode *layer3DS) {
             view->engine()->sceneManager()->setDepthTextureEnabled(
                         layer3DS, depthTexAction->isChecked());
@@ -140,7 +140,7 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
     ssaoAction->setCheckable(true);
     ssaoAction->setChecked(false);
     connect(ssaoAction, &QAction::toggled, [=]() {
-        Q3DSPresentation::forAllLayers(view->engine()->presentation()->scene(),
+        Q3DSUipPresentation::forAllLayers(view->engine()->presentation()->scene(),
                                        [=](Q3DSLayerNode *layer3DS) {
             Q3DSPropertyChangeList changeList;
             const QString value = ssaoAction->isChecked() ? QLatin1String("50") : QLatin1String("0");
@@ -151,14 +151,14 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
     });
     QAction *rebuildMatAction = debugMenu->addAction(tr("&Rebuild model materials"));
     connect(rebuildMatAction, &QAction::triggered, [=]() {
-        Q3DSPresentation::forAllModels(view->engine()->presentation()->scene(),
+        Q3DSUipPresentation::forAllModels(view->engine()->presentation()->scene(),
                                        [=](Q3DSModelNode *model3DS) {
             view->engine()->sceneManager()->rebuildModelMaterial(model3DS);
         });
     });
     QAction *toggleShadowAction = debugMenu->addAction(tr("&Toggle shadow casting for point lights"));
     connect(toggleShadowAction, &QAction::triggered, [=]() {
-        Q3DSPresentation::forAllObjectsOfType(view->engine()->presentation()->scene(),
+        Q3DSUipPresentation::forAllObjectsOfType(view->engine()->presentation()->scene(),
                                               Q3DSGraphObject::Light, [=](Q3DSGraphObject *obj) {
             Q3DSLightNode *light3DS = static_cast<Q3DSLightNode *>(obj);
             if (light3DS->flags().testFlag(Q3DSNode::Active) &&
@@ -173,7 +173,7 @@ Q3DStudioMainWindow::Q3DStudioMainWindow(Q3DSWindow *view, QWidget *parent)
     });
     QAction *shadowResChangeAction = debugMenu->addAction(tr("&Maximize shadow map resolution for lights"));
     connect(shadowResChangeAction, &QAction::triggered, [=]() {
-        Q3DSPresentation::forAllObjectsOfType(view->engine()->presentation()->scene(),
+        Q3DSUipPresentation::forAllObjectsOfType(view->engine()->presentation()->scene(),
                                               Q3DSGraphObject::Light, [=](Q3DSGraphObject *obj) {
             Q3DSLightNode *light3DS = static_cast<Q3DSLightNode *>(obj);
             if (light3DS->flags().testFlag(Q3DSNode::Active)) {
diff --git a/tools/qt3dsexplorer/q3dsexplorermainwindow.h b/tools/qt3dsexplorer/q3dsexplorermainwindow.h
index 9558078..daf6e19 100644
--- a/tools/qt3dsexplorer/q3dsexplorermainwindow.h
+++ b/tools/qt3dsexplorer/q3dsexplorermainwindow.h
@@ -37,7 +37,6 @@ QT_BEGIN_NAMESPACE
 class Q3DSWindow;
 class SlideExplorerWidget;
 class SceneExplorerWidget;
-class Q3DSPresentation;
 class Q3DSComponentNode;
 
 class Q3DSExplorerMainWindow : public QMainWindow
diff --git a/tools/qt3dsexplorer/sceneexplorerwidget.cpp b/tools/qt3dsexplorer/sceneexplorerwidget.cpp
index 51119a3..4c914e8 100644
--- a/tools/qt3dsexplorer/sceneexplorerwidget.cpp
+++ b/tools/qt3dsexplorer/sceneexplorerwidget.cpp
@@ -29,7 +29,7 @@
 
 #include "sceneexplorerwidget.h"
 
-#include <private/q3dspresentation_p.h>
+#include <private/q3dsuippresentation_p.h>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QTreeView>
 #include <QtWidgets/QSplitter>
@@ -172,7 +172,7 @@ SceneExplorerWidget::SceneExplorerWidget(QWidget *parent)
     m_sceneTreeView->expandAll();
 }
 
-void SceneExplorerWidget::setPresentation(Q3DSPresentation *presentation)
+void SceneExplorerWidget::setPresentation(Q3DSUipPresentation *presentation)
 {
     m_presentation = presentation;
     m_sceneModel->setSceneRoot(m_presentation->scene());
diff --git a/tools/qt3dsexplorer/sceneexplorerwidget.h b/tools/qt3dsexplorer/sceneexplorerwidget.h
index a7414e6..66442c3 100644
--- a/tools/qt3dsexplorer/sceneexplorerwidget.h
+++ b/tools/qt3dsexplorer/sceneexplorerwidget.h
@@ -33,7 +33,7 @@
 #include <QWidget>
 QT_BEGIN_NAMESPACE
 
-class Q3DSPresentation;
+class Q3DSUipPresentation;
 class Q3DSGraphObject;
 class QTreeView;
 class QtTreePropertyBrowser;
@@ -49,7 +49,7 @@ class SceneExplorerWidget : public QWidget
 public:
     explicit SceneExplorerWidget(QWidget *parent = nullptr);
 
-    void setPresentation(Q3DSPresentation *presentation);
+    void setPresentation(Q3DSUipPresentation *presentation);
 
     void reset();
 
@@ -62,7 +62,7 @@ private:
     void init();
     void resetPropertyViewer();
 
-    Q3DSPresentation *m_presentation = nullptr;
+    Q3DSUipPresentation *m_presentation = nullptr;
     QTreeView *m_sceneTreeView = nullptr;
     QtTreePropertyBrowser *m_propertyBrowser = nullptr;
     QtVariantPropertyManager *m_variantManager = nullptr;
diff --git a/tools/qt3dsexplorer/slideexplorerwidget.cpp b/tools/qt3dsexplorer/slideexplorerwidget.cpp
index 556cddc..5692556 100644
--- a/tools/qt3dsexplorer/slideexplorerwidget.cpp
+++ b/tools/qt3dsexplorer/slideexplorerwidget.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "slideexplorerwidget.h"
-#include <private/q3dspresentation_p.h>
+#include <private/q3dsuippresentation_p.h>
 #include <private/q3dsscenemanager_p.h>
 #include <QVBoxLayout>
 #include <QListView>
@@ -145,7 +145,7 @@ SlideExplorerWidget::SlideExplorerWidget(QWidget *parent)
     init();
 }
 
-void SlideExplorerWidget::setPresentation(Q3DSPresentation *pres)
+void SlideExplorerWidget::setPresentation(Q3DSUipPresentation *pres)
 {
     m_presentation = pres;
     m_component = nullptr;
diff --git a/tools/qt3dsexplorer/slideexplorerwidget.h b/tools/qt3dsexplorer/slideexplorerwidget.h
index 8f76fb6..e106687 100644
--- a/tools/qt3dsexplorer/slideexplorerwidget.h
+++ b/tools/qt3dsexplorer/slideexplorerwidget.h
@@ -34,7 +34,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q3DSPresentation;
+class Q3DSUipPresentation;
 class Q3DSSceneManager;
 class Q3DSComponentNode;
 class Q3DSSlide;
@@ -48,7 +48,7 @@ class SlideExplorerWidget : public QWidget
 public:
     explicit SlideExplorerWidget(QWidget *parent = nullptr);
 
-    void setPresentation(Q3DSPresentation *pres);
+    void setPresentation(Q3DSUipPresentation *pres);
     void setComponent(Q3DSComponentNode *component);
     void setSceneManager(Q3DSSceneManager *sceneManager);
 
@@ -65,7 +65,7 @@ private:
     void init();
     void updateModel();
     Q3DSComponentNode *m_component = nullptr;
-    Q3DSPresentation *m_presentation = nullptr;
+    Q3DSUipPresentation *m_presentation = nullptr;
     Q3DSSceneManager *m_sceneManager = nullptr;
     Q3DSSlide *m_masterSlide = nullptr;
     Q3DSSlide *m_currentSlide = nullptr;