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/Client/Code/Core/VirtualAssets | |
| 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/Client/Code/Core/VirtualAssets')
| -rw-r--r-- | src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp index 9777aed3..b8a48b9a 100644 --- a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp +++ b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp @@ -117,7 +117,7 @@ void CPlaybackClock::UpdateTime() void CPlaybackClock::OnReachedUpperBound() { - qt3dsdm::CUICDMSlideHandle theActiveSlide(m_Doc->GetActiveSlide()); + qt3dsdm::Qt3DSDMSlideHandle theActiveSlide(m_Doc->GetActiveSlide()); // clock has passed the end, check whether needs to switch slide qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle = GetSlideSystem()->GetSlideInstance(theActiveSlide); @@ -135,13 +135,13 @@ void CPlaybackClock::OnReachedUpperBound() SStringOrInt thePlaythroughTo = qt3dsdm::get<SStringOrInt>(theValue); qt3dsdm::ISlideSystem *theSlideSystem = GetSlideSystem(); - qt3dsdm::CUICDMSlideHandle thePlaythroughToSlide; + qt3dsdm::Qt3DSDMSlideHandle thePlaythroughToSlide; if (thePlaythroughTo.GetType() == SStringOrIntTypes::String) { Q3DStudio::CString theValue(get<TDataStrPtr>(thePlaythroughTo.m_Value)->GetData()); if (theValue == L"Next") { size_t theNextSlideIndex = theSlideSystem->GetSlideIndex(theActiveSlide) + 1; - qt3dsdm::CUICDMSlideHandle theMasterSlide = + qt3dsdm::Qt3DSDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theActiveSlide); size_t theSlideCount = theSlideSystem->GetSlideCount(theMasterSlide); if (theNextSlideIndex < theSlideCount) { @@ -151,7 +151,7 @@ void CPlaybackClock::OnReachedUpperBound() } } else if (theValue == L"Previous") { int thePrevSlideIndex = theSlideSystem->GetSlideIndex(theActiveSlide) - 1; - qt3dsdm::CUICDMSlideHandle theMasterSlide = + qt3dsdm::Qt3DSDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theActiveSlide); if (thePrevSlideIndex > 0) // Index 0 refers to MasterSlide, so we check > 0 { |