#5430: Rip out the previous eclass colour handling code

codereader · Nov 24, 2020 · 2848511 · 2848511
1 parent 2227fd5
commit 2848511
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 105 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -46,7 +46,6 @@ darkradiant_SOURCES = main.cpp \
                       eventmanager/Toggle.cpp \
                       eventmanager/WidgetToggle.cpp \
                       render/OpenGLModule.cpp \
-                      ui/EntityClassColourManager.cpp \
                       ui/UserInterfaceModule.cpp \
                       ui/Documentation.cpp \
                       ui/eclasstree/EClassTree.cpp \

diff --git a/radiant/ui/EntityClassColourManager.cpp b/radiant/ui/EntityClassColourManager.cpp
diff --git a/radiant/ui/EntityClassColourManager.h b/radiant/ui/EntityClassColourManager.h
diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -181,7 +181,6 @@ void UserInterfaceModule::initialiseModule(const IApplicationContext& ctx)
 		[]() { return cmd::ExecutionNotPossible::ToBool(selection::checkUngroupSelectedAvailable); }),
 		IOrthoContextMenu::SECTION_SELECTION_GROUPS);
 
-	_eClassColourManager.reset(new EntityClassColourManager);
 	_longOperationHandler.reset(new LongRunningOperationHandler);
 	_mapFileProgressHandler.reset(new MapFileProgressHandler);
 	_autoSaveRequestHandler.reset(new AutoSaveRequestHandler);
@@ -230,7 +229,6 @@ void UserInterfaceModule::shutdownModule()
 	_entitySettingsConn.disconnect();
 
 	_longOperationHandler.reset();
-	_eClassColourManager.reset();
 	_mapFileProgressHandler.reset();
 	_fileSelectionRequestHandler.reset();
 	_autoSaveRequestHandler.reset();

diff --git a/radiant/ui/UserInterfaceModule.h b/radiant/ui/UserInterfaceModule.h
@@ -7,7 +7,6 @@
 #include "iorthocontextmenu.h"
 #include "icommandsystem.h"
 
-#include "EntityClassColourManager.h"
 #include "LongRunningOperationHandler.h"
 #include "FileSelectionRequestHandler.h"
 #include "AutoSaveRequestHandler.h"
@@ -37,7 +36,6 @@ class UserInterfaceModule :
 	public RegisterableModule
 {
 private:
-	std::unique_ptr<EntityClassColourManager> _eClassColourManager;
 	std::unique_ptr<LongRunningOperationHandler> _longOperationHandler;
 	std::unique_ptr<MapFileProgressHandler> _mapFileProgressHandler;
 	std::unique_ptr<AutoSaveRequestHandler> _autoSaveRequestHandler;

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -251,7 +251,6 @@
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp" />
     <ClCompile Include="..\..\radiant\ui\eclasstree\EClassTree.cpp" />
     <ClCompile Include="..\..\radiant\ui\eclasstree\EClassTreeBuilder.cpp" />
-    <ClCompile Include="..\..\radiant\ui\EntityClassColourManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\entitylist\EntityList.cpp" />
     <ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp" />
     <ClCompile Include="..\..\radiant\ui\filters\editor\FilterDialog.cpp" />
@@ -434,7 +433,6 @@
     <ClInclude Include="..\..\radiant\ui\Documentation.h" />
     <ClInclude Include="..\..\radiant\ui\eclasstree\EClassTree.h" />
     <ClInclude Include="..\..\radiant\ui\eclasstree\EClassTreeBuilder.h" />
-    <ClInclude Include="..\..\radiant\ui\EntityClassColourManager.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\EntityList.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeModel.h" />
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeModelPopulator.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -667,9 +667,6 @@
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderDefinitionView.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\EntityClassColourManager.cpp">
-      <Filter>src\ui</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\map\AutoSaver.cpp">
       <Filter>src\map</Filter>
     </ClCompile>
@@ -1182,9 +1179,6 @@
     <ClInclude Include="..\..\radiant\ui\filters\editor\FilterEditor.h">
       <Filter>src\ui\filters\editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\EntityClassColourManager.h">
-      <Filter>src\ui</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\LongRunningOperationHandler.h">
       <Filter>src\ui</Filter>
     </ClInclude>