Code/Editor

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Editor/Include/IEditorClassFactory.h

@@ -14,6 +14,7 @@
 #pragma once
 
 #include <vector>
+#include <QtCore/QString>
 
 #define DEFINE_UUID(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
 static const GUID uuid() { return { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }; }
@@ -68,7 +69,6 @@ enum
 #include "SandboxAPI.h"
 
 class QObject;
-class QString;
 
 
 //! System class IDs
@@ -120,19 +120,9 @@ struct IClassDesc
     //! create panel.
     virtual QString Category() = 0;
 
-#ifdef QSTRING_H
     virtual QString MenuSuggestion() { return QString(); }
     virtual QString Tooltip() { return QString(); }
     virtual QString Description() { return QString(); }
-#else
-    //! This method returns the desired menu in which this plugin class would like to be placed in the editor.
-    //! It is up to the editor to determine if it can and wants to fulfill this request.
-    virtual QString MenuSuggestion();
-    //! This method returns the tooltip for the pane
-    virtual QString Tooltip();
-    //! This method returns the description for the pane
-    virtual QString Description();
-#endif
 
     //! This method returns if the plugin should have a menu item for its pane.
     virtual bool ShowInMenu() const { return true; }

Code/Editor/Include/IIconManager.h

@@ -14,6 +14,8 @@ struct IStatObj;
 struct IMaterial;
 class CBitmap;
 
+class QImage;
+
 // Note: values are used as array indices
 enum EStatObject
 {

Code/Editor/Include/IObjectManager.h

@@ -10,6 +10,10 @@
 #define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
 #pragma once
 
+#include <AzCore/PlatformIncl.h>
+#include <CryCommon/platform.h>
+#include <CryCommon/Cry_Geo.h>
+
 // forward declarations.
 class CEntityObject;
 struct DisplayContext;
@@ -23,6 +27,8 @@ class CViewport;
 struct HitContext;
 enum class ImageRotationDegrees;
 struct IStatObj;
+class CBaseObject;
+class XmlNodeRef;
 
 #include "ObjectEvent.h"
 

Code/Editor/MainWindow.h

@@ -10,6 +10,7 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/Component/Component.h>
+#include <AzCore/EBus/Event.h>
 
 #include <QComboBox>
 #include <QMainWindow>

Code/Editor/Objects/DisplayContextShared.inl

@@ -12,6 +12,7 @@
 #include "IEditor.h"
 #include "Include/IIconManager.h"
 #include "Include/IDisplayViewport.h"
+#include <Editor/Util/EditorUtils.h>
 
 #include <QDateTime>
 #include <QPoint>

Code/Editor/Objects/SelectionGroup.h

@@ -19,6 +19,8 @@ class CBaseObject;
 #include "ObjectEvent.h"
 #include "Objects/BaseObject.h"
 
+#include <Editor/EditorDefs.h>
+
 /*!
  *  CSelectionGroup is a named selection group of objects.
  */

Code/Editor/RenderHelpers/AxisHelper.h

@@ -16,6 +16,8 @@ struct DisplayContext;
 struct HitContext;
 struct IDisplayViewport;
 
+class QPoint;
+
 //////////////////////////////////////////////////////////////////////////
 struct SGizmoParameters
 {

Code/Editor/Util/Math.h

@@ -12,6 +12,7 @@
 #define CRYINCLUDE_EDITOR_UTIL_MATH_H
 #pragma once
 
+#include <Editor/Util/EditorUtils.h>
 
 //! Half PI
 #define PI_HALF (3.1415926535897932384626433832795f / 2.0f)

Code/Editor/WipFeatureManager.cpp

@@ -445,7 +445,7 @@ void CWipFeatureManager::SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpd
     m_features[aFeatureId].m_pfnUpdateFeature = pfnUpdate;
 }
 
-std::map<int, CWipFeatureManager::SWipFeatureInfo>&  CWipFeatureManager::GetFeatures()
+AZStd::map<int, CWipFeatureManager::SWipFeatureInfo>&  CWipFeatureManager::GetFeatures()
 {
     return m_features;
 }

Code/Editor/WipFeatureManager.h

@@ -10,6 +10,9 @@
 #define CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H
 #pragma once
 
+#include <AzCore/std/string/string.h>
+#include <azCore/std/containers/map.h>
+
 /*
     This class is used to control work in progress features at runtime, so QA can test even if the end user will not see those features
     You can use the console command: e_wipfeature <numeric featureId> enable|disable|hide|show|safemode|fullmode
@@ -72,14 +75,14 @@ public:
         {}
 
         int         m_id;
-        string  m_displayName, m_params;
+        AZStd::string  m_displayName, m_params;
         bool        m_bVisible, m_bEnabled, m_bSafeMode,
         // if true, this feature will be saved into the xml file when Save(...) will be called
                     m_bSaveToXml, m_bLoadedFromXml;
         TWipFeatureUpdateCallback   m_pfnUpdateFeature;
     };
 
-    typedef std::map<int, SWipFeatureInfo> TWipFeatures;
+    typedef AZStd::map<int, SWipFeatureInfo> TWipFeatures;
 
 private:
 
@@ -95,7 +98,7 @@ public:
         if (!s_pInstance)
         {
             s_pInstance = new CWipFeatureManager();
-            assert(s_pInstance);
+            AZ_Assert(s_pInstance, "Could not construct CWipFeatureManager");
         }
 
         return s_pInstance;