From 87ca863ed4028069db99e299647261cd718ae636 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Wed, 14 Jul 2021 09:34:56 -0700 Subject: [PATCH] Editor/Plugins/EditorCommon Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Plugins/EditorCommon/ActionOutput.cpp | 1 - .../Plugins/EditorCommon/AxisHelper.cpp | 1 - .../Plugins/EditorCommon/DisplayContext.cpp | 2 -- .../EditorCommon/DrawingPrimitives/Ruler.cpp | 3 +-- .../DrawingPrimitives/TimeSlider.cpp | 1 - .../Plugins/EditorCommon/EditorCommon.cpp | 3 ++- .../EditorCommon/EditorCommon_precompiled.h | 21 ------------------- .../Plugins/EditorCommon/QtViewPane.cpp | 1 - .../SaveUtilities/AsyncSaveRunner.cpp | 1 - .../WinWidget/WinWidgetManager.cpp | 1 - .../EditorCommon/WinWidget/WinWidgetManager.h | 2 ++ .../EditorCommon/editorcommon_files.cmake | 1 - Code/Editor/Plugins/EditorCommon/stdafx.cpp | 13 ------------ 13 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h delete mode 100644 Code/Editor/Plugins/EditorCommon/stdafx.cpp diff --git a/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp b/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp index 81a1f82d4e..13903da8db 100644 --- a/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp +++ b/Code/Editor/Plugins/EditorCommon/ActionOutput.cpp @@ -5,7 +5,6 @@ * */ -#include "EditorCommon_precompiled.h" #include #include diff --git a/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp b/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp index e54afc369d..32d58f91d0 100644 --- a/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp +++ b/Code/Editor/Plugins/EditorCommon/AxisHelper.cpp @@ -6,5 +6,4 @@ */ -#include "EditorCommon_precompiled.h" #include "../../Editor/RenderHelpers/AxisHelperShared.inl" diff --git a/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp b/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp index 87d0b47d1b..7795948b3b 100644 --- a/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp +++ b/Code/Editor/Plugins/EditorCommon/DisplayContext.cpp @@ -5,6 +5,4 @@ * */ - -#include "EditorCommon_precompiled.h" #include "../../Editor/Objects/DisplayContextShared.inl" diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp index 0d2d35bd04..1aa2121b10 100644 --- a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp +++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp @@ -6,7 +6,6 @@ */ -#include "EditorCommon_precompiled.h" #include "Ruler.h" #include @@ -43,7 +42,7 @@ namespace DrawingPrimitives const float ticksMinPower = log10f(RULER_MIN_PIXELS_PER_TICK); const float ticksPowerDelta = ticksMinPower - log10f(pixelsPerUnit); - const int digitsAfterPoint = max(-int(ceil(ticksPowerDelta)) - 1, 0); + const int digitsAfterPoint = AZStd::max(-int(ceil(ticksPowerDelta)) - 1, 0); if (pRulerPrecision) { *pRulerPrecision = digitsAfterPoint; diff --git a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp index 45f5dc7e96..f019f17881 100644 --- a/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp +++ b/Code/Editor/Plugins/EditorCommon/DrawingPrimitives/TimeSlider.cpp @@ -6,7 +6,6 @@ */ -#include "EditorCommon_precompiled.h" #include "TimeSlider.h" #include diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp b/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp index f8f29f0c23..d7fec990c8 100644 --- a/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp +++ b/Code/Editor/Plugins/EditorCommon/EditorCommon.cpp @@ -4,13 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "EditorCommon_precompiled.h" #include #include "EditorCommon.h" #include "EditorCommonAPI.h" +#include + CEditorCommonApp::CEditorCommonApp() { } diff --git a/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h b/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h deleted file mode 100644 index 0fa561651c..0000000000 --- a/Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - - -#pragma once - -#ifndef VC_EXTRALEAN -#define VC_EXTRALEAN -#endif - -// These redicilous dependencies are needed just to be able to use -// Sandbox gizmos drawing and hit-testing code =( - -#include "ISystem.h" -#include "Include/EditorCoreAPI.h" -#include "Util/EditorUtils.h" - diff --git a/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp b/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp index cbe849905a..9cef9dfab9 100644 --- a/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp +++ b/Code/Editor/Plugins/EditorCommon/QtViewPane.cpp @@ -6,7 +6,6 @@ */ -#include "EditorCommon_precompiled.h" #include "platform.h" #pragma warning(disable: 4266) // disabled warning from afk overrides diff --git a/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp index 72d4b43249..35f57ab7bb 100644 --- a/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp +++ b/Code/Editor/Plugins/EditorCommon/SaveUtilities/AsyncSaveRunner.cpp @@ -5,7 +5,6 @@ * */ -#include "EditorCommon_precompiled.h" #include #include #include diff --git a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp index aa1cc71040..21f7876bb8 100644 --- a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp +++ b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.cpp @@ -5,7 +5,6 @@ * */ -#include "EditorCommon_precompiled.h" #include namespace WinWidget diff --git a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h index ee46e99bbf..f880295b2b 100644 --- a/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h +++ b/Code/Editor/Plugins/EditorCommon/WinWidget/WinWidgetManager.h @@ -13,6 +13,8 @@ #include #include +class QWidget; + namespace WinWidget { class EDITOR_COMMON_API WinWidgetManager diff --git a/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake b/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake index 5277f2456a..63bc1c2cfc 100644 --- a/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake +++ b/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake @@ -10,7 +10,6 @@ set(FILES EditorCommon.cpp EditorCommon.rc EditorCommonAPI.h - EditorCommon_precompiled.h ActionOutput.h ActionOutput.cpp UiEditorDLLBus.h diff --git a/Code/Editor/Plugins/EditorCommon/stdafx.cpp b/Code/Editor/Plugins/EditorCommon/stdafx.cpp deleted file mode 100644 index 23e4c68c56..0000000000 --- a/Code/Editor/Plugins/EditorCommon/stdafx.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - - -// stdafx.cpp : source file that includes just the standard includes -// EditorCommon.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "EditorCommon_precompiled.h"