summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Timeline
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
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')
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp11
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp4
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.cpp4
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.cpp4
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp17
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.cpp4
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp9
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp6
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp11
17 files changed, 29 insertions, 113 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
index 8f3a7e8f..a1e9ae40 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "BehaviorTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "StudioApp.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
index 981365c9..8b2ea242 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/EmptyTimelineTimebar.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "EmptyTimelineTimebar.h"
#include "StudioPreferences.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
index 909efdbb..a860b24c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "GroupTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "StudioApp.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
index 169d1667..91577b3e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "ImageTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "Qt3DSDMHandles.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
index daa03983..84d10c74 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "LayerTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "ImageTimelineItemBinding.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
index 59069db7..d34faf1b 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "MaterialTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "ImageTimelineItemBinding.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
index 41857093..6525cce9 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "OffsetKeyframesCommandHelper.h"
#include "Core.h"
@@ -70,4 +63,4 @@ void COffsetKeyframesCommandHelper::SetCommandTime(qt3dsdm::Qt3DSDMKeyframeHandl
void COffsetKeyframesCommandHelper::Finalize()
{
CommitEditor();
-} \ No newline at end of file
+}
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
index d12cee30..192c4414 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
@@ -26,7 +26,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
#include "PathAnchorPointTimelineItemBinding.h"
#include "EmptyTimelineTimebar.h"
@@ -41,4 +41,4 @@ CPathAnchorPointTimelineItemBinding::CPathAnchorPointTimelineItemBinding(
ITimelineTimebar *CPathAnchorPointTimelineItemBinding::GetTimebar()
{
return new CEmptyTimelineTimebar();
-} \ No newline at end of file
+}
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.cpp
index 3fbed168..9581265f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.cpp
@@ -26,7 +26,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
#include "PathTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "Doc.h"
@@ -55,4 +55,4 @@ void CPathTimelineItemBinding::Internalize()
Q3DStudio::ScopedDocumentEditor(*m_TransMgr->GetDoc(), L"Internalize Path Buffer", __FILE__,
__LINE__)
->InternalizePath(GetInstance());
-} \ No newline at end of file
+}
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.cpp
index dd246f54..65b0d852 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.cpp
@@ -27,7 +27,7 @@
**
****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
#include "Qt3DSDMAssetTimelineKeyframe.h"
#include "Qt3DSDMTimelineItemBinding.h"
@@ -70,7 +70,7 @@ void Qt3DSDMAssetTimelineKeyframe::SetTime(const long inNewTime)
Q_UNUSED(inNewTime);
// note: this is not used. because setting time is currently only done through offsetting by
// moving keyframes OR using the edit time dialog.
- ASSERT(0);
+ Q_ASSERT(0);
}
void Qt3DSDMAssetTimelineKeyframe::SetDynamic(bool inIsDynamic)
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 4704d70b..8a106d1a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "Qt3DSDMTimelineItemBinding.h"
#include "TimelineTranslationManager.h"
#include "TimeEditDlg.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
index de9502bb..e241913d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "Qt3DSDMTimelineItemProperty.h"
#include "TimelineTranslationManager.h"
#include "ITimelineItemBinding.h"
@@ -168,7 +161,7 @@ inline ITimelineItemBinding *GetParentBinding(RowTree *inRow)
RowTree *theParentRow = inRow->parentRow();
if (theParentRow) {
theParentBinding = theParentRow->getBinding();
- ASSERT(theParentBinding);
+ Q_ASSERT(theParentBinding);
}
}
return theParentBinding;
@@ -263,7 +256,7 @@ IKeyframe *Qt3DSDMTimelineItemProperty::GetKeyframeByIndex(long inIndex) const
if (inIndex >= 0 && inIndex < (long)m_Keyframes.size())
return m_Keyframes[inIndex];
- ASSERT(0); // should not happen
+ Q_ASSERT(0); // should not happen
return nullptr;
}
@@ -381,7 +374,7 @@ bool Qt3DSDMTimelineItemProperty::RefreshKeyframe(qt3dsdm::Qt3DSDMKeyframeHandle
}
} break;
case ETimelineKeyframeTransaction_Add: {
- ASSERT(!m_AnimationHandles.empty());
+ Q_ASSERT(!m_AnimationHandles.empty());
IAnimationCore *theAnimationCore = m_TransMgr->GetStudioSystem()->GetAnimationCore();
Qt3DSDMAnimationHandle theAnimationHandle =
theAnimationCore->GetAnimationForKeyframe(inKeyframe);
@@ -435,7 +428,7 @@ bool Qt3DSDMTimelineItemProperty::CreateKeyframeIfNonExistent(
theNewKeyframe->AddKeyframeHandle(inKeyframeHandle);
if (m_AnimationHandles.size()
> 1) { // assert assumption that is only called for the first handle
- ASSERT(m_AnimationHandles[0] == inOwningAnimation);
+ Q_ASSERT(m_AnimationHandles[0] == inOwningAnimation);
IAnimationCore *theAnimationCore = m_TransMgr->GetStudioSystem()->GetAnimationCore();
float theKeyframeTime = KeyframeTime(theAnimationCore->GetKeyframeData(inKeyframeHandle));
for (size_t i = 1; i < m_AnimationHandles.size(); ++i) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.cpp
index ba69b731..ae7e2035 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.cpp
@@ -27,7 +27,7 @@
**
****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
#include "Qt3DSDMTimelineKeyframe.h"
#include "Qt3DSDMAnimation.h"
#include "CmdDataModelChangeKeyframe.h"
@@ -108,7 +108,7 @@ void Qt3DSDMTimelineKeyframe::SetTime(const long inNewTime)
IAnimationCore *theAnimationCore = m_Doc->GetStudioSystem()->GetAnimationCore();
long theTest = static_cast<long>(
KeyframeTime(theAnimationCore->GetKeyframeData(*m_KeyframeHandles.begin())) * 1000);
- ASSERT(inNewTime == theTest);
+ Q_ASSERT(inNewTime == theTest);
#endif
}
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
index 4f7ed646..a4f27f6e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "Qt3DSDMTimelineTimebar.h"
#include "Qt3DSDMStudioSystem.h"
#include "Qt3DSDMDataCore.h"
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
index b1a75b39..577de4b1 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "SlideTimelineItemBinding.h"
// Data model specific
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 += ")";
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
index 627fb387..1a191b19 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
@@ -27,14 +27,7 @@
**
****************************************************************************/
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
#include "TimelineTranslationManager.h"
#include "SlideTimelineItemBinding.h"
#include "GroupTimelineItemBinding.h"
@@ -105,7 +98,7 @@ ITimelineItemBinding *CTimelineTranslationManager::GetOrCreate(Qt3DSDMInstanceHa
theReturn = new Qt3DSDMTimelineItemBinding(this, inInstance);
else {
// Add support for additional DataModel types here.
- ASSERT(0);
+ Q_ASSERT(0);
}
m_InstanceHandleBindingMap.insert(