#5231: Privatise a method that is only used internally by the EventMa…

…nager.
codereader · May 7, 2020 · 77d4f04 · 77d4f04
1 parent 97b0d43
commit 77d4f04
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/include/ieventmanager.h b/include/ieventmanager.h
@@ -135,7 +135,6 @@ class IEventManager :
 
 	// The same as above, but with event values as argument (event->keyval, event->state)
 	virtual IAccelerator& addAccelerator(wxKeyEvent& ev) = 0;
-	virtual IAccelerator& findAccelerator(const IEventPtr& event) = 0;
 	virtual std::string getAcceleratorStr(const IEventPtr& event, bool forMenu) = 0;
 
 	// Loads all accelerator bindings from the defaults in the stock input.xml

diff --git a/radiant/eventmanager/EventManager.h b/radiant/eventmanager/EventManager.h
@@ -86,14 +86,14 @@ class EventManager :
 	void foreachEvent(IEventVisitor& eventVisitor) override;
 
 	// Tries to locate an accelerator, that is connected to the given command
-	Accelerator& findAccelerator(const IEventPtr& event) override;
     AcceleratorList findAccelerator(wxKeyEvent& ev);
 
 	std::string getEventStr(wxKeyEvent& ev) override;
 
 private:
 	void saveEventListToRegistry();
 
+	Accelerator& findAccelerator(const IEventPtr& event);
 	AcceleratorList findAccelerator(const std::string& key, const std::string& modifierStr);
 
 	bool duplicateAccelerator(const std::string& key, const std::string& modifiers, const IEventPtr& event);

diff --git a/radiant/ui/commandlist/CommandList.cpp b/radiant/ui/commandlist/CommandList.cpp
@@ -109,15 +109,7 @@ std::string CommandList::getSelectedCommand()
 	{
 		wxutil::TreeModel::Row row(item, *_listStore);
 
-		const std::string commandName = row[_columns.command];
-
-		IEventPtr ev = GlobalEventManager().findEvent(commandName);
-
-		// Double check, if the command exists
-		if (ev != NULL)
-		{
-			return commandName;
-		}
+		return static_cast<std::string>(row[_columns.command]);
 	}
 
 	return "";