#5588: Move imediabrowser.h, imenu.h and imenumanager.h headers to ui…

…/ folder.
codereader · Oct 14, 2021 · 89039e9 · 89039e9
1 parent 5224cb2
commit 89039e9
Show file tree

Hide file tree

Showing 36 changed files with 42 additions and 37 deletions.
diff --git a/include/iorthocontextmenu.h b/include/iorthocontextmenu.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "imodule.h"
-#include "imenu.h"
+#include "ui/imenu.h"
 
 namespace ui
 {

diff --git a/include/precompiled_interfaces.h b/include/precompiled_interfaces.h
@@ -40,8 +40,6 @@
 #include "imapresource.h"
 #include "imd5anim.h"
 #include "imd5model.h"
-#include "imediabrowser.h"
-#include "imenu.h"
 #include "imessagebus.h"
 #include "imodel.h"
 #include "imodelcache.h"

diff --git a/include/precompiled_ui_interfaces.h b/include/precompiled_ui_interfaces.h
@@ -11,3 +11,4 @@
 #include "ui/ieventmanager.h"
 #include "ui/igroupdialog.h"
 #include "ui/imainframe.h"
+#include "ui/imenumanager.h"
diff --git a/include/imediabrowser.h → include/ui/imediabrowser.h b/include/imediabrowser.h → include/ui/imediabrowser.h
diff --git a/include/imenu.h → include/ui/imenu.h b/include/imenu.h → include/ui/imenu.h
diff --git a/include/imenumanager.h → include/ui/imenumanager.h b/include/imenumanager.h → include/ui/imenumanager.h
diff --git a/libs/wxutil/menu/MenuItem.h b/libs/wxutil/menu/MenuItem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "imenu.h"
+#include "ui/imenu.h"
 
 #include <wx/menuitem.h>
 

diff --git a/libs/wxutil/menu/PopupMenu.h b/libs/wxutil/menu/PopupMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "imenu.h"
+#include "ui/imenu.h"
 
 #include <functional>
 #include <memory>

diff --git a/libs/wxutil/menu/SeparatorItem.h b/libs/wxutil/menu/SeparatorItem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "imenu.h"
+#include "ui/imenu.h"
 
 #include <wx/menuitem.h>
 

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

diff --git a/plugins/dm.difficulty/plugin.cpp b/plugins/dm.difficulty/plugin.cpp
@@ -4,7 +4,7 @@
 #include "itextstream.h"
 #include "ieclass.h"
 #include "iscenegraph.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iregistry.h"
 #include "iselection.h"
 #include "iradiant.h"

diff --git a/plugins/dm.editing/plugin.cpp b/plugins/dm.editing/plugin.cpp
@@ -2,7 +2,7 @@
 
 #include "i18n.h"
 #include "iradiant.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iselection.h"
 #include "ui/ientityinspector.h"
 #include "icommandsystem.h"

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

diff --git a/plugins/dm.gui/plugin.cpp b/plugins/dm.gui/plugin.cpp
@@ -21,7 +21,7 @@
 #include "iregistry.h"
 #include "irender.h"
 #include "ishaders.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iarchive.h"
 
 class GuiModule :

diff --git a/plugins/dm.objectives/objectives.cpp b/plugins/dm.objectives/objectives.cpp
@@ -2,7 +2,7 @@
 
 #include "i18n.h"
 #include "imodule.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iradiant.h"
 #include "iscenegraph.h"
 #include "ieclass.h"

diff --git a/plugins/dm.stimresponse/plugin.cpp b/plugins/dm.stimresponse/plugin.cpp
@@ -4,7 +4,7 @@
 #include "ieclass.h"
 #include "iscenegraph.h"
 #include "icommandsystem.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iregistry.h"
 #include "iselection.h"
 #include "iradiant.h"

diff --git a/radiant/ui/filters/FilterOrthoContextMenuItem.h b/radiant/ui/filters/FilterOrthoContextMenuItem.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "imenu.h"
+#include "ui/imenu.h"
 #include "ifilter.h"
 
 #include "FilterContextMenu.h"

diff --git a/radiant/ui/filters/FilterUserInterface.cpp b/radiant/ui/filters/FilterUserInterface.cpp
@@ -2,7 +2,7 @@
 
 #include "ifilter.h"
 #include "ui/imainframe.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "icommandsystem.h"
 #include <sigc++/functors/mem_fun.h>
 

diff --git a/radiant/ui/filters/FiltersMainMenu.cpp b/radiant/ui/filters/FiltersMainMenu.cpp
@@ -2,7 +2,7 @@
 
 #include "i18n.h"
 #include "ifilter.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 
 namespace ui 
 {

diff --git a/radiant/ui/layers/LayerOrthoContextMenuItem.h b/radiant/ui/layers/LayerOrthoContextMenuItem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "imenu.h"
+#include "ui/imenu.h"
 #include "ilayer.h"
 #include <memory>
 #include "LayerContextMenu.h"

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

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

diff --git a/radiant/ui/mainframe/LayoutCommand.h b/radiant/ui/mainframe/LayoutCommand.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "i18n.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "icommandsystem.h"
 #include "ui/imainframe.h"
 

diff --git a/radiant/ui/mainframe/RegularLayout.cpp b/radiant/ui/mainframe/RegularLayout.cpp
@@ -1,7 +1,7 @@
 #include "RegularLayout.h"
 
 #include "itextstream.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "ui/igroupdialog.h"
 #include "ui/imainframe.h"
 #include "ui/ientityinspector.h"

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

diff --git a/radiant/ui/mainframe/TopLevelFrame.cpp b/radiant/ui/mainframe/TopLevelFrame.cpp
@@ -2,7 +2,7 @@
 
 #include "itextstream.h"
 #include "i18n.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "istatusbarmanager.h"
 #include "itoolbarmanager.h"
 #include "wxutil/Bitmap.h"

diff --git a/radiant/ui/materials/editor/MaterialEditorModule.cpp b/radiant/ui/materials/editor/MaterialEditorModule.cpp
@@ -4,7 +4,7 @@
 #include "imodule.h"
 #include "icommandsystem.h"
 #include "itextstream.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "module/StaticModule.h"
 
 namespace ui

diff --git a/radiant/ui/mediabrowser/MediaBrowser.h b/radiant/ui/mediabrowser/MediaBrowser.h
@@ -2,7 +2,7 @@
 
 #include <sigc++/connection.h>
 
-#include "imediabrowser.h"
+#include "ui/imediabrowser.h"
 #include "iradiant.h"
 #include "imodule.h"
 #include "imap.h"

diff --git a/radiant/ui/menu/MenuElement.h b/radiant/ui/menu/MenuElement.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "xmlutil/Node.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include <vector>
 #include <memory>
 

diff --git a/radiant/ui/menu/MenuManager.h b/radiant/ui/menu/MenuManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 
 /** 
  * greebo: The MenuManager takes care of adding and inserting the

diff --git a/radiant/ui/mru/MRUMenu.h b/radiant/ui/mru/MRUMenu.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "imru.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 
 #include <list>
 #include <sigc++/connection.h>

diff --git a/radiant/ui/script/ScriptMenu.cpp b/radiant/ui/script/ScriptMenu.cpp
@@ -1,6 +1,6 @@
 #include "ScriptMenu.h"
 
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "iscript.h"
 #include "i18n.h"
 #include <map>

diff --git a/radiant/ui/script/ScriptUserInterfaceModule.cpp b/radiant/ui/script/ScriptUserInterfaceModule.cpp
@@ -2,7 +2,7 @@
 #include <wx/frame.h>
 
 #include "iscript.h"
-#include "imenumanager.h"
+#include "ui/imenumanager.h"
 #include "ui/imainframe.h"
 #include "i18n.h"
 #include "ui/igroupdialog.h"

diff --git a/radiant/ui/texturebrowser/TextureBrowser.cpp b/radiant/ui/texturebrowser/TextureBrowser.cpp
@@ -9,7 +9,7 @@
 #include "iradiant.h"
 #include "ifavourites.h"
 #include "ipreferencesystem.h"
-#include "imediabrowser.h"
+#include "ui/imediabrowser.h"
 #include "ishaderclipboard.h"
 
 #include "wxutil/menu/IconTextMenuItem.h"

diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj
@@ -146,9 +146,6 @@
     <ClInclude Include="..\..\include\imapresource.h" />
     <ClInclude Include="..\..\include\imd5anim.h" />
     <ClInclude Include="..\..\include\imd5model.h" />
-    <ClInclude Include="..\..\include\imediabrowser.h" />
-    <ClInclude Include="..\..\include\imenu.h" />
-    <ClInclude Include="..\..\include\imenumanager.h" />
     <ClInclude Include="..\..\include\imessagebus.h" />
     <ClInclude Include="..\..\include\imodel.h" />
     <ClInclude Include="..\..\include\imodelcache.h" />
@@ -222,6 +219,9 @@
     <ClInclude Include="..\..\include\ui\igroupdialog.h" />
     <ClInclude Include="..\..\include\ui\imainframe.h" />
     <ClInclude Include="..\..\include\ui\imainframelayout.h" />
+    <ClInclude Include="..\..\include\ui\imediabrowser.h" />
+    <ClInclude Include="..\..\include\ui\imenu.h" />
+    <ClInclude Include="..\..\include\ui\imenumanager.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\include\VolumeIntersectionValue.h" />
   </ItemGroup>

diff --git a/tools/msvc/include.vcxproj.filters b/tools/msvc/include.vcxproj.filters
@@ -50,9 +50,6 @@
     <ClInclude Include="..\..\include\imapresource.h" />
     <ClInclude Include="..\..\include\imd5anim.h" />
     <ClInclude Include="..\..\include\imd5model.h" />
-    <ClInclude Include="..\..\include\imediabrowser.h" />
-    <ClInclude Include="..\..\include\imenu.h" />
-    <ClInclude Include="..\..\include\imenumanager.h" />
     <ClInclude Include="..\..\include\imessagebus.h" />
     <ClInclude Include="..\..\include\imodel.h" />
     <ClInclude Include="..\..\include\imodelcache.h" />
@@ -144,6 +141,15 @@
     <ClInclude Include="..\..\include\ui\imainframelayout.h">
       <Filter>ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\ui\imediabrowser.h">
+      <Filter>ui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ui\imenu.h">
+      <Filter>ui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ui\imenumanager.h">
+      <Filter>ui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ui">