From 18f5ff41d5973970b21b9dd75b34f9c73c3ff3b0 Mon Sep 17 00:00:00 2001 From: codereader Date: Sun, 3 May 2020 18:11:47 +0200 Subject: [PATCH] #5231: Move NamespaceFactory and implementation classes to radiantcore --- radiant/Makefile.am | 3 --- radiantcore/Makefile.am | 3 +++ .../map}/namespace/ComplexName.cpp | 0 .../map}/namespace/ComplexName.h | 0 .../map}/namespace/Namespace.cpp | 0 .../map}/namespace/Namespace.h | 0 .../map}/namespace/NamespaceFactory.cpp | 0 .../map}/namespace/NamespaceFactory.h | 0 .../map}/namespace/UniqueNameSet.h | 0 tools/msvc/DarkRadiant.vcxproj | 7 ------ tools/msvc/DarkRadiant.vcxproj.filters | 24 ------------------- tools/msvc/DarkRadiantCore.vcxproj | 7 ++++++ tools/msvc/DarkRadiantCore.vcxproj.filters | 24 +++++++++++++++++++ 13 files changed, 34 insertions(+), 34 deletions(-) rename {radiant => radiantcore/map}/namespace/ComplexName.cpp (100%) rename {radiant => radiantcore/map}/namespace/ComplexName.h (100%) rename {radiant => radiantcore/map}/namespace/Namespace.cpp (100%) rename {radiant => radiantcore/map}/namespace/Namespace.h (100%) rename {radiant => radiantcore/map}/namespace/NamespaceFactory.cpp (100%) rename {radiant => radiantcore/map}/namespace/NamespaceFactory.h (100%) rename {radiant => radiantcore/map}/namespace/UniqueNameSet.h (100%) diff --git a/radiant/Makefile.am b/radiant/Makefile.am index 3e06fdfe99..78af8cd527 100644 --- 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 index d79e9839be..0d371fd4dd 100644 --- 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 b/radiantcore/map/namespace/ComplexName.cpp similarity index 100% rename from radiant/namespace/ComplexName.cpp rename to radiantcore/map/namespace/ComplexName.cpp diff --git a/radiant/namespace/ComplexName.h b/radiantcore/map/namespace/ComplexName.h similarity index 100% rename from radiant/namespace/ComplexName.h rename to radiantcore/map/namespace/ComplexName.h diff --git a/radiant/namespace/Namespace.cpp b/radiantcore/map/namespace/Namespace.cpp similarity index 100% rename from radiant/namespace/Namespace.cpp rename to radiantcore/map/namespace/Namespace.cpp diff --git a/radiant/namespace/Namespace.h b/radiantcore/map/namespace/Namespace.h similarity index 100% rename from radiant/namespace/Namespace.h rename to radiantcore/map/namespace/Namespace.h diff --git a/radiant/namespace/NamespaceFactory.cpp b/radiantcore/map/namespace/NamespaceFactory.cpp similarity index 100% rename from radiant/namespace/NamespaceFactory.cpp rename to radiantcore/map/namespace/NamespaceFactory.cpp diff --git a/radiant/namespace/NamespaceFactory.h b/radiantcore/map/namespace/NamespaceFactory.h similarity index 100% rename from radiant/namespace/NamespaceFactory.h rename to radiantcore/map/namespace/NamespaceFactory.h diff --git a/radiant/namespace/UniqueNameSet.h b/radiantcore/map/namespace/UniqueNameSet.h similarity index 100% rename from radiant/namespace/UniqueNameSet.h rename to radiantcore/map/namespace/UniqueNameSet.h diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj index a0163ca992..173f97386e 100644 --- a/tools/msvc/DarkRadiant.vcxproj +++ b/tools/msvc/DarkRadiant.vcxproj @@ -731,7 +731,6 @@ - @@ -862,8 +861,6 @@ - - @@ -1317,10 +1314,6 @@ - - - - diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters index d5c7811df3..285145135c 100644 --- a/tools/msvc/DarkRadiant.vcxproj.filters +++ b/tools/msvc/DarkRadiant.vcxproj.filters @@ -29,9 +29,6 @@ {2ab7bf93-24a1-444a-aa28-ae77c05ec366} - - {733eeb6e-0b1a-4fb9-89fd-ba073293c814} - {2d28a51d-8d67-4abb-9f17-28534f1e1652} @@ -427,12 +424,6 @@ src\modulesystem - - src\namespace - - - src\namespace - src\patch @@ -796,9 +787,6 @@ src\ui\modelselector - - src\namespace - src\patch\algorithm @@ -1683,18 +1671,6 @@ src\modulesystem - - src\namespace - - - src\namespace - - - src\namespace - - - src\namespace - src\patch diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj index 8b900b21d3..434896b4d1 100644 --- a/tools/msvc/DarkRadiantCore.vcxproj +++ b/tools/msvc/DarkRadiantCore.vcxproj @@ -20,6 +20,9 @@ + + + @@ -48,6 +51,10 @@ + + + + diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters index 8333ef386c..f7e9895abd 100644 --- a/tools/msvc/DarkRadiantCore.vcxproj.filters +++ b/tools/msvc/DarkRadiantCore.vcxproj.filters @@ -35,6 +35,9 @@ {6492e1c1-fe5d-43a5-b408-674741ae3c92} + + {bbd860af-100a-4da4-9d58-0698fff513f2} + @@ -115,6 +118,15 @@ src\map\format + + src\map\namespace + + + src\map\namespace + + + src\map\namespace + @@ -264,5 +276,17 @@ src\map\format + + src\map\namespace + + + src\map\namespace + + + src\map\namespace + + + src\map\namespace + \ No newline at end of file