#5408: Migrate UI classes to subscribe to the IMap postUndo/postRedo …

…signals instead of the GlobalUndoSystem()
codereader · Oct 24, 2021 · 3c68884 · 3c68884
1 parent 1154843
commit 3c68884
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/plugins/dm.editing/AIEditingPanel.cpp b/plugins/dm.editing/AIEditingPanel.cpp
@@ -3,6 +3,7 @@
 #include "i18n.h"
 #include "iselection.h"
 #include "ieclass.h"
+#include "imap.h"
 #include "itextstream.h"
 #include "ui/ientityinspector.h"
 #include "ui/imainframe.h"
@@ -281,9 +282,9 @@ void AIEditingPanel::onMainFrameConstructed()
 	Instance()._tempParent->Destroy();
 	Instance()._tempParent = nullptr;
 
-	Instance()._undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+	Instance()._undoHandler = GlobalMapModule().signal_postUndo().connect(
 		sigc::mem_fun(Instance(), &AIEditingPanel::updateWidgetsFromSelection));
-	Instance()._redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+	Instance()._redoHandler = GlobalMapModule().signal_postRedo().connect(
 		sigc::mem_fun(Instance(), &AIEditingPanel::updateWidgetsFromSelection));
 }
 

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -9,6 +9,7 @@
 #include "ui/imainframe.h"
 #include "igl.h"
 #include "iundo.h"
+#include "imap.h"
 #include "igrid.h"
 #include "iradiant.h"
 #include "ui/itoolbarmanager.h"
@@ -227,9 +228,9 @@ void TexTool::_preShow()
         radiant::TypeListener<selection::GridSnapRequest>(
             sigc::mem_fun(this, &TexTool::handleGridSnapRequest)));
 
-	_undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+	_undoHandler = GlobalMapModule().signal_postUndo().connect(
 		sigc::mem_fun(this, &TexTool::onUndoRedoOperation));
-	_redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+	_redoHandler = GlobalMapModule().signal_postRedo().connect(
 		sigc::mem_fun(this, &TexTool::onUndoRedoOperation));
 
     _manipulatorChanged = GlobalTextureToolSelectionSystem().signal_activeManipulatorChanged().connect(

diff --git a/radiant/ui/lightinspector/LightInspector.cpp b/radiant/ui/lightinspector/LightInspector.cpp
@@ -274,9 +274,9 @@ void LightInspector::_preShow()
     _redoHandler.disconnect();
 
     // Register self as observer to receive events
-    _undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+    _undoHandler = GlobalMapModule().signal_postUndo().connect(
         sigc::mem_fun(this, &LightInspector::update));
-    _redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+    _redoHandler = GlobalMapModule().signal_postRedo().connect(
         sigc::mem_fun(this, &LightInspector::update));
 
     // Register self to the SelSystem to get notified upon selection changes.

diff --git a/radiant/ui/merge/MergeControlDialog.cpp b/radiant/ui/merge/MergeControlDialog.cpp
@@ -497,9 +497,9 @@ void MergeControlDialog::_preShow()
         sigc::mem_fun(this, &MergeControlDialog::onMapEvent)
     );
 
-    _undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+    _undoHandler = GlobalMapModule().signal_postUndo().connect(
         sigc::mem_fun(this, &MergeControlDialog::queueUpdate));
-    _redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+    _redoHandler = GlobalMapModule().signal_postRedo().connect(
         sigc::mem_fun(this, &MergeControlDialog::queueUpdate));
 
     // Check for selection changes before showing the dialog again

diff --git a/radiant/ui/patch/PatchInspector.cpp b/radiant/ui/patch/PatchInspector.cpp
@@ -272,9 +272,9 @@ void PatchInspector::_preShow()
 	// Register self to the SelSystem to get notified upon selection changes.
 	GlobalSelectionSystem().addObserver(this);
 
-	_undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+	_undoHandler = GlobalMapModule().signal_postUndo().connect(
 		sigc::mem_fun(this, &PatchInspector::queueUpdate));
-	_redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+	_redoHandler = GlobalMapModule().signal_postRedo().connect(
 		sigc::mem_fun(this, &PatchInspector::queueUpdate));
 
 	// Check for selection changes before showing the dialog again

diff --git a/radiant/ui/surfaceinspector/SurfaceInspector.cpp b/radiant/ui/surfaceinspector/SurfaceInspector.cpp
@@ -806,9 +806,9 @@ void SurfaceInspector::_preShow()
 	_selectionChanged = GlobalSelectionSystem().signal_selectionChanged().connect(
 		[this] (const ISelectable&) { doUpdate(); });
 
-	_undoHandler = GlobalUndoSystem().signal_postUndo().connect(
+	_undoHandler = GlobalMapModule().signal_postUndo().connect(
 		sigc::mem_fun(this, &SurfaceInspector::doUpdate));
-	_redoHandler = GlobalUndoSystem().signal_postRedo().connect(
+	_redoHandler = GlobalMapModule().signal_postRedo().connect(
 		sigc::mem_fun(this, &SurfaceInspector::doUpdate));
 
 	// Get notified about texture changes

diff --git a/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp b/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp
@@ -207,24 +207,17 @@ const std::string& ShaderClipboard::getName() const
 
 const StringSet& ShaderClipboard::getDependencies() const
 {
-	static StringSet _dependencies;
-
-	if (_dependencies.empty())
-	{
-		_dependencies.insert(MODULE_UNDOSYSTEM);
-		_dependencies.insert(MODULE_MAP);
-	}
-
+    static StringSet _dependencies{ MODULE_MAP };
 	return _dependencies;
 }
 
 void ShaderClipboard::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 
-	_postUndoConn = GlobalUndoSystem().signal_postUndo().connect(
+	_postUndoConn = GlobalMapModule().signal_postUndo().connect(
 		sigc::mem_fun(this, &ShaderClipboard::onUndoRedoOperation));
-	_postRedoConn = GlobalUndoSystem().signal_postRedo().connect(
+	_postRedoConn = GlobalMapModule().signal_postRedo().connect(
 		sigc::mem_fun(this, &ShaderClipboard::onUndoRedoOperation));
 
 	_mapEventConn = GlobalMapModule().signal_mapEvent().connect(