diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp index f1c80f05ce..33fc4b5d43 100644 --- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp +++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp @@ -60,7 +60,7 @@ namespace { // compilers actually warn on this fact. // A static_cast is used here to indicate explicit acceptance of the value change here /* The clang compiler warning is below - ../Code/Sandbox/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp:59:38: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion] + ../Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp:59:38: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 [-Werror,-Wimplicit-int-float-conversion] reflectedVar->m_maxVal = std::numeric_limits::max(); */ reflectedVar->m_maxVal = static_cast(std::numeric_limits::max()); diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp index 7d62b072a2..bad9a1da17 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp @@ -155,7 +155,7 @@ OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags) settingsRegistry->Get(engineRootPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder); } QDir rootDir = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast(engineRootPath.Native().size())); - const auto pathOnDisk = rootDir.absoluteFilePath(QStringLiteral("Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/")); + const auto pathOnDisk = rootDir.absoluteFilePath(QStringLiteral("Code/Plugins/ComponentEntityEditorPlugin/UI/Outliner/")); const auto qrcPath = QStringLiteral(":/EntityOutliner/"); // Setting the style sheet using both methods allows faster style iteration speed for diff --git a/Code/Tools/CrashHandler/Tools/UI/submit_report.ui b/Code/Tools/CrashHandler/Tools/UI/submit_report.ui index 872adac709..9e816ba73f 100644 --- a/Code/Tools/CrashHandler/Tools/UI/submit_report.ui +++ b/Code/Tools/CrashHandler/Tools/UI/submit_report.ui @@ -158,7 +158,7 @@ - + diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp index 19d4149cf8..740383850e 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp @@ -1168,7 +1168,7 @@ namespace AZ::AtomBridge dir ); - lines.AddLineSegment(ToWorldSpacePosition(pos), ToWorldSpacePosition(pos + dir * (radius * 0.2f))); // 0.2f comes from Code\Sandbox\Editor\Objects\DisplayContextShared.inl DisplayContext::DrawWireDisk + lines.AddLineSegment(ToWorldSpacePosition(pos), ToWorldSpacePosition(pos + dir * (radius * 0.2f))); // 0.2f comes from Code\Editor\Objects\DisplayContextShared.inl DisplayContext::DrawWireDisk lines.Draw(m_auxGeomPtr, m_rendState); } } diff --git a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp index 84ef3a11ca..76e241319b 100644 --- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp +++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp @@ -34,7 +34,7 @@ namespace LevelBuilder AZ::u64 readXmlDataLength(AZ::IO::GenericStream* stream, int& charSize) { - // This code is replicated from readStringLength method found in .\dev\Code\Sandbox\Editor\Util\EditorUtils.h file + // This code is replicated from readStringLength method found in .\dev\Code\Editor\Util\EditorUtils.h file // such that we do not have any Cry or Qt related dependencies. // The basic algorithm is that it reads in an 8 bit int, and if the length is less than 2^8, // then that's the length. Next it reads in a 16 bit int, and if the length is less than 2^16,