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>

13 files changed, 38 insertions, 38 deletions

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();