summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-11 14:17:53 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-12 07:58:05 +0000
commit4cdfa2bd8d3ef8cf3305a4d26624bd141e46f884 (patch)
treee64e264e82c525200856d2dd417da2e5df9f2165 /src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
parent992fe137b7d633803d05a906b0df3beaa65b3c2f (diff)
Consolidate stdafx headers into Qt3DSCommonPrecompile.h
Task-number: QT3DS-256 Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp')
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
index c41963c6..ff7077aa 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
@@ -27,7 +27,7 @@
**
****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
#include "TimelineBreadCrumbProvider.h"
#include "Core.h"
@@ -74,7 +74,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
Q3DStudio::CId theId = theBridge->GetGUID(inInstance);
qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
- ASSERT(theMasterSlide.Valid()); // it should be valid because inAsset should be OBJTYPE_SCENE or
+ Q_ASSERT(theMasterSlide.Valid()); // it should be valid because inAsset should be OBJTYPE_SCENE or
// non-library OBJTYPE_COMPONENT
// Get the active slide index of the master slide. Master Slide always has index 0
@@ -94,7 +94,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
Qt3DSDMSlideHandle theActiveSlide =
theSlideSystem->GetSlideByIndex(theMasterSlide, theActiveIndex);
Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theActiveSlide);
- ASSERT(theInstanceHandle.Valid());
+ Q_ASSERT(theInstanceHandle.Valid());
outBreadCrumb.m_String += theBridge->GetName(theInstanceHandle).toQString();
}
outBreadCrumb.m_String += ")";