#5588: Move iorthocontextmenu.h and iresourcechooser.h headers to ui/…

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

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/include/precompiled_interfaces.h b/include/precompiled_interfaces.h
@@ -51,7 +51,6 @@
 #include "inameobserver.h"
 #include "inamespace.h"
 #include "inode.h"
-#include "iorthocontextmenu.h"
 #include "iorthoview.h"
 #include "iparticlenode.h"
 #include "iparticles.h"
@@ -64,7 +63,6 @@
 #include "irender.h"
 #include "irenderable.h"
 #include "irendersystemfactory.h"
-#include "iresourcechooser.h"
 #include "iscenegraph.h"
 #include "iscenegraphfactory.h"
 #include "iselectable.h"

diff --git a/include/iorthocontextmenu.h → include/ui/iorthocontextmenu.h b/include/iorthocontextmenu.h → include/ui/iorthocontextmenu.h
diff --git a/include/iresourcechooser.h → include/ui/iresourcechooser.h b/include/iresourcechooser.h → include/ui/iresourcechooser.h
diff --git a/plugins/dm.conversation/CommandArgumentItem.cpp b/plugins/dm.conversation/CommandArgumentItem.cpp
@@ -2,7 +2,7 @@
 
 #include "ui/ianimationchooser.h"
 #include "ui/idialogmanager.h"
-#include "iresourcechooser.h"
+#include "ui/iresourcechooser.h"
 #include "i18n.h"
 #include "string/convert.h"
 #include <wx/checkbox.h>

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

diff --git a/radiant/ui/UserInterfaceModule.h b/radiant/ui/UserInterfaceModule.h
@@ -4,7 +4,7 @@
 #include <wx/event.h>
 
 #include "iuserinterface.h"
-#include "iorthocontextmenu.h"
+#include "ui/iorthocontextmenu.h"
 #include "icommandsystem.h"
 
 #include "LongRunningOperationHandler.h"

diff --git a/radiant/ui/common/SoundChooser.h b/radiant/ui/common/SoundChooser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "iresourcechooser.h"
+#include "ui/iresourcechooser.h"
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/dataview/ResourceTreeView.h"
 #include "wxutil/menu/PopupMenu.h"

diff --git a/radiant/ui/einspector/SoundPropertyEditor.cpp b/radiant/ui/einspector/SoundPropertyEditor.cpp
@@ -1,7 +1,7 @@
 #include "SoundPropertyEditor.h"
 #include "PropertyEditorFactory.h"
 
-#include "iresourcechooser.h"
+#include "ui/iresourcechooser.h"
 #include "ui/idialogmanager.h"
 #include "i18n.h"
 #include "ientity.h"

diff --git a/radiant/ui/ortho/OrthoContextMenu.cpp b/radiant/ui/ortho/OrthoContextMenu.cpp
@@ -4,7 +4,7 @@
 #include "selectionlib.h"
 #include "ibrush.h"
 #include "isound.h"
-#include "iresourcechooser.h"
+#include "ui/iresourcechooser.h"
 #include "ui/idialogmanager.h"
 #include "entitylib.h" // EntityFindByClassnameWalker
 #include "selectionlib.h"

diff --git a/radiant/ui/ortho/OrthoContextMenu.h b/radiant/ui/ortho/OrthoContextMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "iorthocontextmenu.h"
+#include "ui/iorthocontextmenu.h"
 #include "iradiant.h"
 
 #include <map>

diff --git a/radiantcore/selection/group/SelectionGroupManager.cpp b/radiantcore/selection/group/SelectionGroupManager.cpp
@@ -7,7 +7,6 @@
 #include "imapinfofile.h"
 #include "icommandsystem.h"
 #include "iselection.h"
-#include "iorthocontextmenu.h"
 #include "module/StaticModule.h"
 #include "selection/algorithm/Group.h"
 

diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj
@@ -158,7 +158,6 @@
     <ClInclude Include="..\..\include\inameobserver.h" />
     <ClInclude Include="..\..\include\inamespace.h" />
     <ClInclude Include="..\..\include\inode.h" />
-    <ClInclude Include="..\..\include\iorthocontextmenu.h" />
     <ClInclude Include="..\..\include\iorthoview.h" />
     <ClInclude Include="..\..\include\iparticlenode.h" />
     <ClInclude Include="..\..\include\iparticles.h" />
@@ -173,7 +172,6 @@
     <ClInclude Include="..\..\include\irenderable.h" />
     <ClInclude Include="..\..\include\irendersystemfactory.h" />
     <ClInclude Include="..\..\include\irenderview.h" />
-    <ClInclude Include="..\..\include\iresourcechooser.h" />
     <ClInclude Include="..\..\include\iscenegraph.h" />
     <ClInclude Include="..\..\include\iscenegraphfactory.h" />
     <ClInclude Include="..\..\include\iscript.h" />
@@ -222,6 +220,8 @@
     <ClInclude Include="..\..\include\ui\imediabrowser.h" />
     <ClInclude Include="..\..\include\ui\imenu.h" />
     <ClInclude Include="..\..\include\ui\imenumanager.h" />
+    <ClInclude Include="..\..\include\ui\iorthocontextmenu.h" />
+    <ClInclude Include="..\..\include\ui\iresourcechooser.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
@@ -62,7 +62,6 @@
     <ClInclude Include="..\..\include\inameobserver.h" />
     <ClInclude Include="..\..\include\inamespace.h" />
     <ClInclude Include="..\..\include\inode.h" />
-    <ClInclude Include="..\..\include\iorthocontextmenu.h" />
     <ClInclude Include="..\..\include\iorthoview.h" />
     <ClInclude Include="..\..\include\iparticlenode.h" />
     <ClInclude Include="..\..\include\iparticles.h" />
@@ -77,7 +76,6 @@
     <ClInclude Include="..\..\include\irenderable.h" />
     <ClInclude Include="..\..\include\irendersystemfactory.h" />
     <ClInclude Include="..\..\include\irenderview.h" />
-    <ClInclude Include="..\..\include\iresourcechooser.h" />
     <ClInclude Include="..\..\include\iscenegraph.h" />
     <ClInclude Include="..\..\include\iscenegraphfactory.h" />
     <ClInclude Include="..\..\include\iscript.h" />
@@ -150,6 +148,12 @@
     <ClInclude Include="..\..\include\ui\imenumanager.h">
       <Filter>ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\ui\iorthocontextmenu.h">
+      <Filter>ui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\ui\iresourcechooser.h">
+      <Filter>ui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ui">