Rename CUICDMSlideHandle to Qt3DSDMSlideHandle

Task-number: QT3DS-18
Change-Id: Idc37208a981ab8ab03cc1db31a45ab19e602a5aa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

26 files changed, 86 insertions, 90 deletions

diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
index 8016966e..520a0ef9 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
@@ -159,7 +159,7 @@ qt3dsdm::IActionSystem *ActionModel::actionSystem() const
     return g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetActionSystem();
 }
 
-qt3dsdm::CUICDMSlideHandle ActionModel::activeSlide() const
+qt3dsdm::Qt3DSDMSlideHandle ActionModel::activeSlide() const
 {
     return g_StudioApp.GetCore()->GetDoc()->GetActiveSlide();
 }
diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.h b/src/Authoring/Studio/Palettes/Action/ActionModel.h
index dc504e38..12f94b5b 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.h
@@ -67,7 +67,7 @@ public:
 
 private:
     qt3dsdm::IActionSystem *actionSystem() const;
-    qt3dsdm::CUICDMSlideHandle activeSlide() const;
+    qt3dsdm::Qt3DSDMSlideHandle activeSlide() const;
     QString actionString(const qt3dsdm::CUICDMActionHandle &action) const;
 
     qt3dsdm::Qt3DSDMInstanceHandle m_handle;
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index 7657291a..91359832 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -561,7 +561,7 @@ void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
             theInstance = instances[0];
         break;
     case Q3DStudio::SelectedValueTypes::Slide: {
-        qt3dsdm::CUICDMSlideHandle theSlideHandle =
+        qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
             inSelectable.getData<Q3DStudio::SSlideInstanceWrapper>().m_Slide;
         // Get the owning component instance
         CClientDataModelBridge *theBridge = GetBridge();
@@ -575,15 +575,15 @@ void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
     setItem(theInstance);
 }
 
-void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
+void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     CDoc *theDoc = GetDoc();
     qt3dsdm::CStudioSystem *theStudioSystem = theDoc->GetStudioSystem();
 
-    qt3dsdm::CUICDMSlideHandle theCurrentSlide = theDoc->GetActiveSlide();
-    qt3dsdm::CUICDMSlideHandle theMasterSlideOfAction =
+    qt3dsdm::Qt3DSDMSlideHandle theCurrentSlide = theDoc->GetActiveSlide();
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlideOfAction =
         theStudioSystem->GetSlideSystem()->GetMasterSlide(inSlide);
-    qt3dsdm::CUICDMSlideHandle theMasterOfCurrentSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterOfCurrentSlide =
         theStudioSystem->GetSlideSystem()->GetMasterSlide(theCurrentSlide);
 
     if (inOwner == m_itemHandle && // the action is added to current viewed instance
@@ -597,7 +597,7 @@ void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CU
     }
 }
 
-void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
+void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inSlide);
     Q_UNUSED(inOwner);
@@ -811,8 +811,6 @@ void ActionView::initialize()
     rootContext()->setContextProperty("_actionView"_L1, this);
     rootContext()->setContextProperty("_resDir"_L1, resourceImageUrl());
     rootContext()->setContextProperty("_tabOrderHandler"_L1, tabOrderHandler());
-    rootContext()->setContextProperty("_mouseHelper"_L1, &m_mouseHelper);
-
     qmlRegisterUncreatableType<qt3dsdm::HandlerArgumentType>("Qt3DStudio", 1, 0, "HandlerArgumentType",
                                                           "HandlerArgumentType is an enum container"_L1);
     qmlRegisterUncreatableType<qt3dsdm::DataModelDataType>("Qt3DStudio", 1, 0, "DataModelDataType",
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h
index 36680ede..8dbaf35f 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.h
@@ -47,7 +47,6 @@
 #include "Qt3DSDMStudioSystem.h"
 #include "Qt3DSDMMetaDataTypes.h"
 #include "TabOrderHandler.h"
-#include "MouseHelper.h"
 
 class ActionModel;
 class CClientDataModelBridge;
@@ -135,9 +134,9 @@ public:
     void OnSelectionSet(Q3DStudio::SSelectedValue inSelectable);
 
     // Action callback
-    void OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                        qt3dsdm::Qt3DSDMInstanceHandle inOwner);
-    void OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                          qt3dsdm::Qt3DSDMInstanceHandle inOwner);
     void OnActionModified(qt3dsdm::CUICDMActionHandle inAction);
     void OnHandlerArgumentModified(qt3dsdm::CUICDMHandlerArgHandle inHandlerArgument);
@@ -197,7 +196,6 @@ private:
     QVariantList m_handlerArguments;
     QTimer m_actionChangedCompressionTimer;
     QString m_firedEvent;
-    MouseHelper m_mouseHelper;
 };
 
 #endif // ACTIONVIEW_H
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 487bfae7..f4073a9a 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -140,8 +140,8 @@ static std::pair<bool, bool> getSlideCharacteristics(qt3dsdm::Qt3DSDMInstanceHan
                                                      const qt3dsdm::ISlideSystem &slideSystem)
 {
     // Get the slide from the instance.
-    qt3dsdm::CUICDMSlideHandle slide = slideCore.GetSlideByInstance(instance);
-    qt3dsdm::CUICDMSlideHandle master = slideSystem.GetMasterSlide(slide);
+    qt3dsdm::Qt3DSDMSlideHandle slide = slideCore.GetSlideByInstance(instance);
+    qt3dsdm::Qt3DSDMSlideHandle master = slideSystem.GetMasterSlide(slide);
     int index = (int)slideSystem.GetSlideIndex(slide);
     int count = (int)slideSystem.GetSlideCount(master);
     bool hasNextSlide = index > 0 && index < count - 1;
@@ -844,7 +844,7 @@ void InspectorControlModel::setPropertyAnimated(long instance, int handle, bool
     g_StudioApp.GetCore()->ExecuteCommand(cmd);
 }
 
-void InspectorControlModel::onSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster,
+void InspectorControlModel::onSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster,
                                               int inOldIndex, int inNewIndex)
 {
     Q_UNUSED(inMaster);
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
index dfa68839..afc0d9af 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
@@ -125,7 +125,7 @@ public:
     Q_INVOKABLE void setPropertyAnimated(long instance, int handle, bool animated);
 
 private:
-    void onSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex,
+    void onSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex,
                            int inNewIndex);
 
 
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
index d4453123..fc98bbae 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
@@ -161,7 +161,7 @@ qt3dsdm::Qt3DSDMInstanceHandle ObjectListModel::handleForIndex(const QModelIndex
     return static_cast<qt3dsdm::Qt3DSDMInstanceHandle>(index.internalId());
 }
 
-qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle, const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
+qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::Qt3DSDMSlideHandle &slideHandle, const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
 {
     auto slideSystem = m_core->GetDoc()->GetStudioSystem()->GetSlideSystem();
     auto currentMaster = slideSystem->GetMasterSlide(slideHandle);
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
index 333cac85..3b063d00 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
@@ -66,7 +66,7 @@ public:
 private:
     qt3dsdm::Qt3DSDMInstanceHandle handleForIndex(const QModelIndex &index) const;
 
-    qt3dsdm::TInstanceHandleList childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle,
+    qt3dsdm::TInstanceHandleList childrenList(const qt3dsdm::Qt3DSDMSlideHandle &slideHandle,
                                                     const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
 
     QString nameForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
@@ -74,7 +74,7 @@ private:
     QModelIndex indexForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle, const QModelIndex &startIndex = {}) const;
 
     CCore *m_core;
-    qt3dsdm::CUICDMSlideHandle m_slideHandle;
+    qt3dsdm::Qt3DSDMSlideHandle m_slideHandle;
     qt3dsdm::Qt3DSDMInstanceHandle m_baseHandle;
     IObjectReferenceHelper *m_objRefHelper;
 };
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
index e4dc38a4..6b189638 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
@@ -292,7 +292,7 @@ bool CUICDMInspectable::IsValid() const
 bool CUICDMInspectable::IsMaster()
 {
     ISlideSystem *theSlideSystem = m_Core->GetDoc()->GetStudioSystem()->GetSlideSystem();
-    qt3dsdm::CUICDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(m_Instance);
+    qt3dsdm::Qt3DSDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(m_Instance);
     if (theSlideHandle.Valid())
         return theSlideSystem->IsMasterSlide(theSlideHandle);
     // Slide handle may not be valid if we are selecting the Scene or if we are inside Component and
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
index 4ce998ef..5bc20956 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
@@ -76,7 +76,7 @@ bool SlideModel::setData(const QModelIndex &index, const QVariant &value, int ro
         break;
     }
     case HandleRole: {
-        slideHandle = value.value<qt3dsdm::CUICDMSlideHandle>();
+        slideHandle = value.value<qt3dsdm::Qt3DSDMSlideHandle>();
         Q_EMIT dataChanged(index, index, {HandleRole, NameRole});
         break;
     }
@@ -202,7 +202,7 @@ void SlideModel::addNewSlide(int row)
     const auto handle = (row < m_slides.size()) ? m_slides[row] : m_slides.last();
 
     const auto instanceHandle = GetBridge()->GetOwningComponentInstance(handle);
-    qt3dsdm::CUICDMSlideHandle theMasterSlide = GetBridge()->GetComponentSlide(instanceHandle, 0);
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide = GetBridge()->GetComponentSlide(instanceHandle, 0);
 
     beginInsertRows({}, row, row);
     m_slides.insert(row, Q3DStudio::SCOPED_DOCUMENT_EDITOR(*GetDoc(),
@@ -230,7 +230,7 @@ bool SlideModel::hasSlideWithName(const QString &name) const
     return false;
 }
 
-QString SlideModel::slideName(const qt3dsdm::CUICDMSlideHandle &handle) const
+QString SlideModel::slideName(const qt3dsdm::Qt3DSDMSlideHandle &handle) const
 {
     auto doc = GetDoc();
     if (!doc->IsValid())
@@ -239,7 +239,7 @@ QString SlideModel::slideName(const qt3dsdm::CUICDMSlideHandle &handle) const
     return GetBridge()->GetName(instanceHandle).toQString();
 }
 
-void SlideModel::setSlideName(const qt3dsdm::CUICDMSlideHandle &handle, const QString &name)
+void SlideModel::setSlideName(const qt3dsdm::Qt3DSDMSlideHandle &handle, const QString &name)
 {
     const auto oldName = slideName(handle);
     if (oldName != name && !name.trimmed().isEmpty()) {
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.h b/src/Authoring/Studio/Palettes/Slide/SlideModel.h
index 4aec0070..b5da9670 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideModel.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.h
@@ -68,12 +68,12 @@ public:
 
 private:
     bool hasSlideWithName(const QString &name) const;
-    QString slideName(const qt3dsdm::CUICDMSlideHandle &handle) const;
-    void setSlideName(const qt3dsdm::CUICDMSlideHandle &handle, const QString &name);
+    QString slideName(const qt3dsdm::Qt3DSDMSlideHandle &handle) const;
+    void setSlideName(const qt3dsdm::Qt3DSDMSlideHandle &handle, const QString &name);
     inline CDoc *GetDoc() const;
     inline CClientDataModelBridge *GetBridge() const;
 
-    QVector<qt3dsdm::CUICDMSlideHandle> m_slides;
+    QVector<qt3dsdm::Qt3DSDMSlideHandle> m_slides;
     int m_selectedRow = -1;
 };
 
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index 11e8b357..dfe9b7a1 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -84,7 +84,7 @@ void SlideView::setShowMasterSlide(bool show)
     CDoc *theDoc = GetDoc();
     qt3dsdm::Qt3DSDMInstanceHandle theRoot = theDoc->GetActiveRootInstance();
     CClientDataModelBridge *theBridge = GetBridge();
-    qt3dsdm::CUICDMSlideHandle theNewActiveSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theNewActiveSlide =
         theBridge->GetOrCreateGraphRoot(theRoot); // this will return the master slide
     qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
     if (m_CurrentModel != m_MasterSlideModel) {
@@ -177,8 +177,8 @@ void SlideView::OnClosingPresentation()
     clearSlideList();
 }
 
-void SlideView::OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int inIndex,
-                              const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex,
+                              const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
     // When the active slide changes, we need to update our button and mode
     if (inMaster.Valid()) {
@@ -188,17 +188,17 @@ void SlideView::OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int in
     }
 }
 
-void SlideView::OnNewSlide(const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnNewSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
 
 }
 
-void SlideView::OnDeleteSlide(const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnDeleteSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
 
 }
 
-void SlideView::OnSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex, int inNewIndex)
+void SlideView::OnSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex, int inNewIndex)
 {
 }
 
@@ -218,7 +218,7 @@ void SlideView::clearSlideList()
     m_SlidesModel->clear();
 }
 
-void SlideView::setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle)
+void SlideView::setActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle)
 {
     // Make sure we are in the correct master mode based on the inActiveSlideHandle
     // If we changed mode, then we need to force a rebuild
@@ -238,7 +238,7 @@ void SlideView::setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHa
     }
 }
 
-void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle)
+void SlideView::rebuildSlideList(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle)
 {
     // Clear out the existing slides
     clearSlideList();
@@ -250,11 +250,11 @@ void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlide
 
         // Get the Master Slide handle and the slide count
         qt3dsdm::ISlideSystem *theSlideSystem = GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theMasterSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
             theSlideSystem->GetMasterSlide(inActiveSlideHandle);
 
         // update handle for master slide
-        qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                 theSlideSystem->GetSlideByIndex(theMasterSlide, 0);
         m_MasterSlideModel->setData(m_MasterSlideModel->index(0, 0),
                                     QVariant::fromValue(theMasterSlideHandle),
@@ -267,7 +267,7 @@ void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlide
         m_SlidesModel->insertRows(0, theSlideCount - 1, {});
         int row = 0;
         for (long theSlideIndex = 1; theSlideIndex < theSlideCount; ++theSlideIndex) {
-            qt3dsdm::CUICDMSlideHandle theSlideHandle =
+            qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
                     theSlideSystem->GetSlideByIndex(theMasterSlide, theSlideIndex);
             auto index = m_SlidesModel->index(row, 0);
             m_SlidesModel->setData(index,
@@ -302,12 +302,12 @@ qt3dsdm::ISlideSystem *SlideView::GetSlideSystem()
     return GetDoc()->GetStudioSystem()->GetSlideSystem();
 }
 
-long SlideView::GetSlideIndex(const qt3dsdm::CUICDMSlideHandle &inSlideHandle)
+long SlideView::GetSlideIndex(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle)
 {
     return GetSlideSystem()->GetSlideIndex(inSlideHandle);
 }
 
-bool SlideView::isMaster(const qt3dsdm::CUICDMSlideHandle &inSlideHandle)
+bool SlideView::isMaster(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle)
 {
     return (0 == GetSlideIndex(inSlideHandle));
 }
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h
index 4f42e160..677fcb78 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h
@@ -76,23 +76,23 @@ Q_SIGNALS:
 
 protected:
     // UICDM callbacks
-    virtual void OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int inIndex,
-                               const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnNewSlide(const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnDeleteSlide(const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex,
+    virtual void OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex,
+                               const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnNewSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnDeleteSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex,
                                    int inNewIndex);
 
 private:
     void initialize();
     void clearSlideList();
-    void setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle);
+    void setActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle);
     inline CDoc *GetDoc();
     inline CClientDataModelBridge *GetBridge();
     inline qt3dsdm::ISlideSystem *GetSlideSystem();
-    long GetSlideIndex(const qt3dsdm::CUICDMSlideHandle &inSlideHandle);
-    bool isMaster(const qt3dsdm::CUICDMSlideHandle &inSlideHandle);
-    void rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle);
+    long GetSlideIndex(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle);
+    bool isMaster(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle);
+    void rebuildSlideList(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle);
 
     SlideModel *m_CurrentModel = nullptr;
     SlideModel *m_MasterSlideModel = nullptr;
@@ -107,7 +107,7 @@ private:
     TIntIntMap m_MasterSlideReturnPointers;
 
     qt3dsdm::Qt3DSDMInstanceHandle m_ActiveRoot; ///< the object containing the slides to be inspected.
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle
 };
 
 #endif // SLIDEVIEW_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
index f248216d..d420bc4b 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
@@ -73,13 +73,13 @@ bool CGroupTimelineItemBinding::OpenAssociatedEditor()
 
         qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
         Q3DStudio::CId theId = m_StudioSystem->GetClientDataModelBridge()->GetGUID(theInstance);
-        qt3dsdm::CUICDMSlideHandle theMasterSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
             theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
 
         if (theMasterSlide.Valid()) {
-            CUICDMSlideHandle theActiveSlide = theSlideSystem->GetActiveSlide(theMasterSlide);
+            Qt3DSDMSlideHandle theActiveSlide = theSlideSystem->GetActiveSlide(theMasterSlide);
 
-            CCmd *theCmd = new CCmdGeneric<CDoc, CUICDMSlideHandle>(
+            CCmd *theCmd = new CCmdGeneric<CDoc, Qt3DSDMSlideHandle>(
                 m_TransMgr->GetDoc(), &CDoc::NotifyActiveSlideChanged,
                 &CDoc::NotifyActiveSlideChanged, theActiveSlide, NULL, "");
             theCmd->SetUndoable(false);
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
index e8a2c476..5f6f29f4 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
@@ -137,7 +137,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
@@ -180,9 +180,9 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                             if (thePropGuid == theGuid)
                                 theIsMatch = true;
                         }
-                        CUICDMSlideHandle theSlide =
+                        Qt3DSDMSlideHandle theSlide =
                             theSlideSystem->GetAssociatedSlide(theChildInstance);
-                        CUICDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theSlide);
+                        Qt3DSDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theSlide);
                         if (theIsMatch == false && theSlide.Valid()
                             && theSlideCore->GetSpecificInstancePropertyValue(
                                    theSlide, theInstance, theProperty, theValue)) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 995d7cd2..44d792c1 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -233,7 +233,7 @@ bool CUICDMTimelineItemBinding::HasAction(bool inMaster)
     TActionHandleList theActions;
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
 
-    CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+    Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
     qt3dsdm::ISlideCore &theSlideCore(*m_StudioSystem->GetSlideCore());
     if (theSlideCore.IsSlide(theSlide)) {
         if (inMaster)
@@ -254,7 +254,7 @@ bool CUICDMTimelineItemBinding::ChildrenHasAction(bool inMaster)
     IActionCore *theActionCore(m_StudioSystem->GetActionCore());
     CClientDataModelBridge *theBridge(m_StudioSystem->GetClientDataModelBridge());
 
-    CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+    Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
     qt3dsdm::ISlideCore &theSlideCore(*m_StudioSystem->GetSlideCore());
     if (theSlideCore.IsSlide(theSlide)) {
         if (inMaster)
@@ -295,7 +295,7 @@ bool CUICDMTimelineItemBinding::ComponentHasAction(bool inMaster)
         return false;
 
     Q3DStudio::CId theAssetId = theBridge->GetGUID(m_DataHandle);
-    CUICDMSlideHandle theMasterSlide =
+    Qt3DSDMSlideHandle theMasterSlide =
         m_StudioSystem->GetSlideSystem()->GetMasterSlideByComponentGuid(GuidtoSLong4(theAssetId));
 
     TSlideInstancePairList theGraphInstances;
@@ -432,7 +432,7 @@ long CUICDMTimelineItemBinding::GetChildrenCount()
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         return (long)theChildren.GetCount();
@@ -445,7 +445,7 @@ ITimelineItemBinding *CUICDMTimelineItemBinding::GetChild(long inIndex)
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
@@ -1197,7 +1197,7 @@ void CUICDMTimelineItemBinding::OnAddChild(Qt3DSDMInstanceHandle inInstance)
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
     ISlideSystem *theSlideSystem = m_StudioSystem->GetSlideSystem();
 
-    qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
+    qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
     if (theBridge->IsInActiveComponent(inInstance)
         && (theSlideSystem->IsMasterSlide(theSlide) || theSlide == theDoc->GetActiveSlide())) {
         // Only add if the asset is in the current active component, and it's a master asset or in
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
index b1de8aeb..7823fe15 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
@@ -562,7 +562,7 @@ bool CUICDMTimelineItemProperty::CreateKeyframeIfNonExistent(
     return true;
 }
 
-void CUICDMTimelineItemProperty::OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
+void CUICDMTimelineItemProperty::OnPropertyLinkStatusChanged(qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                                              qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                              qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
index 2c0c17f4..a6231e9d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
@@ -94,7 +94,7 @@ protected:
     void InitializeCachedVariables(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     bool CreateKeyframeIfNonExistent(qt3dsdm::CUICDMKeyframeHandle inKeyframe,
                                      qt3dsdm::CUICDMAnimationHandle inOwningAnimation);
-    void OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnPropertyLinkStatusChanged(qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                      qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                      qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void CreateKeyframes();
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
index e158e945..2e973175 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
@@ -53,7 +53,7 @@ CSlideTimelineItemBinding::CSlideTimelineItemBinding(CTimelineTranslationManager
                                                      Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr)
 {
-    qt3dsdm::CUICDMSlideHandle theSlideHandle =
+    qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
         m_StudioSystem->GetSlideSystem()->GetSlideByInstance(inDataHandle);
 
     // Get the owning component of m_SlideHandle.
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
index 8d4ca0e7..0532098f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
@@ -74,7 +74,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = theBridge->GetGUID(inInstance);
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     ASSERT(theMasterSlide.Valid()); // it should be valid because inAsset should be OBJTYPE_SCENE or
                                     // non-library OBJTYPE_COMPONENT
@@ -93,7 +93,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
     if (theIsMaster)
         outBreadCrumb.m_String += ::LoadResourceString(IDS_OBJTYPE_MASTER).toQString();
     else {
-        CUICDMSlideHandle theActiveSlide =
+        Qt3DSDMSlideHandle theActiveSlide =
             theSlideSystem->GetSlideByIndex(theMasterSlide, theActiveIndex);
         Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theActiveSlide);
         ASSERT(theInstanceHandle.Valid());
@@ -224,12 +224,12 @@ void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::Qt3DSDMInstanceHandle i
                     std::placeholders::_1, std::placeholders::_2, inInstance, theNameProp, theSetter)));
 
     // Listen to name changes on the non-master Slides
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     long theSlideCount = (long)theSlideSystem->GetSlideCount(theMasterSlide);
 
     for (long theIndex = 1; theIndex < theSlideCount; ++theIndex) {
-        CUICDMSlideHandle theSlide = theSlideSystem->GetSlideByIndex(theMasterSlide, theIndex);
+        Qt3DSDMSlideHandle theSlide = theSlideSystem->GetSlideByIndex(theMasterSlide, theIndex);
         Qt3DSDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(theSlide);
         m_Connections.push_back(theEngine->ConnectInstancePropertyValue(
             std::bind(qt3dsdm::MaybackCallbackInstancePropertyValue<std::function<void(
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
index 78f3adc8..d54ab6fb 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
@@ -494,7 +494,7 @@ void CTimelineTranslationManager::OnChildMoved(int /*inParent*/, int inChild, lo
  * update the icon that shows action association status
  */
 void CTimelineTranslationManager::OnActionEvent(qt3dsdm::CUICDMActionHandle inAction,
-                                                qt3dsdm::CUICDMSlideHandle inSlide,
+                                                qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                                 qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inAction);
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
index 29bdcbd7..32c767ac 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
@@ -141,7 +141,7 @@ public:
     void OnChildRemoved(int inParent, int inChild, long inIndex);
     void OnChildMoved(int inParent, int inChild, long inOldIndex, long inNewIndex);
 
-    void OnActionEvent(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionEvent(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                        qt3dsdm::Qt3DSDMInstanceHandle inOwner);
 
     // Helper function to iterate over all bindings
@@ -157,4 +157,4 @@ protected:
     ITimelineItemBinding *EnsureLoaded(qt3dsdm::Qt3DSDMInstanceHandle inHandle);
 };
 
-#endif // INCLUDED_TIMELINE_TRANSLATIONMANAGER_H
\ No newline at end of file
+#endif // INCLUDED_TIMELINE_TRANSLATIONMANAGER_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
index 94d5458f..985fe420 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
@@ -156,7 +156,7 @@ void CTimelineControl::ClearView()
  * root of the doc.
  * @param inState the state to be viewed as the root asset.
  */
-void CTimelineControl::ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::ViewSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_ActiveSlide = inSlide;
 
@@ -190,7 +190,7 @@ void CTimelineControl::ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide)
  * Notification from the StudioFullSystem signal provider that a we have a new active slide.
  * This will populate this view with the new context.
  */
-void CTimelineControl::OnActiveSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::OnActiveSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     ClearView();
     ViewSlide(inSlide);
@@ -238,7 +238,7 @@ void CTimelineControl::OnClosingPresentation()
 /**
  * Accessor for the root object being displayed in this view.
  */
-qt3dsdm::CUICDMSlideHandle CTimelineControl::GetActiveSlide()
+qt3dsdm::Qt3DSDMSlideHandle CTimelineControl::GetActiveSlide()
 {
     return m_ActiveSlide;
 }
@@ -561,7 +561,7 @@ void CTimelineControl::OnSavingPresentation(const CUICFile *inNewPresentationFil
 /**
  * Notification from the StudioFullSystem signal provider that a slide has been deleted.
  */
-void CTimelineControl::OnDeleteSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::OnDeleteSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_TimelineLayout->DeleteTimelineRatio(inSlide);
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
index 17fbccf1..67120690 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
@@ -107,8 +107,8 @@ public:
     ISnappingListProvider *GetSnappingListProvider() const override;
 
     void ClearView();
-    void ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide);
-    qt3dsdm::CUICDMSlideHandle GetActiveSlide();
+    void ViewSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
+    qt3dsdm::Qt3DSDMSlideHandle GetActiveSlide();
 
     CTimelineTimelineLayout *GetTimelineLayout();
     CTimelineTreeLayout *GetTreeLayout();
@@ -132,8 +132,8 @@ protected:
     void HideInsertionMarkers();
 
     // UICDM callbacks
-    void OnActiveSlide(qt3dsdm::CUICDMSlideHandle inSlide);
-    void OnDeleteSlide(qt3dsdm::CUICDMSlideHandle inSlide);
+    void OnActiveSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
+    void OnDeleteSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
     // Helper functions
     inline CDoc *GetDoc();
@@ -142,7 +142,7 @@ protected:
     CTimelineSplitter *m_Splitter;
     CTimelineTreeLayout *m_TreeLayout;
     CTimelineTimelineLayout *m_TimelineLayout;
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlide;
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide;
     CInsertionLine
         *m_InsertionLine; ///< Drag-and-drop insertion line for dropping between timeline items
     CInsertionOverlay
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
index 22cf720c..27606d84 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
@@ -312,7 +312,7 @@ void CTimelineTimelineLayout::OnTimelineLayoutChanged()
  *	Deletes the time zoom ratio for a particular slide.
  *	@param inContext the time context of that slide to delete
  */
-void CTimelineTimelineLayout::DeleteTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineTimelineLayout::DeleteTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_TimelineRatio.erase(inSlide);
 }
@@ -330,7 +330,7 @@ void CTimelineTimelineLayout::ClearAllTimeRatios()
  *	@param inContext the time context of that slide to retrieve zoom ratio
  *  @return the zoom ratio, or -1 if it's not found
  */
-double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide)
+double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     TSlideRatioMap::iterator theResult = m_TimelineRatio.find(inSlide);
     if (theResult != m_TimelineRatio.end())
@@ -344,7 +344,7 @@ double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSl
  *	@param inContext the time context of that slide
  *  @param inRatio the zoom factor
  */
-void CTimelineTimelineLayout::SetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide, double inRatio)
+void CTimelineTimelineLayout::SetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide, double inRatio)
 {
     m_TimelineRatio[inSlide] = inRatio;
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
index c7b16f4a..08d48505 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
@@ -71,7 +71,7 @@ class CTimelineTimelineLayout : public CControl,
                                 public ISnappingListProvider
 {
     typedef std::vector<CTimelineRow *> TTimelineRowList;
-    typedef std::map<qt3dsdm::CUICDMSlideHandle, double> TSlideRatioMap;
+    typedef std::map<qt3dsdm::Qt3DSDMSlideHandle, double> TSlideRatioMap;
 
 public:
     static const long END_BUFFER_SIZE = 20;
@@ -116,15 +116,15 @@ public:
     void SetTimeRatio(double inTimeRatio);
     void OnTimelineLayoutChanged();
 
-    void DeleteTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide);
+    void DeleteTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide);
     void ClearAllTimeRatios();
-    double GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide);
+    double GetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
     // ISnappingListProvider
     void PopulateSnappingList(CSnapper *inSnappingList) override;
 
 protected:
-    void SetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide, double inRatio);
+    void SetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide, double inRatio);
 
     long GetMaximumTimebarTime();
     void OnScalingZoomIn();