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>

49 files changed, 59 insertions, 424 deletions

diff --git a/src/Authoring/Client/Code/Core/Commands/Cmd.cpp b/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
index f065bdf6..077e613d 100644
--- a/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Cmd.h"
 
 //=============================================================================
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
index 1aa3b711..56466c9f 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 
 #include "CmdActivateSlide.h"
 #include "Doc.h"
@@ -36,7 +36,7 @@
 #include "SlideSystem.h"
 #include "ClientDataModelBridge.h"
 
-#include <QObject>
+#include <QtCore/qobject.h>
 
 CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlideHandle)
     : m_Doc(inDoc)
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdBatch.cpp b/src/Authoring/Client/Code/Core/Commands/CmdBatch.cpp
index 51147316..3a81e373 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdBatch.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdBatch.cpp
@@ -27,16 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
-
+#include "Qt3DSCommonPrecompile.h"
 //#ifndef INCLUDED_CMD_BATCH_H
 #include "CmdBatch.h"
 #include "Doc.h"
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
index bfdfe1e7..9ae9277c 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "CmdDataModel.h"
 #include "Qt3DSDMTransactions.h"
 #include "Qt3DSDMStudioSystem.h"
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
index 5a48c5f8..2a2844f8 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Include
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "CmdLocateReference.h"
 #include "Doc.h"
 #include "Qt3DSDMStudioSystem.h"
@@ -43,7 +36,6 @@
 #include "Qt3DSDMSlides.h"
 #include "Qt3DSDMSlideCore.h"
 
-//=============================================================================
 /**
  * Constructor
  */
@@ -57,11 +49,11 @@ CCmdLocateReference::CCmdLocateReference(CDoc *inDoc, const Q3DStudio::CFilePath
     // Convert the path to relative
     if (m_OldPath.IsAbsolute()) {
         m_OldPath = m_Doc->GetRelativePathToDoc(m_OldPath);
-        ASSERT(!m_OldPath.IsAbsolute());
+        Q_ASSERT(!m_OldPath.IsAbsolute());
     }
     if (m_NewPath.IsAbsolute()) {
         m_NewPath = m_Doc->GetRelativePathToDoc(m_NewPath);
-        ASSERT(!m_NewPath.IsAbsolute());
+        Q_ASSERT(!m_NewPath.IsAbsolute());
     }
 
     m_Bridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp b/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp
index aa58ca82..a577d4af 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "CmdStack.h"
 #include "Cmd.h"
 #include "CmdStackModifier.h"
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index c05a0909..373a2497 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -27,9 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Includes
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Core.h"
 #include "Doc.h"
 #include "Dispatch.h"
@@ -45,7 +43,6 @@
 #include <QtWidgets/qaction.h>
 #include <QtWidgets/qwidget.h>
 
-//==============================================================================
 // Construction
 CCore::CCore()
     : m_Doc(NULL)
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
index b25e1ff7..8a53b39e 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
@@ -27,16 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
-
+#include "Qt3DSCommonPrecompile.h"
 #include "Dispatch.h"
 #include "DispatchListeners.h"
 #include "MasterP.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
index 14e5f8b1..1bfc9bac 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "ClientDataModelBridge.h"
 #include "Doc.h"
 #include "StandardExtensions.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
index 87b8ab4b..6b1c8506 100644
--- a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "IComposerEditorInterface.h"
 #include "Qt3DSImport.h"
 #include "Qt3DSImportTranslation.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index e9acd863..be06f22e 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "Doc.h"
 #include "Core.h"
 #include "Qt3DSDMStudioSystem.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
index 262553bc..2835de25 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
@@ -27,10 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "IDocumentBufferCache.h"
 #include "Doc.h"
 #include "foundation/Qt3DS.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index 27b886ba..44510b14 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "qtAuthoring-config.h"
 #include "IDocumentEditor.h"
 #include "Doc.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
index be6e78c5..8c1ef511 100644
--- a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "GraphUtils.h"
 #include "Doc.h"
 #include "Qt3DSDMStudioSystem.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index 257f88e1..2a2843c2 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "IComposerSerializer.h"
 #include "Qt3DSDMDataCore.h"
 #include "Qt3DSDMSlideCore.h"
@@ -2546,7 +2546,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                                 QT3DS_ASSERT(false);
                             }
                         } else {
-                            ASSERT(false);
+                            QT3DS_ASSERT(false);
                         }
                         ParseAndSetInstanceProperties(inReader, 0, theMaster, theExtraAtts,
                                                       theValues);
diff --git a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
index 2a7dd8ca..b1f2a3ae 100644
--- a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Doc.h"
 #undef placeholder
 #include "Qt3DSDMStudioSystem.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
index 03998b29..ce9d281b 100644
--- a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	 Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	 Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "RelativePathTools.h"
 #include "PathConstructionHelper.h"
 #include "StackTokenizer.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/StudioProjectSettings.cpp b/src/Authoring/Client/Code/Core/Doc/StudioProjectSettings.cpp
index 4eb00cad..39b4e0d3 100644
--- a/src/Authoring/Client/Code/Core/Doc/StudioProjectSettings.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/StudioProjectSettings.cpp
@@ -27,16 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
-
+#include "Qt3DSCommonPrecompile.h"
 #include "StudioProjectSettings.h"
 #include "Core.h"
 #include "Preferences.h"
diff --git a/src/Authoring/Client/Code/Core/Q3DStudioNVFoundation.cpp b/src/Authoring/Client/Code/Core/Q3DStudioNVFoundation.cpp
index 134416e9..37aaeeb2 100644
--- a/src/Authoring/Client/Code/Core/Q3DStudioNVFoundation.cpp
+++ b/src/Authoring/Client/Code/Core/Q3DStudioNVFoundation.cpp
@@ -27,13 +27,9 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "StdAfx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Q3DStudioNVFoundation.h"
 #include "foundation/TrackingAllocator.h"
-#include <string>
 
 namespace Q3DStudio {
 namespace Foundation {
diff --git a/src/Authoring/Client/Code/Core/StdAfx.cpp b/src/Authoring/Client/Code/Core/StdAfx.cpp
deleted file mode 100644
index a2b66c1f..00000000
--- a/src/Authoring/Client/Code/Core/StdAfx.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// stdafx.cpp : source file that includes just the standard includes
-//  stdafx.pch will be the pre-compiled header
-//  stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
diff --git a/src/Authoring/Client/Code/Core/StdAfx.h b/src/Authoring/Client/Code/Core/StdAfx.h
deleted file mode 100644
index 14ced92b..00000000
--- a/src/Authoring/Client/Code/Core/StdAfx.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//==============================================================================
-//						CoreLib Precompiled Header
-//==============================================================================
-#ifdef __cplusplus
-#pragma once
-#include "Qt3DSMacros.h"
-
-#ifdef _WIN32
-//==============================================================================
-//	Disable certain warnings since warnings are errors
-//==============================================================================
-#pragma warning(disable : 4702) // Unreachable code
-#pragma warning(disable : 4290) // C++ Exception Specification ignored
-#pragma warning(disable : 4514) // unreferenced inline function
-#pragma warning(disable : 4819)
-#endif
-
-//==============================================================================
-//	Common Includes
-//==============================================================================
-#include <stdio.h> // Standard includes MUST come first
-#include <stdlib.h>
-#include <float.h>
-#include <math.h>
-
-#ifdef _WIN32
-//==============================================================================
-//	Windows Includes
-//==============================================================================
-#include <winsock2.h> //must include before windows.h to avoid winsock.h defines.
-#define QT3DS_LITTLE_ENDIAN
-#include <windows.h>
-#endif
-
-#include <assert.h>
-#ifndef ASSERT
-#define ASSERT(a) assert(a)
-#endif
-
-//==============================================================================
-//	STL Includes
-//==============================================================================
-#ifdef _WIN32
-#pragma warning(push, 3) // Temporarily pop to warning level 3 while including standard headers
-#pragma warning(disable : 4018) // Disable mismatched < STL warning
-#endif
-#include <vector>
-#include <map>
-#include <deque>
-#include <string>
-#include <stack>
-#include <set>
-#include <list>
-#include <utility>
-#include <algorithm>
-#include <stdexcept>
-#include <limits>
-#ifdef _WIN32
-#pragma warning(pop) // Pop out to previous warning level (probably level 4)
-#endif
-
-//==============================================================================
-//	Memory Manager Includes
-//==============================================================================
-#ifdef USE_MEMORY_MANAGER
-#include <mmgr.h>
-#endif
-
-//==============================================================================
-//	Common Player Includes
-//==============================================================================
-#include "Qt3DSMath.h"
-#include "Qt3DSPoint.h"
-#include "Qt3DSRect.h"
-#include "Qt3DSString.h"
-#include "Qt3DSMessageBox.h"
-#include "Qt3DSObjectCounter.h"
-#include "PlatformTypes.h"
-#include "PlatformMacros.h"
-#include "PlatformStrings.h"
-#include "PlatformConversion.h"
-#include "CommonConstants.h"
-#include "Mutex.h"
-#include "Guard.h"
-#include "Thread.h"
-#include "Conditional.h"
-#include "STLHelpers.h"
-#include "GenericFunctor.h"
-#include "Qt3DSRender.h"
-
-#include <QtGlobal>
-
-#ifdef _WIN32
-#pragma warning(disable : 4100) // unreferenced formal parameter
-#pragma warning(disable : 4127) // conditional expression is constant
-#pragma warning(disable : 4189) // local variable is initialized but not referenced
-#endif
-#endif
diff --git a/src/Authoring/Client/Code/Core/Timer/Timer.cpp b/src/Authoring/Client/Code/Core/Timer/Timer.cpp
index ee5b3f04..fab145fd 100644
--- a/src/Authoring/Client/Code/Core/Timer/Timer.cpp
+++ b/src/Authoring/Client/Code/Core/Timer/Timer.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "Timer.h"
 
 CTimer::CTimer()
diff --git a/src/Authoring/Client/Code/Core/Types/BoundingBox.cpp b/src/Authoring/Client/Code/Core/Types/BoundingBox.cpp
index ebff5f0b..f57feffa 100644
--- a/src/Authoring/Client/Code/Core/Types/BoundingBox.cpp
+++ b/src/Authoring/Client/Code/Core/Types/BoundingBox.cpp
@@ -26,14 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "BoundingBox.h"
-
-//==============================================================================
-//	Prefix
-//==============================================================================
 #include "OptimizedArithmetic.h"
-#include <vector>
 
 namespace Q3DStudio {
 
diff --git a/src/Authoring/Client/Code/Core/Types/CachedMatrix.cpp b/src/Authoring/Client/Code/Core/Types/CachedMatrix.cpp
index cac4faf8..b38e46a5 100644
--- a/src/Authoring/Client/Code/Core/Types/CachedMatrix.cpp
+++ b/src/Authoring/Client/Code/Core/Types/CachedMatrix.cpp
@@ -26,10 +26,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "CachedMatrix.h"
 #include "OptimizedArithmetic.h"
-#include <math.h>
 
 namespace Q3DStudio {
 
diff --git a/src/Authoring/Client/Code/Core/Types/Frustum.cpp b/src/Authoring/Client/Code/Core/Types/Frustum.cpp
index 0222a2f4..5ab8a859 100644
--- a/src/Authoring/Client/Code/Core/Types/Frustum.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Frustum.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Frustum.h"
 #include "Matrix.h"
 #include "BoundingBox.h"
diff --git a/src/Authoring/Client/Code/Core/Types/Matrix.cpp b/src/Authoring/Client/Code/Core/Types/Matrix.cpp
index e9f3287f..0cec6c0b 100644
--- a/src/Authoring/Client/Code/Core/Types/Matrix.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Matrix.cpp
@@ -27,11 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-#include "stdafx.h"
-
+#include "Qt3DSCommonPrecompile.h"
 #include "Matrix.h"
 #include "OptimizedArithmetic.h"
 #include "Vector3.h"
diff --git a/src/Authoring/Client/Code/Core/Types/Pixel.cpp b/src/Authoring/Client/Code/Core/Types/Pixel.cpp
index 03600306..0c8b10a9 100644
--- a/src/Authoring/Client/Code/Core/Types/Pixel.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Pixel.cpp
@@ -27,13 +27,9 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Pixel.h"
 
-//==============================================================================
 /**
  *	Constructs a CPixel
  */
@@ -133,4 +129,4 @@ void CPixel::Get(unsigned char &outRed, unsigned char &outGreen, unsigned char &
     outGreen = g;
     outBlue = b;
     outAlpha = a;
-}
\ No newline at end of file
+}
diff --git a/src/Authoring/Client/Code/Core/Types/Plane.cpp b/src/Authoring/Client/Code/Core/Types/Plane.cpp
index e54f2a3f..7f6fd809 100644
--- a/src/Authoring/Client/Code/Core/Types/Plane.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Plane.cpp
@@ -26,7 +26,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Plane.h"
 #include "Matrix.h"
 #include "BoundingBox.h"
diff --git a/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp b/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
index a0457a6a..9db577a2 100644
--- a/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
@@ -27,16 +27,8 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "Qt3DSColor.h"
-#include <stdio.h>
 #include "ColorConversion.h"
 
 #define CLAMP_COLOR(x, y, z)                                                                       \
diff --git a/src/Authoring/Client/Code/Core/Types/Rotation3.cpp b/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
index 45a349e8..83feaba1 100644
--- a/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
@@ -27,15 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
-#include <math.h>
+#include "Qt3DSCommonPrecompile.h"
 #include "Rotation3.h"
 
 namespace Q3DStudio {
diff --git a/src/Authoring/Client/Code/Core/Types/Vector2.cpp b/src/Authoring/Client/Code/Core/Types/Vector2.cpp
index 345077e0..55e90242 100644
--- a/src/Authoring/Client/Code/Core/Types/Vector2.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Vector2.cpp
@@ -27,12 +27,8 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "Vector2.h"
-#include <math.h>
 
 namespace Q3DStudio {
 
diff --git a/src/Authoring/Client/Code/Core/Types/Vector3.cpp b/src/Authoring/Client/Code/Core/Types/Vector3.cpp
index e23e2ff3..952a5f25 100644
--- a/src/Authoring/Client/Code/Core/Types/Vector3.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Vector3.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-#include "stdafx.h"
-
-#include <stdio.h>
-#include <math.h>
-
+#include "Qt3DSCommonPrecompile.h"
 #include "Vector3.h"
 #include "Rotation3.h"
 #include "Matrix.h"
diff --git a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
index 299bfa84..395b7f3f 100644
--- a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
@@ -27,11 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Includes
-//==============================================================================
-#include "stdafx.h"
-
+#include "Qt3DSCommonPrecompile.h"
 #include "BuildConfigParser.h"
 #include "Qt3DSFileTools.h"
 
diff --git a/src/Authoring/Client/Code/Core/Utility/ColorConversion.cpp b/src/Authoring/Client/Code/Core/Utility/ColorConversion.cpp
index b03f81c6..7aacf18c 100644
--- a/src/Authoring/Client/Code/Core/Utility/ColorConversion.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/ColorConversion.cpp
@@ -27,14 +27,9 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "ColorConversion.h"
 
-//==============================================================================
 /**
 *	Returns the red portion of the color
 *
diff --git a/src/Authoring/Client/Code/Core/Utility/CoreUtils.cpp b/src/Authoring/Client/Code/Core/Utility/CoreUtils.cpp
index 1bbfb9fb..d319f3a9 100644
--- a/src/Authoring/Client/Code/Core/Utility/CoreUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/CoreUtils.cpp
@@ -27,17 +27,9 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "CoreUtils.h"
 
-//==============================================================================
 /**
  *	Converts a double to a long, rounding up as necessary.
  *	@param inDouble double value to be converted
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
index cace57d5..c8ee3107 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "DataModelObjectReferenceHelper.h"
 #include "Core.h"
 #include "Doc.h"
diff --git a/src/Authoring/Client/Code/Core/Utility/HotKeys.cpp b/src/Authoring/Client/Code/Core/Utility/HotKeys.cpp
index 542d5370..b62ccd4a 100644
--- a/src/Authoring/Client/Code/Core/Utility/HotKeys.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/HotKeys.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "HotKeys.h"
 #include "StringTokenizer.h"
 
diff --git a/src/Authoring/Client/Code/Core/Utility/OptimizedArithmetic.cpp b/src/Authoring/Client/Code/Core/Utility/OptimizedArithmetic.cpp
index 50433831..cd876308 100644
--- a/src/Authoring/Client/Code/Core/Utility/OptimizedArithmetic.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/OptimizedArithmetic.cpp
@@ -27,10 +27,7 @@
 **
 ****************************************************************************/
 
-#include "StdAfx.h"
-
-#include <math.h>
-#include <float.h>
+#include "Qt3DSCommonPrecompile.h"
 
 #include "OptimizedArithmetic.h"
 #include "Matrix.h"
@@ -39,8 +36,6 @@
 #include "cpuid.h"
 #endif
 
-#include "Qt3DSMath.h"
-
 void SSE_MatrixMultiply(const float *inSource1, const float *inSource2, float *outDest);
 void C_MatrixMultiply(const float *inSource1, const float *inSource2, float *outDest);
 bool C_IntersectTriangle(bool inUseFrontface, bool inUseBackface, const float *inOrig,
diff --git a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
index bb17fa3d..a1cbef0e 100644
--- a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	 Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	 Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "PathConstructionHelper.h"
 #include "Doc.h"
 #include "Qt3DSDMStudioSystem.h"
@@ -201,4 +194,4 @@ const Q3DStudio::CString &CPathConstructionHelper::GetParentString()
 const Q3DStudio::CString &CPathConstructionHelper::GetPathDelimiter()
 {
     return SOURCEPATHDELIMITER;
-}
\ No newline at end of file
+}
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
index 0bcbb07c..b77fe34d 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
@@ -27,25 +27,18 @@
  **
  ****************************************************************************/
 
-//==============================================================================
-//  Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//  Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "StudioClipboard.h"
 
 #include "Literals.h"
 #include "StudioObjectTypes.h"
 #include "Qt3DSString.h"
 
-#include <QClipboard>
-#include <QDataStream>
-#include <QFile>
-#include <QGuiApplication>
-#include <QMimeData>
+#include <QtGui/qclipboard.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qfile.h>
+#include <QtGui/qguiapplication.h>
+#include <QtCore/qmimedata.h>
 
 Qt3DSFile CStudioClipboard::s_InternalClipObject("");
 qint64 CStudioClipboard::s_InternalContextData = 0;
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
index fe8d06b8..25721607 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
@@ -27,15 +27,9 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
+#include "Qt3DSCommonPrecompile.h"
 #include "StudioObjectTypes.h"
 
-//==============================================================================
 bool CStudioObjectTypes::AcceptableParent(EStudioObjectType inChild, EStudioObjectType inParent)
 {
     bool theAcceptible = false;
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
index c910dc16..71a3e581 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 
 #include "StudioPreferences.h"
 #include "Preferences.h"
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.cpp b/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.cpp
index 18cd80e5..e49d3b41 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.cpp
@@ -27,19 +27,11 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "StudioProjectVariables.h"
 #include "Core.h"
 #include "Dispatch.h"
 
-//==============================================================================
 /**
  *	Constructor
  */
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.h b/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.h
index 3a13e18f..a0dbe6d2 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.h
+++ b/src/Authoring/Client/Code/Core/Utility/StudioProjectVariables.h
@@ -32,15 +32,9 @@
 
 #pragma once
 
-//==============================================================================
-//	Includes
-//==============================================================================
 #include "Multicaster.h"
-#include "StdAfx.h"
+#include "Qt3DSCommonPrecompile.h"
 
-//==============================================================================
-//	Forwards
-//==============================================================================
 class CCore;
 
 class CStudioProjectVariables
diff --git a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
index f1211c6b..29ff4649 100644
--- a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
@@ -27,21 +27,13 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "TestCmdUtils.h"
 #include "Doc.h"
 #include "Qt3DSDMStudioSystem.h"
 #include "ClientDataModelBridge.h"
 #include "GraphUtils.h"
 
-//=============================================================================
 /**
  * Returns the nearest integer to a float, e.g. 3.4 -> 3; -2.7 -> -3;
  * @param inX a float value
diff --git a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
index c0cecddd..4ce5851d 100644
--- a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
+++ b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
@@ -32,7 +32,7 @@
 #pragma once
 
 #include "Qt3DSDMHandles.h"
-#include "StdAfx.h"
+#include "Qt3DSCommonPrecompile.h"
 
 class CAsset;
 class CAsset;
diff --git a/src/Authoring/Client/Code/Core/Utility/cpuid.cpp b/src/Authoring/Client/Code/Core/Utility/cpuid.cpp
index 2600db6b..3e3ac13a 100644
--- a/src/Authoring/Client/Code/Core/Utility/cpuid.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/cpuid.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "cpuid.h"
 #include <QtCore/qglobal.h>
 
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
index d8b78421..8ef5bef7 100644
--- a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
+++ b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
@@ -27,15 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
-
+#include "Qt3DSCommonPrecompile.h"
 #include "PlaybackClock.h"
 #include "Doc.h"
 #include "ClientDataModelBridge.h"
@@ -216,7 +208,7 @@ void CPlaybackClock::UpdateClockProperties()
 {
     qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle =
         GetSlideSystem()->GetSlideInstance(m_Doc->GetActiveSlide());
-    ASSERT(theInstanceHandle.Valid());
+    Q_ASSERT(theInstanceHandle.Valid());
 
     qt3dsdm::SValue theValue;
     GetPropertySystem()->GetInstancePropertyValue(
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/VClockPolicy.cpp b/src/Authoring/Client/Code/Core/VirtualAssets/VClockPolicy.cpp
index 646c9479..4a475452 100644
--- a/src/Authoring/Client/Code/Core/VirtualAssets/VClockPolicy.cpp
+++ b/src/Authoring/Client/Code/Core/VirtualAssets/VClockPolicy.cpp
@@ -27,13 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "VClockPolicy.h"
 
 CVClockPolicy::CVClockPolicy()