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/QT3DSDM/Systems/StudioCoreSystem.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/QT3DSDM/Systems/StudioCoreSystem.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp index 146ff288..b8ee4494 100644 --- a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp +++ b/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp @@ -56,14 +56,14 @@ inline bool AnimationPropertyMatches(CUICDMAnimationHandle inAnimation, } inline bool AnimationSlideMatches(CUICDMAnimationHandle inAnimation, - TAnimationCorePtr inAnimationCore, CUICDMSlideHandle inSlide) + TAnimationCorePtr inAnimationCore, Qt3DSDMSlideHandle inSlide) { return inSlide == inAnimationCore->GetAnimationInfo(inAnimation).m_Slide; } inline bool AnimationSlideInstancePropertyMatch(CUICDMAnimationHandle inAnimation, TAnimationCorePtr inAnimationCore, - CUICDMSlideHandle inSlide, + Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) { @@ -136,7 +136,7 @@ void CascadePropertyRemove(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHand EraseAnimationsThatMatch(inAnimationCore, thePredicate); } -void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore, +void CascadeSlideDelete(Qt3DSDMSlideHandle inSlide, TDataCorePtr inDataCore, TSlideCorePtr inSlideCore, TSlideGraphCorePtr inSlideGraphCore, TAnimationCorePtr inAnimationCore, TActionCorePtr inActionCore) { @@ -155,7 +155,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore, } else { - CUICDMSlideHandle theMaster(inSlideCore->GetParentSlide(inSlide)); + Qt3DSDMSlideHandle theMaster(inSlideCore->GetParentSlide(inSlide)); if (theMaster.Valid()) { CUICDMSlideGraphHandle theGraph = inSlideGraphCore->GetSlideGraph(theMaster); if (theGraph.Valid()) { @@ -174,7 +174,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore, because the slide getting deleted is not currently active. This is the mirror of the fact that new slide *always* sets the active slide so it does make logical sense.*/ - CUICDMSlideHandle theNewActiveSlide = + Qt3DSDMSlideHandle theNewActiveSlide = inSlideGraphCore->GetGraphActiveSlide(theGraph); if (theNewActiveSlide == inSlide) { TSlideHandleList theChildren; @@ -202,7 +202,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore, EraseActions(inDataCore, inActionCore, theActions); } -void CascadeSlidePropertyRemove(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance, +void CascadeSlidePropertyRemove(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty, TAnimationCorePtr inAnimationCore) { EraseAnimationsThatMatch(inAnimationCore, |