diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-19 12:50:57 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:52 +0000 |
| commit | f407c37d3f0ab61b3923c3ef0e5d0f842f0b0e41 (patch) | |
| tree | 92908207b57b828293474644d5438b800a7753b9 /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | |
| parent | 51e7b6187f3816336e4c9a4a0ab87f788ff1c092 (diff) | |
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>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 |