diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-11 14:17:53 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-12 07:58:05 +0000 |
| commit | 4cdfa2bd8d3ef8cf3305a4d26624bd141e46f884 (patch) | |
| tree | e64e264e82c525200856d2dd417da2e5df9f2165 /src | |
| parent | 992fe137b7d633803d05a906b0df3beaa65b3c2f (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')
192 files changed, 248 insertions, 1380 deletions
diff --git a/src/3rdparty/color/CColor.cpp b/src/3rdparty/color/CColor.cpp index 63c5bf13..d21cc945 100644 --- a/src/3rdparty/color/CColor.cpp +++ b/src/3rdparty/color/CColor.cpp @@ -10,11 +10,8 @@ Hinweis: (c) 1999 by Christian Rodemeyer - MSDN: 'HLS Color Spaces' - MSDN: 'Converting Colors Between RGB and HLS' \****************************************************************************/ -#include "stdafx.h" - +#include "Qt3DSCommonPrecompile.h" #include "CColor.h" -#include <math.h> -#include <assert.h> float GetMin( float in1, float in2 ); float GetMin( float in1, float in2 ) 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/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() diff --git a/src/Authoring/Common/Code/EulerAngles/EulerAngles.cpp b/src/Authoring/Common/Code/EulerAngles/EulerAngles.cpp index b9a01b10..ca36185b 100644 --- a/src/Authoring/Common/Code/EulerAngles/EulerAngles.cpp +++ b/src/Authoring/Common/Code/EulerAngles/EulerAngles.cpp @@ -26,14 +26,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" -#include <math.h> -#include <float.h> + +#include "Qt3DSCommonPrecompile.h" #include <string.h> -#include <stdio.h> #include "EulerAngles.h" namespace EulerAngleConverter { diff --git a/src/Authoring/Common/Code/Exceptions/XMLException.cpp b/src/Authoring/Common/Code/Exceptions/XMLException.cpp index df3849e1..da919033 100644 --- a/src/Authoring/Common/Code/Exceptions/XMLException.cpp +++ b/src/Authoring/Common/Code/Exceptions/XMLException.cpp @@ -27,17 +27,10 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "XMLException.h" CXMLException::CXMLException(const wchar_t *inXMLDescription) { wcscpy(m_Description, inXMLDescription); -}
\ No newline at end of file +} diff --git a/src/Authoring/Common/Code/Graph/Graph.cpp b/src/Authoring/Common/Code/Graph/Graph.cpp index 75d6ee27..463f111c 100644 --- a/src/Authoring/Common/Code/Graph/Graph.cpp +++ b/src/Authoring/Common/Code/Graph/Graph.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMPrefix.h" #include "Qt3DSDMTransactions.h" #include "Qt3DSDMSignals.h" diff --git a/src/Authoring/Common/Code/HiResTimer.cpp b/src/Authoring/Common/Code/HiResTimer.cpp index 002bc683..2f62b50b 100644 --- a/src/Authoring/Common/Code/HiResTimer.cpp +++ b/src/Authoring/Common/Code/HiResTimer.cpp @@ -26,11 +26,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" - +#include "Qt3DSCommonPrecompile.h" #include "HiResTimer.h" -//============================================================================= /** * Construct a new HiRes Timer, the timer starts out stopped. */ diff --git a/src/Authoring/Common/Code/IO/BufferedInputStream.cpp b/src/Authoring/Common/Code/IO/BufferedInputStream.cpp index 88331b3b..87d5f33c 100644 --- a/src/Authoring/Common/Code/IO/BufferedInputStream.cpp +++ b/src/Authoring/Common/Code/IO/BufferedInputStream.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "BufferedInputStream.h" #include "IOLibraryException.h" #include <string.h> diff --git a/src/Authoring/Common/Code/IO/BufferedOutputStream.cpp b/src/Authoring/Common/Code/IO/BufferedOutputStream.cpp index cab9f4b3..a6e8ffd7 100644 --- a/src/Authoring/Common/Code/IO/BufferedOutputStream.cpp +++ b/src/Authoring/Common/Code/IO/BufferedOutputStream.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include <string.h> #include <sstream> #include "BufferedOutputStream.h" diff --git a/src/Authoring/Common/Code/IO/FileInputStream.cpp b/src/Authoring/Common/Code/IO/FileInputStream.cpp index 579c3448..382dba8e 100644 --- a/src/Authoring/Common/Code/IO/FileInputStream.cpp +++ b/src/Authoring/Common/Code/IO/FileInputStream.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "FileInputStream.h" #include "IOLibraryException.h" diff --git a/src/Authoring/Common/Code/IO/FileOutputStream.cpp b/src/Authoring/Common/Code/IO/FileOutputStream.cpp index 38dd17a1..c8e25078 100644 --- a/src/Authoring/Common/Code/IO/FileOutputStream.cpp +++ b/src/Authoring/Common/Code/IO/FileOutputStream.cpp @@ -27,19 +27,12 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "FileOutputStream.h" #include "IOLibraryException.h" -#include <QByteArray> -#include <QString> +#include <QtCore/qbytearray.h> +#include <QtCore/qstring.h> CFileOutputStream::CFileOutputStream(const Q3DStudio::CString &inFilename, bool inAppend /* = false */) : m_Position(0) diff --git a/src/Authoring/Common/Code/IO/IOStreams.cpp b/src/Authoring/Common/Code/IO/IOStreams.cpp index 4f4de6b2..c82261fa 100644 --- a/src/Authoring/Common/Code/IO/IOStreams.cpp +++ b/src/Authoring/Common/Code/IO/IOStreams.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "IOStreams.h" #include "InputStream.h" #include "OutputStream.h" @@ -42,9 +35,6 @@ #include <wctype.h> #include <ctype.h> -#include <wchar.h> -#include <limits> -#include <stdlib.h> /** Create an input stream wrapper with no stream. */ diff --git a/src/Authoring/Common/Code/IO/LEndianStreams.cpp b/src/Authoring/Common/Code/IO/LEndianStreams.cpp index 8c5a61c0..98e2f1ee 100644 --- a/src/Authoring/Common/Code/IO/LEndianStreams.cpp +++ b/src/Authoring/Common/Code/IO/LEndianStreams.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" //Where the defines for big or little endian must lie +#include "Qt3DSCommonPrecompile.h" //Where the defines for big or little endian must lie #include "LEndianStreams.h" #include "IOLibraryException.h" #include "Qt3DSEndian.h" diff --git a/src/Authoring/Common/Code/IO/MemBuf.cpp b/src/Authoring/Common/Code/IO/MemBuf.cpp index 5b1a7d52..a2700bd6 100644 --- a/src/Authoring/Common/Code/IO/MemBuf.cpp +++ b/src/Authoring/Common/Code/IO/MemBuf.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include <string.h> #include "MemBuf.h" diff --git a/src/Authoring/Common/Code/IO/MemInputStream.cpp b/src/Authoring/Common/Code/IO/MemInputStream.cpp index 0d4b8da9..6c31d41c 100644 --- a/src/Authoring/Common/Code/IO/MemInputStream.cpp +++ b/src/Authoring/Common/Code/IO/MemInputStream.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include <string.h> #include "MemInputStream.h" diff --git a/src/Authoring/Common/Code/IO/MemOutputStream.cpp b/src/Authoring/Common/Code/IO/MemOutputStream.cpp index a484010f..811ee87d 100644 --- a/src/Authoring/Common/Code/IO/MemOutputStream.cpp +++ b/src/Authoring/Common/Code/IO/MemOutputStream.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include <string.h> diff --git a/src/Authoring/Common/Code/IO/Seekable.cpp b/src/Authoring/Common/Code/IO/Seekable.cpp index 8a2afb5b..c04a1621 100644 --- a/src/Authoring/Common/Code/IO/Seekable.cpp +++ b/src/Authoring/Common/Code/IO/Seekable.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Seekable.h" using namespace Q3DStudio; diff --git a/src/Authoring/Common/Code/InfoDump/CoutSink.cpp b/src/Authoring/Common/Code/InfoDump/CoutSink.cpp index b5f423df..aa7eb421 100644 --- a/src/Authoring/Common/Code/InfoDump/CoutSink.cpp +++ b/src/Authoring/Common/Code/InfoDump/CoutSink.cpp @@ -26,13 +26,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Prefixes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "CoutSink.h" -//============================================================================== /** * Ctor */ @@ -57,4 +53,4 @@ CCoutSink::~CCoutSink() void CCoutSink::Sink(const wchar_t *inStr) { std::wcout << inStr << std::endl; -}
\ No newline at end of file +} diff --git a/src/Authoring/Common/Code/InfoDump/DumpFileSink.cpp b/src/Authoring/Common/Code/InfoDump/DumpFileSink.cpp index 8068d50e..ba80e538 100644 --- a/src/Authoring/Common/Code/InfoDump/DumpFileSink.cpp +++ b/src/Authoring/Common/Code/InfoDump/DumpFileSink.cpp @@ -26,22 +26,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Prefixes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "DumpFileSink.h" - -//============================================================================== -// Includes -//============================================================================== #include <fstream> #include "StrUtilities.h" -//============================================================================== -// Ctor & Dtor -//============================================================================== -//============================================================================== /** * Ctor */ diff --git a/src/Authoring/Common/Code/InfoDump/InfoDump.cpp b/src/Authoring/Common/Code/InfoDump/InfoDump.cpp index ab055e3e..1e4cb435 100644 --- a/src/Authoring/Common/Code/InfoDump/InfoDump.cpp +++ b/src/Authoring/Common/Code/InfoDump/InfoDump.cpp @@ -27,21 +27,10 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "InfoDump.h" - -//============================================================================== -// Includes -//============================================================================== #include "InfoSink.h" -//============================================================================== -// Ctors and Dtor -//============================================================================== -//============================================================================== /** * Ctor */ diff --git a/src/Authoring/Common/Code/InfoDump/InfoSink.cpp b/src/Authoring/Common/Code/InfoDump/InfoSink.cpp index 8f056447..6623f09d 100644 --- a/src/Authoring/Common/Code/InfoDump/InfoSink.cpp +++ b/src/Authoring/Common/Code/InfoDump/InfoSink.cpp @@ -26,10 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Prefixes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "InfoSink.h" CInfoSink::CInfoSink(const long &inPriorityBits) diff --git a/src/Authoring/Common/Code/InfoDump/StrVecSink.cpp b/src/Authoring/Common/Code/InfoDump/StrVecSink.cpp index 75ca6814..8df99d48 100644 --- a/src/Authoring/Common/Code/InfoDump/StrVecSink.cpp +++ b/src/Authoring/Common/Code/InfoDump/StrVecSink.cpp @@ -26,16 +26,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Prefixes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StrVecSink.h" #include <fstream> -#include <algorithm> #include <functional> -#include <stdexcept> #include "StrUtilities.h" #include "DumpFileSink.h" @@ -321,4 +316,4 @@ void CStrVecSink::ToFile(const std::wstring &inFilename) theBuffer << *theItr << "\n"; } theFileSink.Sink(theBuffer.c_str()); -}
\ No newline at end of file +} diff --git a/src/Authoring/Common/Code/MasterP.cpp b/src/Authoring/Common/Code/MasterP.cpp index d0232f81..7dc5b705 100644 --- a/src/Authoring/Common/Code/MasterP.cpp +++ b/src/Authoring/Common/Code/MasterP.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #ifdef PERFORM_PROFILE @@ -102,4 +102,4 @@ CMethProf *CMasterProf::GetProfiler(long inIndex) return m_Profs.at(inIndex); } -#endif // #ifdef PERFORM_PROFILE
\ No newline at end of file +#endif // #ifdef PERFORM_PROFILE diff --git a/src/Authoring/Common/Code/Memory/MemoryObject.cpp b/src/Authoring/Common/Code/Memory/MemoryObject.cpp index a61a4edf..74d7d9ce 100644 --- a/src/Authoring/Common/Code/Memory/MemoryObject.cpp +++ b/src/Authoring/Common/Code/Memory/MemoryObject.cpp @@ -27,11 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "MemoryObject.h" #include "Qt3DSString.h" #include "Qt3DSFunctor.h" diff --git a/src/Authoring/Common/Code/MethProf.cpp b/src/Authoring/Common/Code/MethProf.cpp index 7cf6a269..8b8eb562 100644 --- a/src/Authoring/Common/Code/MethProf.cpp +++ b/src/Authoring/Common/Code/MethProf.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #ifdef PERFORM_PROFILE diff --git a/src/Authoring/Common/Code/Pt.cpp b/src/Authoring/Common/Code/Pt.cpp index 4baa85ba..ee17f630 100644 --- a/src/Authoring/Common/Code/Pt.cpp +++ b/src/Authoring/Common/Code/Pt.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Pt.h" // Code moved to header. diff --git a/src/Authoring/Common/Code/Qt3DSAtomic.cpp b/src/Authoring/Common/Code/Qt3DSAtomic.cpp index b996451f..34c07b4b 100644 --- a/src/Authoring/Common/Code/Qt3DSAtomic.cpp +++ b/src/Authoring/Common/Code/Qt3DSAtomic.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #ifdef WIN32 #include <winsock2.h> diff --git a/src/Authoring/Client/Code/Core/StdAfx.h b/src/Authoring/Common/Code/Qt3DSCommonPrecompile.h index 14ced92b..93f06bf2 100644 --- a/src/Authoring/Client/Code/Core/StdAfx.h +++ b/src/Authoring/Common/Code/Qt3DSCommonPrecompile.h @@ -41,6 +41,9 @@ #pragma warning(disable : 4290) // C++ Exception Specification ignored #pragma warning(disable : 4514) // unreferenced inline function #pragma warning(disable : 4819) +#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 //============================================================================== @@ -50,20 +53,7 @@ #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 +#include <wchar.h> //============================================================================== // STL Includes @@ -88,13 +78,6 @@ #endif //============================================================================== -// Memory Manager Includes -//============================================================================== -#ifdef USE_MEMORY_MANAGER -#include <mmgr.h> -#endif - -//============================================================================== // Common Player Includes //============================================================================== #include "Qt3DSMath.h" @@ -114,13 +97,7 @@ #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/Common/Code/Qt3DSFileTools.cpp b/src/Authoring/Common/Code/Qt3DSFileTools.cpp index bb5f9d1d..d1b056b2 100644 --- a/src/Authoring/Common/Code/Qt3DSFileTools.cpp +++ b/src/Authoring/Common/Code/Qt3DSFileTools.cpp @@ -27,8 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" -#include <string> +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSFileTools.h" #include "foundation/Qt3DSIntrinsics.h" #include "Qt3DSDMWStrOpsImpl.h" diff --git a/src/Authoring/Common/Code/Qt3DSId.cpp b/src/Authoring/Common/Code/Qt3DSId.cpp index 6fd32b24..62eba9c9 100644 --- a/src/Authoring/Common/Code/Qt3DSId.cpp +++ b/src/Authoring/Common/Code/Qt3DSId.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Include -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSId.h" #include "Qt3DSTime.h" diff --git a/src/Authoring/Common/Code/Qt3DSMath.cpp b/src/Authoring/Common/Code/Qt3DSMath.cpp index 2e4b35fc..02bf97f1 100644 --- a/src/Authoring/Common/Code/Qt3DSMath.cpp +++ b/src/Authoring/Common/Code/Qt3DSMath.cpp @@ -26,11 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSMath.h" //============================================================================== diff --git a/src/Authoring/Common/Code/Qt3DSMemory.cpp b/src/Authoring/Common/Code/Qt3DSMemory.cpp index d82623b0..4b274ef1 100644 --- a/src/Authoring/Common/Code/Qt3DSMemory.cpp +++ b/src/Authoring/Common/Code/Qt3DSMemory.cpp @@ -27,9 +27,8 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" -//#include <stdlib.h> #include "Qt3DSMemory.h" //#include "Qt3DSSynch.h" diff --git a/src/Authoring/Common/Code/Qt3DSMessageBox.cpp b/src/Authoring/Common/Code/Qt3DSMessageBox.cpp index 0195c03b..b802ab1c 100644 --- a/src/Authoring/Common/Code/Qt3DSMessageBox.cpp +++ b/src/Authoring/Common/Code/Qt3DSMessageBox.cpp @@ -27,17 +27,11 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSMessageBox.h" using namespace Q3DStudio; -//============================================================================== -// Includes -//============================================================================== #include "Qt3DSMessageBox.h" #include <QtWidgets/qmessagebox.h> diff --git a/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp b/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp index d6eabef6..501bb889 100644 --- a/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp +++ b/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSObjectCounter.h" TObjectCounterTracker Qt3DSObjectCounter::s_ObjectVector; diff --git a/src/Authoring/Common/Code/Qt3DSString.cpp b/src/Authoring/Common/Code/Qt3DSString.cpp index 4be3b291..ea24e97a 100644 --- a/src/Authoring/Common/Code/Qt3DSString.cpp +++ b/src/Authoring/Common/Code/Qt3DSString.cpp @@ -27,15 +27,13 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSString.h" #include "Qt3DSMath.h" #include "Qt3DSMemory.h" -#include <stdlib.h> -#include <stdio.h> #include <stdarg.h> -#include <QString> +#include <QtCore/qstring.h> namespace Q3DStudio { diff --git a/src/Authoring/Common/Code/Qt3DSString.h b/src/Authoring/Common/Code/Qt3DSString.h index 923f5c30..08adfe35 100644 --- a/src/Authoring/Common/Code/Qt3DSString.h +++ b/src/Authoring/Common/Code/Qt3DSString.h @@ -41,12 +41,10 @@ #include <string.h> #include <stdarg.h> -#include <stdlib.h> #include <ctype.h> #include <EASTL/string.h> -#include <QString> -#include <QDebug> +#include <QtCore/qstring.h> namespace Q3DStudio { #define _LSTR(string) L##string diff --git a/src/Authoring/Common/Code/Qt3DSTime.cpp b/src/Authoring/Common/Code/Qt3DSTime.cpp index 01a36775..2bf85090 100644 --- a/src/Authoring/Common/Code/Qt3DSTime.cpp +++ b/src/Authoring/Common/Code/Qt3DSTime.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSTime.h" #ifdef WIN32 diff --git a/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp b/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp index 45425adb..d7f6a877 100644 --- a/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp +++ b/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "FormattedInputStream.h" #include "Qt3DSEndian.h" #include "FileOutputStream.h" diff --git a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp index 9f19490e..060fb4e9 100644 --- a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp +++ b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSEndian.h" #include "FormattedOutputStream.h" diff --git a/src/Authoring/Common/Code/Serialize/PreferencesSerializer.cpp b/src/Authoring/Common/Code/Serialize/PreferencesSerializer.cpp index 1ed7bc55..7272feeb 100644 --- a/src/Authoring/Common/Code/Serialize/PreferencesSerializer.cpp +++ b/src/Authoring/Common/Code/Serialize/PreferencesSerializer.cpp @@ -26,10 +26,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "PreferencesSerializer.h" -#include <QDir> +#include <QtCore/qdir.h> CPreferencesSerializer::CPreferencesSerializer() : m_FileSet(false) diff --git a/src/Authoring/Common/Code/StackTokenizer.cpp b/src/Authoring/Common/Code/StackTokenizer.cpp index 3e37fac9..59c58c78 100644 --- a/src/Authoring/Common/Code/StackTokenizer.cpp +++ b/src/Authoring/Common/Code/StackTokenizer.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "StackTokenizer.h" using namespace Q3DStudio; diff --git a/src/Authoring/Common/Code/StrUtilities.cpp b/src/Authoring/Common/Code/StrUtilities.cpp index 1c725952..ea5d7e0f 100644 --- a/src/Authoring/Common/Code/StrUtilities.cpp +++ b/src/Authoring/Common/Code/StrUtilities.cpp @@ -26,17 +26,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -//============================================================================== -// Prefixes -//============================================================================== -#include "stdafx.h" + +#include "Qt3DSCommonPrecompile.h" #include "StrUtilities.h" -#include <wchar.h> -#include <stdio.h> -//============================================================================== -// Internal Helper -//============================================================================== -//============================================================================== + /** * @class CConvertStr * diff --git a/src/Authoring/Common/Code/StringTokenizer.cpp b/src/Authoring/Common/Code/StringTokenizer.cpp index a3b9520f..f7a7e410 100644 --- a/src/Authoring/Common/Code/StringTokenizer.cpp +++ b/src/Authoring/Common/Code/StringTokenizer.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "StringTokenizer.h" using namespace Q3DStudio; @@ -122,4 +115,4 @@ Q3DStudio::CString CStringTokenizer::GetCurrentPartition() bool CStringTokenizer::HasNextPartition() { return (m_Index != Q3DStudio::CString::ENDOFSTRING); -}
\ No newline at end of file +} diff --git a/src/Authoring/Common/Code/Thread/Mutex.cpp b/src/Authoring/Common/Code/Thread/Mutex.cpp index 1130c5a9..0b8f106d 100644 --- a/src/Authoring/Common/Code/Thread/Mutex.cpp +++ b/src/Authoring/Common/Code/Thread/Mutex.cpp @@ -26,26 +26,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Mutex.h" - -#ifdef KDAB_TEMPORARILY_REMOVED -//============================================================================= -/** THIS IS BAD DUE TO CLOSING THE MUTEX ON DESTROY - */ -CMutex::CMutex(const CMutex &inMutex) -{ - m_Mutex = inMutex.m_Mutex; -} - -//============================================================================= -/** THIS IS BAD DUE TO CLOSING THE MUTEX ON DESTROY - */ -CMutex &CMutex::operator=(const CMutex &inMutex) -{ - if (&inMutex == this) - return *this; - m_Mutex = inMutex.m_Mutex; - return *this; -} -#endif diff --git a/src/Authoring/Common/Code/Thread/Thread.cpp b/src/Authoring/Common/Code/Thread/Thread.cpp index 2c0e1b8f..bda2eee5 100644 --- a/src/Authoring/Common/Code/Thread/Thread.cpp +++ b/src/Authoring/Common/Code/Thread/Thread.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Thread.h" #include "ThreadException.h" diff --git a/src/Authoring/Common/Code/_Win32/FileIterator.cpp b/src/Authoring/Common/Code/_Win32/FileIterator.cpp index 3084b9f4..2bb35150 100644 --- a/src/Authoring/Common/Code/_Win32/FileIterator.cpp +++ b/src/Authoring/Common/Code/_Win32/FileIterator.cpp @@ -27,18 +27,11 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "FileIterator.h" #include "Qt3DSFile.h" -#include <QDirIterator> +#include <QtCore/qdiriterator.h> using namespace Q3DStudio; diff --git a/src/Authoring/Common/Code/_Win32/Preferences.cpp b/src/Authoring/Common/Code/_Win32/Preferences.cpp index 35558b75..9cd124c9 100644 --- a/src/Authoring/Common/Code/_Win32/Preferences.cpp +++ b/src/Authoring/Common/Code/_Win32/Preferences.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Preferences.h" #include "PreferencesSerializer.h" #include "StringTokenizer.h" diff --git a/src/Authoring/Common/Code/_Win32/stdafx.cpp b/src/Authoring/Common/Code/_Win32/stdafx.cpp deleted file mode 100644 index 9db65ab7..00000000 --- a/src/Authoring/Common/Code/_Win32/stdafx.cpp +++ /dev/null @@ -1,36 +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 -// CommonLibProject.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Authoring/Common/Code/_Win32/stdafx.h b/src/Authoring/Common/Code/_Win32/stdafx.h deleted file mode 100644 index b58d9b85..00000000 --- a/src/Authoring/Common/Code/_Win32/stdafx.h +++ /dev/null @@ -1,84 +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$ -** -****************************************************************************/ - -//============================================================================== -// CommonLib 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 : 4127) // conditional expression is constant -#pragma warning(disable : 4819) -#endif - -//============================================================================== -// Common Includes -#include <stdio.h> // Standard includes MUST come first -#include <stdlib.h> -#include <wchar.h> - -//============================================================================== -// 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 - -//============================================================================== -// Common Player Includes -#include "PlatformTypes.h" -#include "PlatformStrings.h" -#include "Qt3DSMath.h" -#include "Qt3DSObjectCounter.h" -#include "Qt3DSString.h" -#include "STLHelpers.h" - -#include <QtGlobal> -#endif diff --git a/src/Authoring/Common/Common.pro b/src/Authoring/Common/Common.pro index 1ef1cfc2..2231563a 100644 --- a/src/Authoring/Common/Common.pro +++ b/src/Authoring/Common/Common.pro @@ -22,6 +22,8 @@ INCLUDEPATH += \ Code/_Win32/Include \ Code/Report \ Code/Serialize \ + ../Client/Code/Shared \ + ../Client/Code/Core/Utility \ ../QT3DSDM \ ../QT3DSDM/Systems \ ../../Runtime/Source/Qt3DSFoundation/Include \ @@ -30,7 +32,7 @@ INCLUDEPATH += \ ../../3rdparty/color \ .. -PRECOMPILED_HEADER += Code/_Win32/stdafx.h +PRECOMPILED_HEADER += Code/Qt3DSCommonPrecompile.h SOURCES += \ ../../3rdparty/color/CColor.cpp \ @@ -55,7 +57,6 @@ SOURCES += \ Code/Exceptions/XMLException.cpp \ Code/_Win32/FileIterator.cpp \ Code/_Win32/Preferences.cpp \ - Code/_Win32/stdafx.cpp \ Code/_Win32/Qt3DSFile.cpp \ Code/Graph/Graph.cpp \ Code/InfoDump/CoutSink.cpp \ diff --git a/src/Authoring/CoreLib/CoreLib.pro b/src/Authoring/CoreLib/CoreLib.pro index 2233a902..d1df2f6e 100644 --- a/src/Authoring/CoreLib/CoreLib.pro +++ b/src/Authoring/CoreLib/CoreLib.pro @@ -65,10 +65,9 @@ INCLUDEPATH += \ ../../3rdparty/color \ .. -PRECOMPILED_HEADER = ../Client/Code/Core/StdAfx.h +PRECOMPILED_HEADER = ../Common/Code/Qt3DSCommonPrecompile.h SOURCES += \ - ../Client/Code/Core/StdAfx.cpp \ ../Client/Code/Core/Q3DStudioNVFoundation.cpp \ ../Client/Code/Core/Types/BoundingBox.cpp \ ../Client/Code/Core/Types/CachedMatrix.cpp \ @@ -116,7 +115,6 @@ SOURCES += \ ../Client/Code/Core/VirtualAssets/VClockPolicy.cpp \ ../QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp \ ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp \ - ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.cpp \ ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp \ ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshBuilder.cpp \ ../QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp \ diff --git a/src/Authoring/QT3DSDM/QT3DSDM.pro b/src/Authoring/QT3DSDM/QT3DSDM.pro index 159ea68b..63e1a824 100644 --- a/src/Authoring/QT3DSDM/QT3DSDM.pro +++ b/src/Authoring/QT3DSDM/QT3DSDM.pro @@ -27,7 +27,6 @@ PRECOMPILED_HEADER = Qt3DSDMPrefix.h SOURCES += \ EASTL_new.cpp \ - Qt3DSDMPrefix.cpp \ Systems/ActionSystem.cpp \ Systems/SignalsImpl.cpp \ Systems/SlideSystem.cpp \ diff --git a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp b/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp deleted file mode 100644 index a665c033..00000000 --- a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 NVIDIA Corporation. -** 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 -// DataModel.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "Qt3DSDMPrefix.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h b/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h index 38d20815..4164d646 100644 --- a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h +++ b/src/Authoring/QT3DSDM/Qt3DSDMPrefix.h @@ -27,11 +27,6 @@ ** ****************************************************************************/ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - #ifdef __cplusplus #pragma once diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp index d997e165..a63dce75 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp +++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp @@ -26,10 +26,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "Qt3DSImportLibPrecompile.h" #include "Qt3DSImport.h" #include "Qt3DSImportImpl.h" -#include <algorithm> #include "Qt3DSFileTools.h" #include "Qt3DSDMComposerTypeDefinitions.h" #include "Qt3DSDMXML.h" diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h index 80462366..dbebe4dd 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h +++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h @@ -35,7 +35,6 @@ #include "Qt3DSImportPerformImport.h" #include "Qt3DSDMStringTable.h" #include "Qt3DSImportComposerTypes.h" -#include <string> namespace qt3dsimp { using namespace std; diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.cpp deleted file mode 100644 index acf516ee..00000000 --- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 NVIDIA Corporation. -** 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 -// UICImportLib.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "Qt3DSImportLibPrecompile.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h index 82b2734a..34da79d0 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h +++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportLibPrecompile.h @@ -27,18 +27,8 @@ ** ****************************************************************************/ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - #pragma once -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT \ - 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - #include "foundation/Qt3DS.h" #include "foundation/Qt3DSDataRef.h" #include "foundation/Qt3DSOption.h" @@ -52,10 +42,6 @@ #include <sstream> #include <fstream> #include "Qt3DSDMDataTypes.h" -#ifdef _WIN32 -#include <winsock2.h> -#include <windows.h> -#endif #include "foundation/Qt3DSIntrinsics.h" #include "foundation/Qt3DSBasicTemplates.h" diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp index e88d3c7d..7f5c4940 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp +++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "dae.h" #include "dom/domCOLLADA.h" #include "dom/domConstants.h" diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp index 6f0aacc5..e756e2a7 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp +++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp @@ -31,7 +31,7 @@ #ifdef QT_3DSTUDIO_FBX -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #define FBXSDK_NEW_API 1 diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp index 94d1c5c2..eb8b8be1 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp +++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSImportSceneGraphTranslation.h" #include "Qt3DSImportImpl.h" #include "Qt3DSImportMesh.h" @@ -43,7 +40,7 @@ #include "Qt3DSImportComposerTypes.h" #include "CommonConstants.h" -#include <QString> +#include <QtCore/qstring.h> using namespace qt3dsimp; diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.cpp deleted file mode 100644 index 7d91494b..00000000 --- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.cpp +++ /dev/null @@ -1,36 +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 -// UICImportSGTranslation.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.h b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.h deleted file mode 100644 index cb7835e8..00000000 --- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/stdafx.h +++ /dev/null @@ -1,67 +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.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#include <QtGlobal> - -#ifdef WIN32 - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT \ - 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#endif - -#ifndef _WIN32 -typedef void *HANDLE; -#endif - -#include <assert.h> -#ifndef ASSERT -#define ASSERT(a) assert(a) -#endif - -#ifdef WIN32 -#pragma warning(disable : 4819) -#endif -#include "Qt3DSImportLibPrecompile.h" -#include "PlatformTypes.h" - -#define SAFE_DELETE(ptr) \ - if ((ptr) != NULL) { \ - delete (ptr); \ - (ptr) = NULL; \ - } -// TODO: reference additional headers your program requires here diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.cpp deleted file mode 100644 index 129378bc..00000000 --- a/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.cpp +++ /dev/null @@ -1,36 +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 -// UICImportStudioLib.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.h b/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.h deleted file mode 100644 index 20bfb489..00000000 --- a/src/Authoring/QT3DSIMP/Qt3DSImportStudioLib/stdafx.h +++ /dev/null @@ -1,45 +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.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT \ - 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -#include "Qt3DSImportLibPrecompile.h" - -// TODO: reference additional headers your program requires here diff --git a/src/Authoring/Studio/Application/MsgRouter.cpp b/src/Authoring/Studio/Application/MsgRouter.cpp index 4ce57cc8..b4d52eb6 100644 --- a/src/Authoring/Studio/Application/MsgRouter.cpp +++ b/src/Authoring/Studio/Application/MsgRouter.cpp @@ -27,21 +27,14 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "MsgRouter.h" #include "StudioConst.h" #include "Core.h" #include "Doc.h" #include "Views.h" -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> static std::unique_ptr<CMsgRouter> static_theInstance; diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index fd0f9f76..f60aa4ff 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #ifdef _WIN32 #pragma warning(disable : 4100) // unreferenced formal parameter diff --git a/src/Authoring/Studio/Controls/AppFonts.cpp b/src/Authoring/Studio/Controls/AppFonts.cpp index abff4573..6b491cf1 100644 --- a/src/Authoring/Studio/Controls/AppFonts.cpp +++ b/src/Authoring/Studio/Controls/AppFonts.cpp @@ -27,20 +27,10 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== - -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== - +#include "Qt3DSCommonPrecompile.h" #include "AppFonts.h" #include "StudioPreferences.h" -//============================================================================= /** * Constructor for a CAppFonts object. */ diff --git a/src/Authoring/Studio/Controls/BufferedRenderer.cpp b/src/Authoring/Studio/Controls/BufferedRenderer.cpp index 34076704..5a97f0d3 100644 --- a/src/Authoring/Studio/Controls/BufferedRenderer.cpp +++ b/src/Authoring/Studio/Controls/BufferedRenderer.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "BufferedRenderer.h" #include "AppFonts.h" diff --git a/src/Authoring/Studio/Controls/Control.cpp b/src/Authoring/Studio/Controls/Control.cpp index 171c9b3b..488e4962 100644 --- a/src/Authoring/Studio/Controls/Control.cpp +++ b/src/Authoring/Studio/Controls/Control.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Control.h" #include "Renderer.h" diff --git a/src/Authoring/Studio/Controls/ControlData.cpp b/src/Authoring/Studio/Controls/ControlData.cpp index edd23473..43ceb041 100644 --- a/src/Authoring/Studio/Controls/ControlData.cpp +++ b/src/Authoring/Studio/Controls/ControlData.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ControlData.h" #include "ControlGraph.h" #include "Control.h" diff --git a/src/Authoring/Studio/Controls/ControlGraph.cpp b/src/Authoring/Studio/Controls/ControlGraph.cpp index 912bd1a0..34b59b7c 100644 --- a/src/Authoring/Studio/Controls/ControlGraph.cpp +++ b/src/Authoring/Studio/Controls/ControlGraph.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ControlGraph.h" #include "GraphImpl.h" #include "foundation/Qt3DSAssert.h" diff --git a/src/Authoring/Studio/Controls/OffscreenRenderer.cpp b/src/Authoring/Studio/Controls/OffscreenRenderer.cpp index 72a5f17b..e30797f7 100644 --- a/src/Authoring/Studio/Controls/OffscreenRenderer.cpp +++ b/src/Authoring/Studio/Controls/OffscreenRenderer.cpp @@ -27,18 +27,10 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "OffscreenRenderer.h" #include "AppFonts.h" -//============================================================================= /** * Constructor: Overrides a protected constructor on the base class. Sets up * all the requirements so that this renderer is valid. diff --git a/src/Authoring/Studio/Controls/Renderer.cpp b/src/Authoring/Studio/Controls/Renderer.cpp index 1a750196..5b0a6296 100644 --- a/src/Authoring/Studio/Controls/Renderer.cpp +++ b/src/Authoring/Studio/Controls/Renderer.cpp @@ -27,12 +27,12 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Renderer.h" -#include <QPoint> -#include <QRect> +#include <QtCore/qpoint.h> +#include <QtCore/qrect.h> /** * Draws the outline of a rectangle in the specified colors. diff --git a/src/Authoring/Studio/Controls/WinRenderer.cpp b/src/Authoring/Studio/Controls/WinRenderer.cpp index a93d79a5..1fd98734 100644 --- a/src/Authoring/Studio/Controls/WinRenderer.cpp +++ b/src/Authoring/Studio/Controls/WinRenderer.cpp @@ -27,11 +27,10 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "WinRenderer.h" #include "MasterP.h" -#include <math.h> #include "CoreUtils.h" //============================================================================= diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp index a29fb89f..994942de 100644 --- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "BasicObjectDropSource.h" #include "Doc.h" #include "DropTarget.h" @@ -55,7 +48,7 @@ #include "HotKeys.h" #include "StudioUtils.h" -#include <QDir> +#include <QtCore/qdir.h> //=============================================================================== /** diff --git a/src/Authoring/Studio/DragAndDrop/DropContainer.cpp b/src/Authoring/Studio/DragAndDrop/DropContainer.cpp index d84f4307..9b1d4612 100644 --- a/src/Authoring/Studio/DragAndDrop/DropContainer.cpp +++ b/src/Authoring/Studio/DragAndDrop/DropContainer.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioApp.h" #include "DropContainer.h" #include "HotKeys.h" diff --git a/src/Authoring/Studio/DragAndDrop/DropProxy.cpp b/src/Authoring/Studio/DragAndDrop/DropProxy.cpp index f0ab1aea..99a1e0c8 100644 --- a/src/Authoring/Studio/DragAndDrop/DropProxy.cpp +++ b/src/Authoring/Studio/DragAndDrop/DropProxy.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "HotKeys.h" #include "DropProxy.h" #include "DropContainer.h" @@ -43,8 +36,8 @@ #include "Qt3DSString.h" #include "IDragable.h" -#include <QDragEnterEvent> -#include <QWidget> +#include <QtGui/qevent.h> +#include <QtWidgets/qwidget.h> //============================================================================= /** diff --git a/src/Authoring/Studio/DragAndDrop/DropSource.cpp b/src/Authoring/Studio/DragAndDrop/DropSource.cpp index ee1f003a..5b6886d1 100644 --- a/src/Authoring/Studio/DragAndDrop/DropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/DropSource.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "DropTarget.h" #include "StudioObjectTypes.h" #include "HotKeys.h" diff --git a/src/Authoring/Studio/DragAndDrop/DropTarget.cpp b/src/Authoring/Studio/DragAndDrop/DropTarget.cpp index af132f12..611f242d 100644 --- a/src/Authoring/Studio/DragAndDrop/DropTarget.cpp +++ b/src/Authoring/Studio/DragAndDrop/DropTarget.cpp @@ -27,11 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== - -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioApp.h" #include "Core.h" #include "Doc.h" diff --git a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp index 0d9c10b7..a4f3e63e 100644 --- a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== - -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "qtAuthoring-config.h" #include "ExplorerFileDropSource.h" #include "Dialogs.h" diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp index 02ee8ba8..8e0fe8c8 100644 --- a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== - -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Dialogs.h" #include "FileDropSource.h" #include "DropTarget.h" diff --git a/src/Authoring/Studio/DragAndDrop/ProjectDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/ProjectDropTarget.cpp index 1edac4a6..a6b2c428 100644 --- a/src/Authoring/Studio/DragAndDrop/ProjectDropTarget.cpp +++ b/src/Authoring/Studio/DragAndDrop/ProjectDropTarget.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "qtAuthoring-config.h" #include "ProjectDropTarget.h" #include "DropSource.h" @@ -94,7 +94,7 @@ bool CProjectDropTarget::Drop(CDropSource &inSource) m_TargetDir = m_TargetDir.GetDirectory(); // Sanity check - ASSERT(m_TargetDir.IsDirectory()); + Q_ASSERT(m_TargetDir.IsDirectory()); // Get the Source file to be copied CExplorerFileDropSource *theFileDropSource = @@ -149,8 +149,8 @@ bool CProjectDropTarget::Drop(CDropSource &inSource) m_TargetDir, CFilePath::GetAbsolutePath(theSourceFile)); // Sanity check - ASSERT(theCopyResult.m_Error == Q3DStudio::FileErrorCodes::NoError); - ASSERT(theCopyResult.m_DestFilename.Exists()); + Q_ASSERT(theCopyResult.m_Error == Q3DStudio::FileErrorCodes::NoError); + Q_ASSERT(theCopyResult.m_DestFilename.Exists()); // For effect and custom material files, automatically copy related resources if (CDialogs::IsEffectFileExtension(theExtension) @@ -161,7 +161,7 @@ bool CProjectDropTarget::Drop(CDropSource &inSource) if (theShaderFile.GetExtension() != "effect" && theShaderFile.GetExtension() != "material") { - ASSERT(false); // what file is this? + Q_ASSERT(false); // what file is this? } else { } diff --git a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp index b0901dcd..3062ba30 100644 --- a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp +++ b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "SceneDropTarget.h" #include "DropTarget.h" #include "DropSource.h" diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp index 7779f950..765db415 100644 --- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "TimelineDropSource.h" #include "FileDropSource.h" #include "Dispatch.h" diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp index 94ba3c49..f0dc9c85 100644 --- a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp +++ b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== - -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "TimelineDropTarget.h" #include "StudioApp.h" #include "DropSource.h" diff --git a/src/Authoring/Studio/Palettes/Action/ActionContextMenu.cpp b/src/Authoring/Studio/Palettes/Action/ActionContextMenu.cpp index 5f17f8bc..1e194d79 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionContextMenu.cpp +++ b/src/Authoring/Studio/Palettes/Action/ActionContextMenu.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ActionContextMenu.h" #include "StudioClipboard.h" diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp index 63ed714d..ac9c8986 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp +++ b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp @@ -28,7 +28,7 @@ #include "ActionModel.h" -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ClientDataModelBridge.h" #include "CmdDataModelActionSetValue.h" #include "Core.h" diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h index 42d2b3be..cbb47b99 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.h +++ b/src/Authoring/Studio/Palettes/Action/ActionView.h @@ -29,12 +29,12 @@ #ifndef ACTIONVIEW_H #define ACTIONVIEW_H -#include <QQuickWidget> -#include <QColor> -#include <QPointer> -#include <QTimer> +#include <QtQuickWidgets/qquickwidget.h> +#include <QtGui/qcolor.h> +#include <QtCore/qpointer.h> +#include <QtCore/qtimer.h> -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "DispatchListeners.h" #include "EventsBrowserView.h" #include "EventsModel.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp index 92e5a516..a3e7f790 100644 --- a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp @@ -25,9 +25,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QSet> +#include <QtCore/qset.h> -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ChooserModelBase.h" #include "Core.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/EasyInspectorGroup.cpp b/src/Authoring/Studio/Palettes/Inspector/EasyInspectorGroup.cpp index 44b89904..a954637e 100644 --- a/src/Authoring/Studio/Palettes/Inspector/EasyInspectorGroup.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/EasyInspectorGroup.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "EasyInspectorGroup.h" //============================================================================== diff --git a/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp index 989320cc..82d14319 100644 --- a/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "GuideInspectable.h" #include "InspectableBase.h" #include "Core.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectableBase.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectableBase.cpp index 1c33eb23..2b12fda6 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectableBase.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectableBase.cpp @@ -27,12 +27,5 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "InspectableBase.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp index a29920d9..05e35e1e 100644 --- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMInspectable.h" #include "Qt3DSDMInspectorGroup.h" #include "Qt3DSDMInspectorRow.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp index dc12bc8c..3cc9e5ff 100644 --- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMInspectorGroup.h" #include "Qt3DSDMInspectorRow.h" #include "Qt3DSDMInspectable.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.cpp index df84c0ed..b71d515b 100644 --- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.cpp @@ -26,11 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMInspectorRow.h" #include "Qt3DSDMMetaData.h" #include "Doc.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp index 3cfb74c3..45d3a105 100644 --- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMMaterialInspectable.h" #include "Qt3DSDMInspectorGroup.h" #include "Qt3DSDMInspectorRow.h" diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.cpp index f829e24c..7c4c7640 100644 --- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "Qt3DSDMSceneInspectable.h" #include "Core.h" #include "Doc.h" diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp index 9aa100de..4ddd6344 100644 --- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp +++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp @@ -28,7 +28,7 @@ #include "qtAuthoring-config.h" #include <QtCore/qset.h> -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ProjectFileSystemModel.h" #include "StudioUtils.h" #include "StudioApp.h" @@ -415,7 +415,7 @@ void ProjectFileSystemModel::importUrl(const QDir &targetDir, const QUrl &url) c // FindAndCopyDestFile will make sure the file name is unique and make sure it is // not read only. bool copyResult = SFileTools::FindAndCopyDestFile(targetDir, sourceFile); - ASSERT(copyResult); + Q_ASSERT(copyResult); // For effect and custom material files, automatically copy related resources if (CDialogs::IsEffectFileExtension(extension.toLatin1().data()) 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( diff --git a/src/Authoring/Studio/PreviewHelper.cpp b/src/Authoring/Studio/PreviewHelper.cpp index 7e78cd9a..6e9bdc45 100644 --- a/src/Authoring/Studio/PreviewHelper.cpp +++ b/src/Authoring/Studio/PreviewHelper.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "PreviewHelper.h" #include "StudioApp.h" #include "Dialogs.h" diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro index 76a94f44..cec3465d 100644 --- a/src/Authoring/Studio/Qt3DStudio.pro +++ b/src/Authoring/Studio/Qt3DStudio.pro @@ -108,7 +108,7 @@ linux { -lEGL } -win: PRECOMPILED_HEADER = Studio/stdafx.h +win: PRECOMPILED_HEADER = ../Common/Code/Qt3DSCommonPrecompile.h HEADERS += \ MainFrm.h \ diff --git a/src/Authoring/Studio/Render/PathWidget.cpp b/src/Authoring/Studio/Render/PathWidget.cpp index 5dbc9854..90b82205 100644 --- a/src/Authoring/Studio/Render/PathWidget.cpp +++ b/src/Authoring/Studio/Render/PathWidget.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "PathWidget.h" #include "Qt3DSRenderWidgets.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioGradientWidget.cpp b/src/Authoring/Studio/Render/StudioGradientWidget.cpp index d266ec40..d3adcf0b 100644 --- a/src/Authoring/Studio/Render/StudioGradientWidget.cpp +++ b/src/Authoring/Studio/Render/StudioGradientWidget.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioGradientWidget.h" namespace qt3ds { diff --git a/src/Authoring/Studio/Render/StudioGradientWidget.h b/src/Authoring/Studio/Render/StudioGradientWidget.h index f2ad30f2..0fd71c89 100644 --- a/src/Authoring/Studio/Render/StudioGradientWidget.h +++ b/src/Authoring/Studio/Render/StudioGradientWidget.h @@ -29,7 +29,7 @@ #ifndef STUDIO_GRADIENT_WIDGET_H #define STUDIO_GRADIENT_WIDGET_H -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidgetImpl.h" #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index dce48f51..2fda6c90 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioRendererImpl.h" #include "StudioRendererTranslation.h" #include "StudioPreferences.h" @@ -34,7 +34,7 @@ #include "StudioUtils.h" #include "Qt3DSMath.h" -#include <QDebug> +#include <QtCore/qdebug.h> #ifdef _WIN32 #pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp index 82e943e0..951e7216 100644 --- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp +++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioRendererImpl.h" #include "StudioRendererTranslation.h" #include "Qt3DSRenderEffectSystem.h" diff --git a/src/Authoring/Studio/Render/StudioRotationWidget.cpp b/src/Authoring/Studio/Render/StudioRotationWidget.cpp index fca87b80..81862a22 100644 --- a/src/Authoring/Studio/Render/StudioRotationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioRotationWidget.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidgetImpl.h" #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioScaleWidget.cpp b/src/Authoring/Studio/Render/StudioScaleWidget.cpp index c8fa6948..37fe20ec 100644 --- a/src/Authoring/Studio/Render/StudioScaleWidget.cpp +++ b/src/Authoring/Studio/Render/StudioScaleWidget.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidgetImpl.h" #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp index 628f6ef1..2be81181 100644 --- a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp +++ b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidgetImpl.h" #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioVisualAidWidget.cpp b/src/Authoring/Studio/Render/StudioVisualAidWidget.cpp index 4a66d46f..42c6c226 100644 --- a/src/Authoring/Studio/Render/StudioVisualAidWidget.cpp +++ b/src/Authoring/Studio/Render/StudioVisualAidWidget.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidgetImpl.h" #include "foundation/Qt3DSAtomic.h" #include "render/Qt3DSRenderContext.h" diff --git a/src/Authoring/Studio/Render/StudioWidget.cpp b/src/Authoring/Studio/Render/StudioWidget.cpp index e1dd4b89..cccce4d4 100644 --- a/src/Authoring/Studio/Render/StudioWidget.cpp +++ b/src/Authoring/Studio/Render/StudioWidget.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioWidget.h" #include "Qt3DSRenderWidgets.h" #include "Qt3DSRenderContextCore.h" diff --git a/src/Authoring/Studio/Render/WGLRenderContext.cpp b/src/Authoring/Studio/Render/WGLRenderContext.cpp index 1df49bda..f9e6aa86 100644 --- a/src/Authoring/Studio/Render/WGLRenderContext.cpp +++ b/src/Authoring/Studio/Render/WGLRenderContext.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================= -// Includes -//============================================================================= -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "WGLRenderContext.h" #include "foundation/TrackingAllocator.h" @@ -41,7 +38,7 @@ #include <QtGui/QOpenGLContext> #include <QtGui/QSurfaceFormat> -#include <QOpenGLWidget> +#include <QtWidgets/qopenglwidget.h> //QT3DS_DEFINE_THISFILE; diff --git a/src/Authoring/Studio/UI/EditCameraBar.cpp b/src/Authoring/Studio/UI/EditCameraBar.cpp index d4b2a099..eeefbbdc 100644 --- a/src/Authoring/Studio/UI/EditCameraBar.cpp +++ b/src/Authoring/Studio/UI/EditCameraBar.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "EditCameraBar.h" #include "MainFrm.h" #include "SceneView.h" @@ -161,7 +154,7 @@ void CEditCameraBar::HandleCameraChanged(int inIndex) m_SceneView->onEditCameraChanged(); CMainFrame *theMainFrame = g_StudioApp.m_pMainWnd; - ASSERT(theMainFrame != nullptr); + Q_ASSERT(theMainFrame != nullptr); // if the current tool is camera rotate and has been switch to 2d camera // set the tool to camera pan diff --git a/src/Authoring/Studio/UI/EditorPane.cpp b/src/Authoring/Studio/UI/EditorPane.cpp index ef274392..4b87300d 100644 --- a/src/Authoring/Studio/UI/EditorPane.cpp +++ b/src/Authoring/Studio/UI/EditorPane.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "EditorPane.h" //============================================================================== @@ -87,4 +80,4 @@ CAsset *CEditorPane::GetEditObject() bool CEditorPane::CloseEditor() { return false; -}
\ No newline at end of file +} diff --git a/src/Authoring/Studio/UI/GLVersionDlg.cpp b/src/Authoring/Studio/UI/GLVersionDlg.cpp index e7cc3b92..6ecce324 100644 --- a/src/Authoring/Studio/UI/GLVersionDlg.cpp +++ b/src/Authoring/Studio/UI/GLVersionDlg.cpp @@ -27,10 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Includes -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "GLVersionDlg.h" #include "ui_GLVersionDlg.h" diff --git a/src/Authoring/Studio/UI/InterpolationDlg.cpp b/src/Authoring/Studio/UI/InterpolationDlg.cpp index 57d6ae1d..f1c0070e 100644 --- a/src/Authoring/Studio/UI/InterpolationDlg.cpp +++ b/src/Authoring/Studio/UI/InterpolationDlg.cpp @@ -27,15 +27,10 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix / Includes -//============================================================================== - -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "InterpolationDlg.h" #include "ui_InterpolationDlg.h" -//============================================================================== /** * Constructor: Creates a CInterpolationDlg. * diff --git a/src/Authoring/Studio/UI/PlayerContainerWnd.cpp b/src/Authoring/Studio/UI/PlayerContainerWnd.cpp index a5ae75b0..231738de 100644 --- a/src/Authoring/Studio/UI/PlayerContainerWnd.cpp +++ b/src/Authoring/Studio/UI/PlayerContainerWnd.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "SceneView.h" #include "Doc.h" #include "StudioProjectSettings.h" diff --git a/src/Authoring/Studio/UI/PlayerWnd.cpp b/src/Authoring/Studio/UI/PlayerWnd.cpp index ba8c25d6..dfa174fe 100644 --- a/src/Authoring/Studio/UI/PlayerWnd.cpp +++ b/src/Authoring/Studio/UI/PlayerWnd.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "PlayerWnd.h" #include "MainFrm.h" #include "SceneView.h" diff --git a/src/Authoring/Studio/UI/RecentItems.cpp b/src/Authoring/Studio/UI/RecentItems.cpp index e7497d40..9b7acd7e 100644 --- a/src/Authoring/Studio/UI/RecentItems.cpp +++ b/src/Authoring/Studio/UI/RecentItems.cpp @@ -27,12 +27,12 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "RecentItems.h" #include "Preferences.h" -#include <QMenu> +#include <QtWidgets/qmenu.h> // using namespace Q3DStudio; <-- Do not do this here because it will conflict with CList and make // the template generator go blah diff --git a/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp b/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp index 26204474..74345832 100644 --- a/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp +++ b/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp @@ -30,12 +30,12 @@ //============================================================================== // Includes //============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ResetKeyframeValuesDlg.h" #include "ui_ResetKeyframeValuesDlg.h" -#include <QPushButton> -#include <QStyle> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qstyle.h> CResetKeyframeValuesDlg::CResetKeyframeValuesDlg(QWidget *pParent) : QDialog(pParent) diff --git a/src/Authoring/Studio/UI/StartupDlg.cpp b/src/Authoring/Studio/UI/StartupDlg.cpp index 59b29a1b..b607a59b 100644 --- a/src/Authoring/Studio/UI/StartupDlg.cpp +++ b/src/Authoring/Studio/UI/StartupDlg.cpp @@ -27,16 +27,8 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "StudioDefs.h" - -//============================================================================== -// Includes -//============================================================================== - #include "StartupDlg.h" #include "StudioPreferences.h" #include "ui_StartupDlg.h" diff --git a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp index 9dcb616c..f90fd8fe 100644 --- a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp +++ b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp @@ -27,17 +27,8 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== - -#include "stdafx.h" - +#include "Qt3DSCommonPrecompile.h" #include "ui_StudioProjectSettingsPage.h" - -//============================================================================== -// Includes -//============================================================================== #include "StudioProjectSettingsPage.h" #include "StudioProjectSettings.h" #include "StudioApp.h" diff --git a/src/Authoring/Studio/Utils/ImportUtils.cpp b/src/Authoring/Studio/Utils/ImportUtils.cpp index 44b5f134..3d672946 100644 --- a/src/Authoring/Studio/Utils/ImportUtils.cpp +++ b/src/Authoring/Studio/Utils/ImportUtils.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ImportUtils.h" #include "Dialogs.h" #include "Qt3DSFileTools.h" diff --git a/src/Authoring/Studio/Utils/MouseCursor.cpp b/src/Authoring/Studio/Utils/MouseCursor.cpp index 65452611..f8fdc83c 100644 --- a/src/Authoring/Studio/Utils/MouseCursor.cpp +++ b/src/Authoring/Studio/Utils/MouseCursor.cpp @@ -27,21 +27,10 @@ ** ****************************************************************************/ -// WIN32 VERSION - -//============================================================================= -// Prefix -//============================================================================= -#include "stdafx.h" - -//============================================================================= -// Includes -//============================================================================= +#include "Qt3DSCommonPrecompile.h" #include "MouseCursor.h" -#include <QPixmap> -#include <QDebug> +#include <QtGui/qpixmap.h> -//#ifdef WIN32 const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_ARROW = 0; // IDC_ARROW const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_WAIT = 1; // IDC_WAIT const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_RESIZE_LEFTRIGHT = 2; // IDC_SIZEWE diff --git a/src/Authoring/Studio/Utils/ResourceCache.cpp b/src/Authoring/Studio/Utils/ResourceCache.cpp index e42e1571..a4d4ea98 100644 --- a/src/Authoring/Studio/Utils/ResourceCache.cpp +++ b/src/Authoring/Studio/Utils/ResourceCache.cpp @@ -27,19 +27,12 @@ ** ****************************************************************************/ -//============================================================================= -// Prefix -//============================================================================= -#include "stdafx.h" - -//============================================================================= -// Includes -//============================================================================= +#include "Qt3DSCommonPrecompile.h" #include "ResourceCache.h" #include "MouseCursor.h" #include "StudioUtils.h" -#include <QUrl> +#include <QtCore/qurl.h> //============================================================================= /** diff --git a/src/Authoring/Studio/Utils/StudioUtils.cpp b/src/Authoring/Studio/Utils/StudioUtils.cpp index 57cbab58..c8a624c4 100644 --- a/src/Authoring/Studio/Utils/StudioUtils.cpp +++ b/src/Authoring/Studio/Utils/StudioUtils.cpp @@ -27,14 +27,7 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "CoreUtils.h" #include "StudioPreferences.h" #include "StudioClipboard.h" diff --git a/src/Authoring/Studio/Utils/SystemPreferences.cpp b/src/Authoring/Studio/Utils/SystemPreferences.cpp index 85e5a58b..38a7020b 100644 --- a/src/Authoring/Studio/Utils/SystemPreferences.cpp +++ b/src/Authoring/Studio/Utils/SystemPreferences.cpp @@ -27,19 +27,12 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== -#include "stdafx.h" - -//============================================================================== -// Includes -//============================================================================== +#include "Qt3DSCommonPrecompile.h" #include "CColor.h" #include "SystemPreferences.h" -#include <QApplication> -#include <QPalette> +#include <QtWidgets/qapplication.h> +#include <QtGui/qpalette.h> //============================================================================= /** diff --git a/src/Authoring/Studio/Utils/TickTock.cpp b/src/Authoring/Studio/Utils/TickTock.cpp index afbdf899..23ae4625 100644 --- a/src/Authoring/Studio/Utils/TickTock.cpp +++ b/src/Authoring/Studio/Utils/TickTock.cpp @@ -26,14 +26,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "ITickTock.h" #include "Qt3DSDMSignals.h" #include "Thread.h" #include "Mutex.h" #include "Conditional.h" #include "StandardExtensions.h" -#include <vector> #include <QtCore/qcoreapplication.h> #include <QtCore/qdatetime.h> diff --git a/src/Authoring/Studio/Workspace/Dialogs.cpp b/src/Authoring/Studio/Workspace/Dialogs.cpp index f471e001..c420f409 100644 --- a/src/Authoring/Studio/Workspace/Dialogs.cpp +++ b/src/Authoring/Studio/Workspace/Dialogs.cpp @@ -26,7 +26,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "stdafx.h" +#include "Qt3DSCommonPrecompile.h" #include "qtAuthoring-config.h" #include "Dialogs.h" |