refactor: do not nest asset namespaces in game namespaces

* Duplicated namespace names are kind of annoying

src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.cpp

@@ -49,14 +49,14 @@ namespace
     }
 } // namespace
 
-namespace IW5::menu
+namespace menu
 {
-    bool MenuDumper::ShouldDump(XAssetInfo<menuDef_t>* asset)
+    bool MenuDumperIW5::ShouldDump(XAssetInfo<menuDef_t>* asset)
     {
         return true;
     }
 
-    void MenuDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset)
+    void MenuDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset)
     {
         const auto* menu = asset->Asset();
         const auto menuFilePath = GetPathForMenu(asset);
@@ -74,10 +74,10 @@ namespace IW5::menu
         if (!assetFile)
             return;
 
-        auto menuWriter = CreateMenuWriter(*assetFile);
+        auto menuWriter = CreateMenuWriterIW5(*assetFile);
 
         menuWriter->Start();
         menuWriter->WriteMenu(*menu);
         menuWriter->End();
     }
-} // namespace IW5::menu
+} // namespace menu

src/ObjWriting/Game/IW5/Menu/MenuDumperIW5.h

@@ -4,12 +4,12 @@
 #include "Game/IW5/IW5.h"
 #include "Game/IW5/Menu/MenuDumperIW5.h"
 
-namespace IW5::menu
+namespace menu
 {
-    class MenuDumper final : public AbstractAssetDumper<menuDef_t>
+    class MenuDumperIW5 final : public AbstractAssetDumper<IW5::menuDef_t>
     {
     protected:
-        bool ShouldDump(XAssetInfo<menuDef_t>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset) override;
+        bool ShouldDump(XAssetInfo<IW5::menuDef_t>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::menuDef_t>* asset) override;
     };
-} // namespace IW5::menu
+} // namespace menu

src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.cpp

@@ -45,7 +45,7 @@ namespace
         return result;
     }
 
-    void DumpFunctions(IW5::menu::IWriterIW5& menuDumper, const MenuList* menuList)
+    void DumpFunctions(menu::IWriterIW5& menuDumper, const MenuList* menuList)
     {
         const auto allSupportingData = GetAllUniqueExpressionSupportingData(menuList);
         auto functionIndex = 0u;
@@ -70,7 +70,7 @@ namespace
         }
     }
 
-    void DumpMenus(IW5::menu::IWriterIW5& menuDumper, const MenuList* menuList)
+    void DumpMenus(menu::IWriterIW5& menuDumper, const MenuList* menuList)
     {
         const fs::path p(menuList->name);
 
@@ -104,14 +104,14 @@ namespace
     }
 } // namespace
 
-namespace IW5::menu
+namespace menu
 {
-    bool MenuListDumper::ShouldDump(XAssetInfo<MenuList>* asset)
+    bool MenuListDumperIW5::ShouldDump(XAssetInfo<MenuList>* asset)
     {
         return true;
     }
 
-    void MenuListDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset)
+    void MenuListDumperIW5::DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset)
     {
         const auto* menuList = asset->Asset();
         const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -119,7 +119,7 @@ namespace IW5::menu
         if (!assetFile)
             return;
 
-        auto menuWriter = CreateMenuWriter(*assetFile);
+        auto menuWriter = CreateMenuWriterIW5(*assetFile);
 
         menuWriter->Start();
 
@@ -130,4 +130,4 @@ namespace IW5::menu
 
         menuWriter->End();
     }
-} // namespace IW5::menu
+} // namespace menu

src/ObjWriting/Game/IW5/Menu/MenuListDumperIW5.h

@@ -3,12 +3,12 @@
 #include "Dumping/AbstractAssetDumper.h"
 #include "Game/IW5/IW5.h"
 
-namespace IW5::menu
+namespace menu
 {
-    class MenuListDumper final : public AbstractAssetDumper<MenuList>
+    class MenuListDumperIW5 final : public AbstractAssetDumper<IW5::MenuList>
     {
     protected:
-        bool ShouldDump(XAssetInfo<MenuList>* asset) override;
-        void DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset) override;
+        bool ShouldDump(XAssetInfo<IW5::MenuList>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW5::MenuList>* asset) override;
     };
-} // namespace IW5::menu
+} // namespace menu

src/ObjWriting/Game/IW5/Menu/MenuWriterIW5.cpp

@@ -57,7 +57,7 @@ namespace
 
 namespace
 {
-    class MenuWriter final : public ::menu::AbstractBaseWriter, public IW5::menu::IWriterIW5
+    class MenuWriter final : public menu::AbstractBaseWriter, public menu::IWriterIW5
     {
     public:
         explicit MenuWriter(std::ostream& stream)
@@ -948,10 +948,10 @@ namespace
     };
 } // namespace
 
-namespace IW5::menu
+namespace menu
 {
-    std::unique_ptr<IWriterIW5> CreateMenuWriter(std::ostream& stream)
+    std::unique_ptr<IWriterIW5> CreateMenuWriterIW5(std::ostream& stream)
     {
         return std::make_unique<MenuWriter>(stream);
     }
-} // namespace IW5::menu
+} // namespace menu

src/ObjWriting/Game/IW5/Menu/MenuWriterIW5.h

@@ -6,14 +6,14 @@
 #include <memory>
 #include <string>
 
-namespace IW5::menu
+namespace menu
 {
-    class IWriterIW5 : public ::menu::IWriter
+    class IWriterIW5 : public IWriter
     {
     public:
-        virtual void WriteFunctionDef(const std::string& functionName, const Statement_s* statement) = 0;
-        virtual void WriteMenu(const menuDef_t& menu) = 0;
+        virtual void WriteFunctionDef(const std::string& functionName, const IW5::Statement_s* statement) = 0;
+        virtual void WriteMenu(const IW5::menuDef_t& menu) = 0;
     };
 
-    std::unique_ptr<IWriterIW5> CreateMenuWriter(std::ostream& stream);
-} // namespace IW5::menu
+    std::unique_ptr<IWriterIW5> CreateMenuWriterIW5(std::ostream& stream);
+} // namespace menu