#5588: Move ieventmanager.h header to ui/ folder.

codereader · Oct 14, 2021 · f3a84f0 · f3a84f0
1 parent 9834d86
commit f3a84f0
Show file tree

Hide file tree

Showing 76 changed files with 36 additions and 80 deletions.
diff --git a/include/precompiled_interfaces.h b/include/precompiled_interfaces.h
@@ -20,7 +20,6 @@
 #include "idatastream.h"
 #include "ieclass.h"
 #include "ientity.h"
-#include "ieventmanager.h"
 #include "ifilechooser.h"
 #include "ifilesystem.h"
 #include "ifiletypes.h"

diff --git a/include/precompiled_ui_interfaces.h b/include/precompiled_ui_interfaces.h
@@ -4,7 +4,8 @@
  */
 #pragma once
 
-// Add DarkRadiant interfaces
+// Add UI-related interfaces
 #include "ui/idialogmanager.h"
 #include "ui/ianimationchooser.h"
 #include "ui/ientityinspector.h"
+#include "ui/ieventmanager.h"
diff --git a/include/ieventmanager.h → include/ui/ieventmanager.h b/include/ieventmanager.h → include/ui/ieventmanager.h
diff --git a/libs/wxutil/menu/FilterPopupMenu.cpp b/libs/wxutil/menu/FilterPopupMenu.cpp
@@ -1,6 +1,6 @@
 #include "FilterPopupMenu.h"
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include <wx/menu.h>
 
 #include "wxutil/menu/IconTextMenuItem.h"

diff --git a/libs/wxutil/preview/ParticlePreview.cpp b/libs/wxutil/preview/ParticlePreview.cpp
@@ -1,6 +1,6 @@
 #include "ParticlePreview.h"
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "ientity.h"
 #include "ieclass.h"
 #include "iparticles.h"

diff --git a/plugins/dm.conversation/ConversationDialog.h b/plugins/dm.conversation/ConversationDialog.h
@@ -2,7 +2,6 @@
 
 #include <map>
 
-#include "ieventmanager.h"
 #include "ientity.h"
 #include "icommandsystem.h"
 #include "iradiant.h"

diff --git a/plugins/dm.conversation/plugin.cpp b/plugins/dm.conversation/plugin.cpp
@@ -2,7 +2,6 @@
 
 #include "i18n.h"
 #include "itextstream.h"
-#include "ieventmanager.h"
 #include "icommandsystem.h"
 #include "imenumanager.h"
 #include "generic/callback.h"

diff --git a/plugins/dm.difficulty/plugin.cpp b/plugins/dm.difficulty/plugin.cpp
@@ -1,7 +1,6 @@
 #include "imodule.h"
 
 #include "i18n.h"
-#include "ieventmanager.h"
 #include "itextstream.h"
 #include "ieclass.h"
 #include "iscenegraph.h"

diff --git a/plugins/dm.editing/plugin.cpp b/plugins/dm.editing/plugin.cpp
@@ -1,7 +1,6 @@
 #include "imodule.h"
 
 #include "i18n.h"
-#include "ieventmanager.h"
 #include "iradiant.h"
 #include "imenumanager.h"
 #include "iselection.h"

diff --git a/plugins/dm.gameconnection/GameConnection.cpp b/plugins/dm.gameconnection/GameConnection.cpp
@@ -12,7 +12,6 @@
 #include "ientity.h"
 #include "iselection.h"
 #include "imenumanager.h"
-#include "ieventmanager.h"
 #include "imainframe.h"
 
 #include "scene/Traverse.h"

diff --git a/plugins/dm.gameconnection/GameConnection.h b/plugins/dm.gameconnection/GameConnection.h
@@ -2,7 +2,7 @@
 
 #include "icommandsystem.h"
 #include "iscenegraph.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 
 #include "MapObserver.h"
 

diff --git a/plugins/dm.gui/plugin.cpp b/plugins/dm.gui/plugin.cpp
@@ -10,7 +10,6 @@
 // Modules
 #include "icommandsystem.h"
 #include "ientity.h"
-#include "ieventmanager.h"
 #include "ifilesystem.h"
 #include "ifonts.h"
 #include "igame.h"

diff --git a/plugins/dm.objectives/objectives.cpp b/plugins/dm.objectives/objectives.cpp
@@ -2,7 +2,6 @@
 
 #include "i18n.h"
 #include "imodule.h"
-#include "ieventmanager.h"
 #include "imenumanager.h"
 #include "iradiant.h"
 #include "iscenegraph.h"
@@ -41,7 +40,6 @@ class ObjectivesEditorModule :
 		static StringSet _dependencies;
 
 		if (_dependencies.empty()) {
-			_dependencies.insert(MODULE_EVENTMANAGER);
 			_dependencies.insert(MODULE_MENUMANAGER);
 			_dependencies.insert(MODULE_COMMANDSYSTEM);
 		}

diff --git a/plugins/dm.stimresponse/plugin.cpp b/plugins/dm.stimresponse/plugin.cpp
@@ -1,7 +1,6 @@
 #include "imodule.h"
 
 #include "itextstream.h"
-#include "ieventmanager.h"
 #include "ieclass.h"
 #include "iscenegraph.h"
 #include "icommandsystem.h"

diff --git a/plugins/script/ScriptingSystem.cpp b/plugins/script/ScriptingSystem.cpp
@@ -7,7 +7,6 @@
 #include "i18n.h"
 #include "itextstream.h"
 #include "iradiant.h"
-#include "ieventmanager.h"
 #include "imainframe.h"
 #include "igroupdialog.h"
 #include "iundo.h"

diff --git a/radiant/camera/CamWnd.cpp b/radiant/camera/CamWnd.cpp
@@ -4,7 +4,6 @@
 #include "ibrush.h"
 #include "iclipper.h"
 #include "icolourscheme.h"
-#include "ieventmanager.h"
 #include "imainframe.h"
 #include "itextstream.h"
 #include "iorthoview.h"

diff --git a/radiant/camera/CamWnd.h b/radiant/camera/CamWnd.h
@@ -3,7 +3,7 @@
 #include "iscenegraph.h"
 #include "imousetool.h"
 #include "icameraview.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "igl.h"
 #include "irender.h"
 #include "wxutil/GLWidget.h"

diff --git a/radiant/camera/CameraSettings.cpp b/radiant/camera/CameraSettings.cpp
@@ -1,7 +1,6 @@
 #include "CameraSettings.h"
 
 #include "i18n.h"
-#include "ieventmanager.h"
 #include "ipreferencesystem.h"
 
 #include "registry/registry.h"

diff --git a/radiant/camera/CameraWndManager.cpp b/radiant/camera/CameraWndManager.cpp
@@ -1,7 +1,6 @@
 #include "CameraWndManager.h"
 
 #include "imousetoolmanager.h"
-#include "ieventmanager.h"
 #include "iselection.h"
 #include "itextstream.h"
 #include "xmlutil/Node.h"

diff --git a/radiant/camera/CameraWndManager.h b/radiant/camera/CameraWndManager.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include "icommandsystem.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "imousetoolmanager.h"
 
 #include "CamWnd.h"

diff --git a/radiant/eventmanager/Accelerator.h b/radiant/eventmanager/Accelerator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 
 #include <list>
 #include <iostream>

diff --git a/radiant/eventmanager/EventManager.h b/radiant/eventmanager/EventManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include <wx/event.h>
 #include <sigc++/connection.h>
 

diff --git a/radiant/eventmanager/KeyEvent.h b/radiant/eventmanager/KeyEvent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "Event.h"
 
 namespace ui

diff --git a/radiant/eventmanager/RegistryToggle.h b/radiant/eventmanager/RegistryToggle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "Toggle.h"
 
 #include "registry/adaptors.h"

diff --git a/radiant/eventmanager/ShortcutSaver.h b/radiant/eventmanager/ShortcutSaver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "iregistry.h"
 
 #include "xmlutil/Node.h"

diff --git a/radiant/eventmanager/Statement.h b/radiant/eventmanager/Statement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 
 #include <wx/event.h>
 #include <sigc++/connection.h>

diff --git a/radiant/eventmanager/Toggle.h b/radiant/eventmanager/Toggle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include <functional>
 
 #include <sigc++/connection.h>

diff --git a/radiant/eventmanager/WidgetToggle.h b/radiant/eventmanager/WidgetToggle.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "Toggle.h"
 
 #include <sigc++/connection.h>

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -2,7 +2,7 @@
 
 #include <limits>
 #include "i18n.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "icommandsystem.h"
 #include "itexturetoolmodel.h"
 #include "itexturetoolcolours.h"

diff --git a/radiant/textool/TexToolModeToggles.h b/radiant/textool/TexToolModeToggles.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "itexturetoolmodel.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 
 #include <sigc++/connection.h>
 

diff --git a/radiant/ui/ManipulatorToggle.h b/radiant/ui/ManipulatorToggle.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "iselection.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "iclipper.h"
 
 #include <sigc++/connection.h>

diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -11,7 +11,7 @@
 #include "ibrush.h"
 #include "ipatch.h"
 #include "iorthocontextmenu.h"
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "imousetool.h"
 #include "imainframe.h"
 #include "ishaders.h"

diff --git a/radiant/ui/aas/AasControlDialog.cpp b/radiant/ui/aas/AasControlDialog.cpp
@@ -5,7 +5,6 @@
 #include "iradiant.h"
 #include "imainframe.h"
 #include "itextstream.h"
-#include "ieventmanager.h"
 #include "imap.h"
 
 #include <wx/button.h>

diff --git a/radiant/ui/commandlist/CommandListPopulator.h b/radiant/ui/commandlist/CommandListPopulator.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "ieventmanager.h"
+#include "ui/ieventmanager.h"
 #include "CommandList.h"
 #include "wxutil/dataview/TreeModel.h"
 
 /* greebo: The CommandListPopulator is an Event visitor class that cycles
  * through all the registered events and stores the name and the associated
- * shortcut representation into the given GtkListStore widget.
+ * shortcut representation into the given TreeModel.
  */
 namespace ui
 {

diff --git a/radiant/ui/commandlist/ShortcutChooser.cpp b/radiant/ui/commandlist/ShortcutChooser.cpp
@@ -3,6 +3,7 @@
 #include "imainframe.h"
 #include "i18n.h"
 #include "ui/idialogmanager.h"
+#include "ui/ieventmanager.h"
 
 #include <wx/sizer.h>
 #include <wx/stattext.h>

diff --git a/radiant/ui/commandlist/ShortcutChooser.h b/radiant/ui/commandlist/ShortcutChooser.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-#include "ieventmanager.h"
 #include "wxutil/dialog/DialogBase.h"
 #include <wx/event.h>
 

diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -6,7 +6,6 @@
 #include "ientity.h"
 #include "ieclass.h"
 #include "iregistry.h"
-#include "ieventmanager.h"
 #include "igame.h"
 #include "imap.h"
 #include "iundo.h"
@@ -488,7 +487,6 @@ const StringSet& EntityInspector::getDependencies() const
         MODULE_UNDOSYSTEM,
         MODULE_GAMEMANAGER,
         MODULE_COMMANDSYSTEM,
-        MODULE_EVENTMANAGER,
         MODULE_MAINFRAME
     };
 

diff --git a/radiant/ui/entitylist/EntityList.cpp b/radiant/ui/entitylist/EntityList.cpp
@@ -1,6 +1,5 @@
 #include "EntityList.h"
 
-#include "ieventmanager.h"
 #include "imainframe.h"
 #include "icommandsystem.h"
 

diff --git a/radiant/ui/filters/FilterUserInterface.cpp b/radiant/ui/filters/FilterUserInterface.cpp
@@ -1,7 +1,6 @@
 #include "FilterUserInterface.h"
 
 #include "ifilter.h"
-#include "ieventmanager.h"
 #include "imainframe.h"
 #include "imenumanager.h"
 #include "icommandsystem.h"

diff --git a/radiant/ui/filters/FilterUserInterface.h b/radiant/ui/filters/FilterUserInterface.h
@@ -2,8 +2,8 @@
 
 #include <map>
 #include <sigc++/connection.h>
+#include "ui/ieventmanager.h"
 #include "imodule.h"
-#include "ieventmanager.h"
 
 namespace ui
 {

diff --git a/radiant/ui/grid/GridUserInterface.cpp b/radiant/ui/grid/GridUserInterface.cpp
@@ -5,6 +5,7 @@
 
 #include "i18n.h"
 #include "istatusbarmanager.h"
+#include "ui/ieventmanager.h"
 #include "imainframe.h"
 
 #include "module/StaticModule.h"

diff --git a/radiant/ui/grid/GridUserInterface.h b/radiant/ui/grid/GridUserInterface.h
@@ -2,7 +2,6 @@
 
 #include "imodule.h"
 #include "igrid.h"
-#include "ieventmanager.h"
 #include <map>
 #include <sigc++/connection.h>
 

diff --git a/radiant/ui/groupdialog/GroupDialog.cpp b/radiant/ui/groupdialog/GroupDialog.cpp
@@ -2,7 +2,6 @@
 
 #include "iregistry.h"
 #include "imainframe.h"
-#include "ieventmanager.h"
 #include "i18n.h"
 #include <iostream>
 #include <vector>

diff --git a/radiant/ui/layers/LayerControl.cpp b/radiant/ui/layers/LayerControl.cpp
@@ -2,7 +2,6 @@
 
 #include "i18n.h"
 #include "iradiant.h"
-#include "ieventmanager.h"
 #include "ui/idialogmanager.h"
 #include "icolourscheme.h"
 #include "wxutil/dialog/Dialog.h"

diff --git a/radiant/ui/layers/LayerControlDialog.cpp b/radiant/ui/layers/LayerControlDialog.cpp
@@ -2,7 +2,6 @@
 
 #include "i18n.h"
 #include "itextstream.h"
-#include "ieventmanager.h"
 #include "ilayer.h"
 #include "imainframe.h"
 #include "iselection.h"

diff --git a/radiant/ui/mainframe/AuiLayout.cpp b/radiant/ui/mainframe/AuiLayout.cpp
@@ -2,7 +2,6 @@
 
 #include "i18n.h"
 #include "itextstream.h"
-#include "ieventmanager.h"
 #include "imenumanager.h"
 #include "igroupdialog.h"
 #include "imainframe.h"