#5200: Migrate more onRadiantShutdown() to onMainFrameShuttingDown().

codereader · Aug 28, 2020 · 89cf6c5 · 89cf6c5
1 parent 47c4a09
commit 89cf6c5
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 25 deletions.
diff --git a/plugins/dm.editing/AIEditingPanel.cpp b/plugins/dm.editing/AIEditingPanel.cpp
@@ -5,7 +5,7 @@
 #include "ieclass.h"
 #include "itextstream.h"
 #include "ientityinspector.h"
-#include "iradiant.h"
+#include "imainframe.h"
 #include "iundo.h"
 #include "igroupdialog.h"
 #include "iuimanager.h"
@@ -39,8 +39,8 @@ AIEditingPanel::AIEditingPanel() :
 
 	constructWidgets();
 
-	GlobalRadiant().signal_radiantShutdown().connect(
-		sigc::mem_fun(*this, &AIEditingPanel::onRadiantShutdown)
+	GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+		sigc::mem_fun(*this, &AIEditingPanel::onMainFrameShuttingDown)
 	);	
 
 	_selectionChangedSignal = GlobalSelectionSystem().signal_selectionChanged().connect(
@@ -288,7 +288,7 @@ void AIEditingPanel::onMainFrameConstructed()
 		sigc::mem_fun(Instance(), &AIEditingPanel::updateWidgetsFromSelection));
 }
 
-void AIEditingPanel::onRadiantShutdown()
+void AIEditingPanel::onMainFrameShuttingDown()
 {
 	_undoHandler.disconnect();
 	_redoHandler.disconnect();

diff --git a/plugins/dm.editing/AIEditingPanel.h b/plugins/dm.editing/AIEditingPanel.h
@@ -80,7 +80,7 @@ class AIEditingPanel :
 									  const std::string& buttonLabel, const std::string& buttonIcon,
 									  const std::string& key);
 
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 	void onSelectionChanged(const ISelectable& selectable);
 
 	void rescanSelection();

diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
@@ -60,6 +60,8 @@ void RadiantModule::shutdownModule()
 {
 	rMessage() << getName() << "::shutdownModule called." << std::endl;
 
+    broadcastShutdownEvent();
+
 	_radiantStarted.clear();
     _radiantShutdown.clear();
 }

diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
@@ -74,7 +74,6 @@ const StringSet& MainFrame::getDependencies() const
 		_dependencies.insert(MODULE_ORTHOVIEWMANAGER);
 		_dependencies.insert(MODULE_CAMERA);
 		_dependencies.insert(MODULE_MAP);
-		_dependencies.insert(MODULE_RADIANT_APP);
 	}
 
 	return _dependencies;
@@ -149,8 +148,9 @@ void MainFrame::initialiseModule(const IApplicationContext& ctx)
 		sigc::mem_fun(this, &MainFrame::updateTitle)
 	);
 
-	GlobalRadiant().signal_radiantStarted().connect(
-		sigc::mem_fun(this, &MainFrame::onRadiantStarted));
+	// Subscribe for the post-module init event
+	module::GlobalModuleRegistry().signal_allModulesInitialised().connect(
+		sigc::mem_fun(this, &MainFrame::postModuleInitialisation));
 }
 
 void MainFrame::shutdownModule()
@@ -173,7 +173,7 @@ void MainFrame::exitCmd(const cmd::ArgumentList& args)
 	}
 }
 
-void MainFrame::onRadiantStarted()
+void MainFrame::postModuleInitialisation()
 {
 	// Initialise the mainframe
 	construct();
@@ -354,9 +354,6 @@ void MainFrame::onTopLevelFrameClose(wxCloseEvent& ev)
 	signal_MainFrameShuttingDown().emit();
 	signal_MainFrameShuttingDown().clear();
 
-	// TODO: Remove this
-	radiant::getGlobalRadiant()->broadcastShutdownEvent();
-
     // Destroy the actual window
     _topLevelWindow->Destroy();
 

diff --git a/radiant/ui/mainframe/MainFrame.h b/radiant/ui/mainframe/MainFrame.h
@@ -91,7 +91,7 @@ class MainFrame :
 	void createTopLevelWindow();
 
 	// Constructs the MainFrame and shows the Window
-	void onRadiantStarted();
+	void postModuleInitialisation();
 
 #ifdef WIN32
 	// Enables or disabled desktop composition, Windows-specific

diff --git a/radiant/uimanager/GroupDialog.cpp b/radiant/uimanager/GroupDialog.cpp
@@ -53,8 +53,8 @@ void GroupDialog::construct()
 {
 	InstancePtr() = GroupDialogPtr(new GroupDialog);
 
-	GlobalRadiant().signal_radiantShutdown().connect(
-        sigc::mem_fun(*InstancePtr(), &GroupDialog::onRadiantShutdown)
+	GlobalMainFrame().signal_MainFrameShuttingDown().connect(
+        sigc::mem_fun(*InstancePtr(), &GroupDialog::onMainFrameShuttingDown)
     );
 
 	GlobalMainFrame().signal_MainFrameConstructed().connect(
@@ -249,7 +249,7 @@ void GroupDialog::onMainFrameConstructed()
 	}
 }
 
-void GroupDialog::onRadiantShutdown()
+void GroupDialog::onMainFrameShuttingDown()
 {
 	if (IsShownOnScreen())
 	{

diff --git a/radiant/uimanager/GroupDialog.h b/radiant/uimanager/GroupDialog.h
@@ -113,7 +113,7 @@ class GroupDialog :
 	/** greebo: Safely disconnects this window from
 	* 			the eventmanager and saves the window position.
 	*/
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 	// Shows the most recently active page
 	void onMainFrameConstructed();

diff --git a/radiant/uimanager/StatusBarManager.cpp b/radiant/uimanager/StatusBarManager.cpp
@@ -215,12 +215,12 @@ void StatusBarManager::rebuildStatusBar()
 	_statusBar->Show();
 }
 
-void StatusBarManager::onRadiantShutdown()
+void StatusBarManager::onMainFrameShuttingDown()
 {
     flushIdleCallback();
 
     _tempParent->Destroy();
-    _tempParent = NULL;
+    _tempParent = nullptr;
 }
 
 } // namespace ui
diff --git a/radiant/uimanager/StatusBarManager.h b/radiant/uimanager/StatusBarManager.h
@@ -98,7 +98,7 @@ class StatusBarManager :
 	 */
     void setText(const std::string& name, const std::string& text, bool immediateUpdate) override;
 
-	void onRadiantShutdown();
+	void onMainFrameShuttingDown();
 
 protected:
 	// Gets called when the app is idle - this fills in the status text

diff --git a/radiant/uimanager/UIManager.cpp b/radiant/uimanager/UIManager.cpp
@@ -58,14 +58,14 @@ IFilterMenuPtr UIManager::createFilterMenu()
 
 void UIManager::clear()
 {
-	_statusBarManager->onRadiantShutdown();
+	_statusBarManager->onMainFrameShuttingDown();
 
 	_menuManager->clear();
-	_dialogManager = DialogManagerPtr();
+	_dialogManager.reset();
 
 	wxFileSystem::CleanUpHandlers();
 	wxArtProvider::Delete(_bitmapArtProvider);
-	_bitmapArtProvider = NULL;
+	_bitmapArtProvider = nullptr;
 }
 
 const std::string& UIManager::ArtIdPrefix() const
@@ -116,7 +116,7 @@ void UIManager::initialiseModule(const IApplicationContext& ctx)
 	GlobalCommandSystem().addCommand("AnimationPreview", MD5AnimationViewer::Show);
 	GlobalCommandSystem().addCommand("EditColourScheme", ColourSchemeEditor::DisplayDialog);
 
-	GlobalRadiant().signal_radiantShutdown().connect(
+	GlobalMainFrame().signal_MainFrameShuttingDown().connect(
         sigc::mem_fun(this, &UIManager::clear)
     );
 

diff --git a/radiantcore/map/MapPositionManager.cpp b/radiantcore/map/MapPositionManager.cpp
@@ -103,7 +103,7 @@ namespace map
 
 MapPositionManager::MapPositionManager()
 {
-	GlobalMapModule().signal_mapEvent().connect(
+	_mapEventConn = GlobalMapModule().signal_mapEvent().connect(
 		sigc::mem_fun(this, &MapPositionManager::onMapEvent)
 	);
 
@@ -129,6 +129,11 @@ MapPositionManager::MapPositionManager()
 	}
 }
 
+MapPositionManager::~MapPositionManager()
+{
+	_mapEventConn.disconnect();
+}
+
 void MapPositionManager::convertLegacyPositions()
 {
 	Entity* worldspawn = map::current::getWorldspawn();

diff --git a/radiantcore/map/MapPositionManager.h b/radiantcore/map/MapPositionManager.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+#include <sigc++/connection.h>
 #include "imap.h"
 #include "MapPosition.h"
 
@@ -15,8 +16,11 @@ class MapPositionManager
 
 	PositionMap _positions;
 
+	sigc::connection _mapEventConn;
+
 public:
 	MapPositionManager();
+	~MapPositionManager();
 
 private:
 	void convertLegacyPositions();