Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -112,7 +112,6 @@ namespace LegacyFramework
        m_applicationEntity = NULL;
        m_ptrSystemEntity = NULL;
        m_applicationModule[0] = 0;
-        m_appRoot[0] = 0;
    }

    HMODULE Application::GetMainModule()
@@ -16,7 +16,7 @@

 #include "NewLogTabDialog.h"
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags<Qt::AlignmentFlag>' needs to have dll-interface to be used by clients of class 'QLayoutItem'
-#include <UI/Logging/ui_NewLogTabDialog.h>
+#include <AzToolsFramework/UI/Logging/ui_NewLogTabDialog.h>
 AZ_POP_DISABLE_WARNING
 #include <QPushButton>
 #include <QLineEdit>
@@ -97,4 +97,4 @@ namespace AzToolsFramework
    } // namespace LogPanel
 } // namespace AzToolsFramework

-#include "UI/Logging/moc_NewLogTabDialog.cpp"
+#include "UI/Logging/moc_NewLogTabDialog.cpp"
@@ -49,7 +49,7 @@
 #include <QTimer>
 #include <QToolButton>

-#include <UI/Outliner/ui_EntityOutlinerWidget.h>
+#include <AzToolsFramework/UI/Outliner/ui_EntityOutlinerWidget.h>

 namespace
 {
@@ -644,7 +644,7 @@ namespace AzToolsFramework
                    QString cleanAssetSafeFolder(QDir::cleanPath(assetSafeFolder.c_str()));
                    // Compare using clean paths so slash direction does not matter.
                    // Note that this comparison is case sensitive because some file systems
-                    // Lumberyard supports are case sensitive.
+                    // Open 3D Engine supports are case sensitive.
                    if (cleanSaveAs.startsWith(cleanAssetSafeFolder))
                    {
                        isPathSafeForAssets = true;
@@ -100,7 +100,7 @@ AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option") // 4244: con
 #include <QTimer>
 AZ_POP_DISABLE_WARNING

-#include <UI/PropertyEditor/ui_EntityPropertyEditor.h>
+#include <AzToolsFramework/UI/PropertyEditor/ui_EntityPropertyEditor.h>

 // This has to live outside of any namespaces due to issues on Linux with calls to Q_INIT_RESOURCE if they are inside a namespace
 void initEntityPropertyEditorResources()
@@ -32,7 +32,7 @@
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/ToolsComponents/ComponentMimeData.h>
 #include <AzToolsFramework/ToolsComponents/EditorInspectorComponentBus.h>
-#include <AzQtComponents/Components/LumberyardStylesheet.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>

 #include <QtWidgets/QWidget>
 #include <QtGui/QIcon>
@@ -89,7 +89,7 @@ namespace AzToolsFramework
        //! When set, disables data access for this property editor.
        //! This prevents any value refreshes from the inspected values from occurring as well as disabling user input.
        void PreventDataAccess(bool shouldPrevent);
-        // LUMBERYARD_DEPRECATED(LY-120821)
+        // O3DE_DEPRECATED(LY-120821)
        void PreventRefresh(bool shouldPrevent){PreventDataAccess(shouldPrevent);}

        void SetAutoResizeLabels(bool autoResizeLabels);
@@ -11,7 +11,7 @@
 */
 #include "AzToolsFramework_precompiled.h"
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags<Qt::AlignmentFlag>' needs to have dll-interface to be used by clients of class 'QLayoutItem'
-#include "UI/Slice/ui_NotificationWindow.h"
+#include <AzToolsFramework/UI/Slice/ui_NotificationWindow.h>
 AZ_POP_DISABLE_WARNING
 #include "UI/Slice/Constants.h"

@@ -14,7 +14,7 @@
 #include "OverwritePromptDialog.hxx"

 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QLayoutItem::align': class 'QFlags<Qt::AlignmentFlag>' needs to have dll-interface to be used by clients of class 'QLayoutItem'
-#include <UI/UICore/ui_OverwritePromptDialog.h>
+#include <AzToolsFramework/UI/UICore/ui_OverwritePromptDialog.h>
 AZ_POP_DISABLE_WARNING

 namespace AzToolsFramework
@@ -54,4 +54,4 @@ namespace AzToolsFramework

 }

-#include "UI/UICore/moc_OverwritePromptDialog.cpp"
+#include "UI/UICore/moc_OverwritePromptDialog.cpp"
@@ -18,7 +18,7 @@
 #include <AzToolsFramework/UI/UICore/ProgressShield.hxx>

 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags<Qt::AlignmentFlag>' needs to have dll-interface to be used by clients of class 'QLayoutItem'
-#include <UI/UICore/ui_ProgressShield.h>
+#include <AzToolsFramework/UI/UICore/ui_ProgressShield.h>
 AZ_POP_DISABLE_WARNING

 namespace AzToolsFramework
@@ -118,4 +118,4 @@ namespace AzToolsFramework

 } // namespace AzToolsFramework

-#include "UI/UICore/moc_ProgressShield.cpp"
+#include "UI/UICore/moc_ProgressShield.cpp"
@@ -14,7 +14,7 @@
 #include "SaveChangesDialog.hxx"

 AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
-#include <UI/UICore/ui_SaveChangesDialog.h>
+#include <AzToolsFramework/UI/UICore/ui_SaveChangesDialog.h>
 AZ_POP_DISABLE_WARNING

 namespace AzToolsFramework
@@ -52,4 +52,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/UICore/moc_SaveChangesDialog.cpp"
+#include "UI/UICore/moc_SaveChangesDialog.cpp"