#5537: Move DeclFileInfo to wxutil/decl/ folder.

codereader · Sep 17, 2022 · 37d94a9 · 37d94a9
1 parent 7b31e0f
commit 37d94a9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/libs/wxutil/DeclFileInfo.h → libs/wxutil/decl/DeclFileInfo.h b/libs/wxutil/DeclFileInfo.h → libs/wxutil/decl/DeclFileInfo.h
@@ -2,6 +2,7 @@
 
 #include "i18n.h"
 #include "idecltypes.h"
+#include "ideclmanager.h"
 
 #include <wx/panel.h>
 #include <wx/stattext.h>

diff --git a/libs/wxutil/decl/DeclarationSelector.cpp b/libs/wxutil/decl/DeclarationSelector.cpp
@@ -2,7 +2,7 @@
 
 #include <wx/sizer.h>
 #include "../dataview/ResourceTreeViewToolbar.h"
-#include "../DeclFileInfo.h"
+#include "DeclFileInfo.h"
 
 namespace wxutil
 {

diff --git a/radiant/ui/common/SkinChooser.h b/radiant/ui/common/SkinChooser.h
@@ -6,7 +6,7 @@
 
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/preview/ModelPreview.h"
-#include "wxutil/DeclFileInfo.h"
+#include "wxutil/decl/DeclFileInfo.h"
 #include <string>
 
 #include "wxutil/dataview/TreeModel.h"

diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -27,7 +27,7 @@
 #include "wxutil/dataview/TreeViewItemStyle.h"
 #include "wxutil/EntityClassChooser.h"
 #include "wxutil/Bitmap.h"
-#include "wxutil/DeclFileInfo.h"
+#include "wxutil/decl/DeclFileInfo.h"
 #include "materials/FrobStageSetup.h"
 #include "parser/DefBlockSyntaxParser.h"
 #include <fmt/format.h>

diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -148,8 +148,8 @@
     <ClInclude Include="..\..\libs\wxutil\dataview\TreeView.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\TreeViewItemStyle.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\VFSTreePopulator.h" />
-    <ClInclude Include="..\..\libs\wxutil\DeclFileInfo.h" />
     <ClInclude Include="..\..\libs\wxutil\decl\DeclarationSelector.h" />
+    <ClInclude Include="..\..\libs\wxutil\decl\DeclFileInfo.h" />
     <ClInclude Include="..\..\libs\wxutil\DeferredMotionDelta.h" />
     <ClInclude Include="..\..\libs\wxutil\dialog\AutoSaveRequestBlocker.h" />
     <ClInclude Include="..\..\libs\wxutil\dialog\Dialog.h" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -156,7 +156,6 @@
       <Filter>dialog</Filter>
     </ClInclude>
     <ClInclude Include="..\..\libs\wxutil\FormLayout.h" />
-    <ClInclude Include="..\..\libs\wxutil\DeclFileInfo.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\DeclarationTreeView.h">
       <Filter>dataview</Filter>
     </ClInclude>
@@ -176,6 +175,9 @@
     <ClInclude Include="..\..\libs\wxutil\decl\DeclarationSelector.h">
       <Filter>decl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\wxutil\decl\DeclFileInfo.h">
+      <Filter>decl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">