#5231: Move NamespaceFactory and implementation classes to radiantcore

codereader · May 3, 2020 · 18f5ff4 · 18f5ff4
1 parent 6df8e1d
commit 18f5ff4
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 34 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -179,9 +179,6 @@ darkradiant_SOURCES = main.cpp \
                       modelfile/picomodel/pm_terrain.c \
                       modelfile/picomodel/pm_ms3d.c \
                       modelfile/picomodel/pm_3ds.c \
-                      namespace/ComplexName.cpp \
-                      namespace/Namespace.cpp \
-                      namespace/NamespaceFactory.cpp \
                       particles/ParticleNode.cpp \
                       particles/RenderableParticle.cpp \
                       particles/RenderableParticleBunch.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -40,6 +40,9 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 log/LogWriter.cpp \
                 log/StringLogDevice.cpp \
                 map/format/MapFormatManager.cpp \
+                map/namespace/ComplexName.cpp \
+                map/namespace/Namespace.cpp \
+                map/namespace/NamespaceFactory.cpp \
                 modulesystem/ModuleLoader.cpp \
                 modulesystem/ModuleRegistry.cpp \
                 scenegraph/SceneGraph.cpp \

diff --git a/radiant/namespace/ComplexName.cpp → radiantcore/map/namespace/ComplexName.cpp b/radiant/namespace/ComplexName.cpp → radiantcore/map/namespace/ComplexName.cpp
diff --git a/radiant/namespace/ComplexName.h → radiantcore/map/namespace/ComplexName.h b/radiant/namespace/ComplexName.h → radiantcore/map/namespace/ComplexName.h
diff --git a/radiant/namespace/Namespace.cpp → radiantcore/map/namespace/Namespace.cpp b/radiant/namespace/Namespace.cpp → radiantcore/map/namespace/Namespace.cpp
diff --git a/radiant/namespace/Namespace.h → radiantcore/map/namespace/Namespace.h b/radiant/namespace/Namespace.h → radiantcore/map/namespace/Namespace.h
diff --git a/radiant/namespace/NamespaceFactory.cpp → ...ntcore/map/namespace/NamespaceFactory.cpp b/radiant/namespace/NamespaceFactory.cpp → ...ntcore/map/namespace/NamespaceFactory.cpp
diff --git a/radiant/namespace/NamespaceFactory.h → radiantcore/map/namespace/NamespaceFactory.h b/radiant/namespace/NamespaceFactory.h → radiantcore/map/namespace/NamespaceFactory.h
diff --git a/radiant/namespace/UniqueNameSet.h → radiantcore/map/namespace/UniqueNameSet.h b/radiant/namespace/UniqueNameSet.h → radiantcore/map/namespace/UniqueNameSet.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -731,7 +731,6 @@
     <ClCompile Include="..\..\radiant\model\NullModel.cpp" />
     <ClCompile Include="..\..\radiant\model\NullModelNode.cpp" />
     <ClCompile Include="..\..\radiant\model\ScaledModelExporter.cpp" />
-    <ClCompile Include="..\..\radiant\namespace\ComplexName.cpp" />
     <ClCompile Include="..\..\radiant\particles\editor\ParticleEditor.cpp" />
     <ClCompile Include="..\..\radiant\particles\ParticleDef.cpp" />
     <ClCompile Include="..\..\radiant\particles\ParticleNode.cpp" />
@@ -862,8 +861,6 @@
     <ClCompile Include="..\..\radiant\map\StartupMapLoader.cpp" />
     <ClCompile Include="..\..\radiant\map\algorithm\Traverse.cpp" />
     <ClCompile Include="..\..\radiant\modulesystem\ApplicationContextImpl.cpp" />
-    <ClCompile Include="..\..\radiant\namespace\Namespace.cpp" />
-    <ClCompile Include="..\..\radiant\namespace\NamespaceFactory.cpp" />
     <ClCompile Include="..\..\radiant\patch\Patch.cpp" />
     <ClCompile Include="..\..\radiant\patch\PatchModule.cpp" />
     <ClCompile Include="..\..\radiant\patch\PatchNode.cpp" />
@@ -1317,10 +1314,6 @@
     <ClInclude Include="..\..\radiant\map\algorithm\Traverse.h" />
     <ClInclude Include="..\..\radiant\map\algorithm\WorldspawnArgFinder.h" />
     <ClInclude Include="..\..\radiant\modulesystem\ApplicationContextImpl.h" />
-    <ClInclude Include="..\..\radiant\namespace\ComplexName.h" />
-    <ClInclude Include="..\..\radiant\namespace\Namespace.h" />
-    <ClInclude Include="..\..\radiant\namespace\NamespaceFactory.h" />
-    <ClInclude Include="..\..\radiant\namespace\UniqueNameSet.h" />
     <ClInclude Include="..\..\radiant\patch\Patch.h" />
     <ClInclude Include="..\..\radiant\patch\PatchConstants.h" />
     <ClInclude Include="..\..\radiant\patch\PatchControl.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -29,9 +29,6 @@
     <Filter Include="src\modulesystem">
       <UniqueIdentifier>{2ab7bf93-24a1-444a-aa28-ae77c05ec366}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\namespace">
-      <UniqueIdentifier>{733eeb6e-0b1a-4fb9-89fd-ba073293c814}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\patch">
       <UniqueIdentifier>{2d28a51d-8d67-4abb-9f17-28534f1e1652}</UniqueIdentifier>
     </Filter>
@@ -427,12 +424,6 @@
     <ClCompile Include="..\..\radiant\modulesystem\ApplicationContextImpl.cpp">
       <Filter>src\modulesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\namespace\Namespace.cpp">
-      <Filter>src\namespace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\namespace\NamespaceFactory.cpp">
-      <Filter>src\namespace</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\patch\Patch.cpp">
       <Filter>src\patch</Filter>
     </ClCompile>
@@ -796,9 +787,6 @@
     <ClCompile Include="..\..\radiant\ui\modelselector\MaterialsList.cpp">
       <Filter>src\ui\modelselector</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\namespace\ComplexName.cpp">
-      <Filter>src\namespace</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\patch\algorithm\Prefab.cpp">
       <Filter>src\patch\algorithm</Filter>
     </ClCompile>
@@ -1683,18 +1671,6 @@
     <ClInclude Include="..\..\radiant\modulesystem\ApplicationContextImpl.h">
       <Filter>src\modulesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\namespace\ComplexName.h">
-      <Filter>src\namespace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\namespace\Namespace.h">
-      <Filter>src\namespace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\namespace\NamespaceFactory.h">
-      <Filter>src\namespace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\namespace\UniqueNameSet.h">
-      <Filter>src\namespace</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\patch\Patch.h">
       <Filter>src\patch</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -20,6 +20,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\map\format\MapFormatManager.cpp" />
+    <ClCompile Include="..\..\radiantcore\map\namespace\ComplexName.cpp" />
+    <ClCompile Include="..\..\radiantcore\map\namespace\Namespace.cpp" />
+    <ClCompile Include="..\..\radiantcore\map\namespace\NamespaceFactory.cpp" />
     <ClCompile Include="..\..\radiantcore\Radiant.cpp" />
     <ClCompile Include="..\..\radiantcore\commandsystem\CommandSystem.cpp" />
     <ClCompile Include="..\..\radiantcore\log\COutRedirector.cpp" />
@@ -48,6 +51,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\map\format\MapFormatManager.h" />
+    <ClInclude Include="..\..\radiantcore\map\namespace\ComplexName.h" />
+    <ClInclude Include="..\..\radiantcore\map\namespace\Namespace.h" />
+    <ClInclude Include="..\..\radiantcore\map\namespace\NamespaceFactory.h" />
+    <ClInclude Include="..\..\radiantcore\map\namespace\UniqueNameSet.h" />
     <ClInclude Include="..\..\radiantcore\Radiant.h" />
     <ClInclude Include="..\..\radiantcore\commandsystem\CaseInsensitiveCompare.h" />
     <ClInclude Include="..\..\radiantcore\commandsystem\Command.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -35,6 +35,9 @@
     <Filter Include="src\map\format">
       <UniqueIdentifier>{6492e1c1-fe5d-43a5-b408-674741ae3c92}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\map\namespace">
+      <UniqueIdentifier>{bbd860af-100a-4da4-9d58-0698fff513f2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -115,6 +118,15 @@
     <ClCompile Include="..\..\radiantcore\map\format\MapFormatManager.cpp">
       <Filter>src\map\format</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\map\namespace\ComplexName.cpp">
+      <Filter>src\map\namespace</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\map\namespace\Namespace.cpp">
+      <Filter>src\map\namespace</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\map\namespace\NamespaceFactory.cpp">
+      <Filter>src\map\namespace</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -264,5 +276,17 @@
     <ClInclude Include="..\..\radiantcore\map\format\MapFormatManager.h">
       <Filter>src\map\format</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\namespace\ComplexName.h">
+      <Filter>src\map\namespace</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\namespace\Namespace.h">
+      <Filter>src\map\namespace</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\namespace\NamespaceFactory.h">
+      <Filter>src\map\namespace</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\namespace\UniqueNameSet.h">
+      <Filter>src\map\namespace</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>