clang format | remove using namespace

Signed-off-by: Wojciech Czerski <[email protected]>
RobotecAI · Jan 14, 2025 · fad01b7 · fad01b7
1 parent a1c596c
commit fad01b7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.cpp
@@ -14,8 +14,6 @@
 
 namespace CsvSpawner
 {
-    using namespace CsvSpawnerUtils;
-
     void CsvSpawnerComponent::Reflect(AZ::ReflectContext* context)
     {
         CsvSpawnerUtils::CsvSpawnableAssetConfiguration::Reflect(context);
@@ -31,8 +29,8 @@ namespace CsvSpawner
     }
 
     CsvSpawnerComponent::CsvSpawnerComponent(
-        const AZStd::unordered_map<AZStd::string, CsvSpawnableAssetConfiguration>& spawnableAssetConfiguration,
-        const AZStd::vector<CsvSpawnableEntityInfo>& spawnableEntityInfo,
+        const AZStd::unordered_map<AZStd::string, CsvSpawnerUtils::CsvSpawnableAssetConfiguration>& spawnableAssetConfiguration,
+        const AZStd::vector<CsvSpawnerUtils::CsvSpawnableEntityInfo>& spawnableEntityInfo,
         AZ::u64 defaultSeed)
         : m_spawnableAssetConfigurations(spawnableAssetConfiguration)
         , m_spawnableEntityInfo(spawnableEntityInfo)
@@ -42,7 +40,7 @@ namespace CsvSpawner
 
     void CsvSpawnerComponent::Activate()
     {
-        if (IsTerrainAvailable())
+        if (CsvSpawnerUtils::IsTerrainAvailable())
         {
             AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect();
         }
@@ -85,8 +83,8 @@ namespace CsvSpawner
         AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect();
     }
 
-    bool CsvSpawnerComponent::IsTerrainAvailable()
-    {
-        return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers();
-    }
+    // bool CsvSpawnerComponent::IsTerrainAvailable()
+    // {
+    //     return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers();
+    // }
 } // namespace CsvSpawner
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerComponent.h
@@ -18,8 +18,6 @@
 
 namespace CsvSpawner
 {
-    using namespace CsvSpawnerUtils;
-
     //! Game component that spawns entities from a CSV file.
     //! This component is used to spawn trees, on the first tick.
     //! In contrast to the CsvSpawnerEditorComponent, this component's reflection contains all the data it needs to spawn trees ( it is not
@@ -34,8 +32,8 @@ namespace CsvSpawner
         CsvSpawnerComponent() = default;
 
         CsvSpawnerComponent(
-            const AZStd::unordered_map<AZStd::string, CsvSpawnableAssetConfiguration>& spawnableAssetConfiguration,
-            const AZStd::vector<CsvSpawnableEntityInfo>& spawnableEntityInfo,
+            const AZStd::unordered_map<AZStd::string, CsvSpawnerUtils::CsvSpawnableAssetConfiguration>& spawnableAssetConfiguration,
+            const AZStd::vector<CsvSpawnerUtils::CsvSpawnableEntityInfo>& spawnableEntityInfo,
             AZ::u64 defaultSeed);
 
         ~CsvSpawnerComponent() = default;
@@ -47,8 +45,9 @@ namespace CsvSpawner
         void Deactivate() override;
 
     private:
-        AZStd::unordered_map<AZStd::string, CsvSpawnableAssetConfiguration> m_spawnableAssetConfigurations; //!< List of assets to spawn
-        AZStd::vector<CsvSpawnableEntityInfo> m_spawnableEntityInfo; //!< List of entities to spawn
+        AZStd::unordered_map<AZStd::string, CsvSpawnerUtils::CsvSpawnableAssetConfiguration>
+            m_spawnableAssetConfigurations; //!< List of assets to spawn
+        AZStd::vector<CsvSpawnerUtils::CsvSpawnableEntityInfo> m_spawnableEntityInfo; //!< List of entities to spawn
         AZ::u64 m_defaultSeed{ 0 }; //!< Default seed value
 
         AZStd::unordered_map<int, AzFramework::EntitySpawnTicket> m_spawnedTickets;
@@ -57,6 +56,5 @@ namespace CsvSpawner
         void OnTerrainDataCreateEnd() override;
         void OnTerrainDataDestroyBegin() override;
         bool m_terrainCreatedOnlyOnce{ false }; //!< Is terrain fully generated once
-        [[nodiscard]] static bool IsTerrainAvailable(); //!< @returns True if current level has terrain, otherwise false.
     };
 } // namespace CsvSpawner
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.cpp
@@ -12,6 +12,7 @@
 #include "CsvSpawnerUtils.h"
 
 #include "AzFramework/Physics/CollisionBus.h"
+#include "AzFramework/Terrain/TerrainDataRequestBus.h"
 
 #include <AzCore/Asset/AssetSerializer.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -292,4 +293,8 @@ namespace CsvSpawner::CsvSpawnerUtils
         return tickets;
     }
 
+    const bool IsTerrainAvailable()
+    {
+        return AzFramework::Terrain::TerrainDataRequestBus::HasHandlers();
+    }
 } // namespace CsvSpawner::CsvSpawnerUtils
diff --git a/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h b/Gems/CsvSpawner/Code/Source/CsvSpawner/CsvSpawnerUtils.h
@@ -99,4 +99,6 @@ namespace CsvSpawner::CsvSpawnerUtils
         const AZStd::string& physicsSceneName = AZStd::string(),
         AZ::EntityId parentId = AZ::EntityId());
 
+    [[nodiscard]] const bool IsTerrainAvailable(); //!< @returns True if current level has terrain, otherwise false.
+
 }; // namespace CsvSpawner::CsvSpawnerUtils