#5127: Group some wxutil tree view classes in the wxutil/dataview/ fo…

…lder
codereader · Jan 2, 2021 · 50f4751 · 50f4751
1 parent 1c44754
commit 50f4751
Show file tree

Hide file tree

Showing 93 changed files with 166 additions and 138 deletions.
diff --git a/libs/wxutil/CMakeLists.txt b/libs/wxutil/CMakeLists.txt
@@ -1,5 +1,10 @@
 add_library(wxutil
             ConsoleView.cpp
+            dataview/ResourceTreeView.cpp
+            dataview/TreeModel.cpp
+            dataview/TreeModelFilter.cpp
+            dataview/TreeView.cpp
+            dataview/VFSTreePopulator.cpp
             dialog/DialogBase.cpp
             dialog/Dialog.cpp
             dialog/MessageBox.cpp
@@ -21,14 +26,9 @@ add_library(wxutil
             preview/ModelPreview.cpp
             preview/ParticlePreview.cpp
             preview/RenderPreview.cpp
-            ResourceTreeView.cpp
             SerialisableWidgets.cpp
             SourceView.cpp
             Splitter.cpp
-            TreeModel.cpp
-            TreeModelFilter.cpp
-            TreeView.cpp
-            VFSTreePopulator.cpp
             WindowPosition.cpp
             window/TransientWindow.cpp)
 target_compile_options(wxutil PUBLIC ${SIGC_CFLAGS} ${FTGL_CFLAGS})

diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp
@@ -1,7 +1,8 @@
 #include "EntityClassChooser.h"
-#include "TreeModel.h"
-#include "VFSTreePopulator.h"
-#include "wxutil/menu/IconTextMenuItem.h"
+#include "dataview/TreeModel.h"
+#include "dataview/TreeViewItemStyle.h"
+#include "dataview/VFSTreePopulator.h"
+#include "menu/IconTextMenuItem.h"
 
 #include "i18n.h"
 #include "ifavourites.h"
@@ -14,8 +15,6 @@
 #include <wx/panel.h>
 #include <wx/splitter.h>
 
-#include "TreeViewItemStyle.h"
-
 #include "string/string.h"
 #include "eclass.h"
 

diff --git a/libs/wxutil/EntityClassChooser.h b/libs/wxutil/EntityClassChooser.h
@@ -3,14 +3,14 @@
 #include "iradiant.h"
 #include "ieclass.h"
 
-#include "wxutil/preview/ModelPreview.h"
-#include "wxutil/dialog/DialogBase.h"
-#include "wxutil/TreeModelFilter.h"
-#include "wxutil/TreeModel.h"
-#include "wxutil/ResourceTreeView.h"
-#include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/PanedPosition.h"
-#include "wxutil/menu/PopupMenu.h"
+#include "preview/ModelPreview.h"
+#include "dialog/DialogBase.h"
+#include "dataview/TreeModelFilter.h"
+#include "dataview/TreeModel.h"
+#include "dataview/ResourceTreeView.h"
+#include "XmlResourceBasedWidget.h"
+#include "PanedPosition.h"
+#include "menu/PopupMenu.h"
 
 #include <memory>
 #include <sigc++/connection.h>

diff --git a/libs/wxutil/KeyValueTable.cpp → libs/wxutil/dataview/KeyValueTable.cpp b/libs/wxutil/KeyValueTable.cpp → libs/wxutil/dataview/KeyValueTable.cpp
diff --git a/libs/wxutil/KeyValueTable.h → libs/wxutil/dataview/KeyValueTable.h b/libs/wxutil/KeyValueTable.h → libs/wxutil/dataview/KeyValueTable.h
diff --git a/libs/wxutil/ResourceTreeView.cpp → libs/wxutil/dataview/ResourceTreeView.cpp b/libs/wxutil/ResourceTreeView.cpp → libs/wxutil/dataview/ResourceTreeView.cpp
@@ -2,7 +2,7 @@
 
 #include "i18n.h"
 #include "ifavourites.h"
-#include "menu/IconTextMenuItem.h"
+#include "../menu/IconTextMenuItem.h"
 #include "TreeViewItemStyle.h"
 
 namespace wxutil

diff --git a/libs/wxutil/ResourceTreeView.h → libs/wxutil/dataview/ResourceTreeView.h b/libs/wxutil/ResourceTreeView.h → libs/wxutil/dataview/ResourceTreeView.h
@@ -3,7 +3,7 @@
 #include "TreeView.h"
 #include "TreeModel.h"
 #include "TreeModelFilter.h"
-#include "menu/PopupMenu.h"
+#include "../menu/PopupMenu.h"
 
 namespace wxutil
 {

diff --git a/libs/wxutil/TreeModel.cpp → libs/wxutil/dataview/TreeModel.cpp b/libs/wxutil/TreeModel.cpp → libs/wxutil/dataview/TreeModel.cpp
diff --git a/libs/wxutil/TreeModel.h → libs/wxutil/dataview/TreeModel.h b/libs/wxutil/TreeModel.h → libs/wxutil/dataview/TreeModel.h
diff --git a/libs/wxutil/TreeModelFilter.cpp → libs/wxutil/dataview/TreeModelFilter.cpp b/libs/wxutil/TreeModelFilter.cpp → libs/wxutil/dataview/TreeModelFilter.cpp
diff --git a/libs/wxutil/TreeModelFilter.h → libs/wxutil/dataview/TreeModelFilter.h b/libs/wxutil/TreeModelFilter.h → libs/wxutil/dataview/TreeModelFilter.h
diff --git a/libs/wxutil/TreeView.cpp → libs/wxutil/dataview/TreeView.cpp b/libs/wxutil/TreeView.cpp → libs/wxutil/dataview/TreeView.cpp
diff --git a/libs/wxutil/TreeView.h → libs/wxutil/dataview/TreeView.h b/libs/wxutil/TreeView.h → libs/wxutil/dataview/TreeView.h
diff --git a/libs/wxutil/TreeViewItemStyle.h → libs/wxutil/dataview/TreeViewItemStyle.h b/libs/wxutil/TreeViewItemStyle.h → libs/wxutil/dataview/TreeViewItemStyle.h
diff --git a/libs/wxutil/VFSTreePopulator.cpp → libs/wxutil/dataview/VFSTreePopulator.cpp b/libs/wxutil/VFSTreePopulator.cpp → libs/wxutil/dataview/VFSTreePopulator.cpp
diff --git a/libs/wxutil/VFSTreePopulator.h → libs/wxutil/dataview/VFSTreePopulator.h b/libs/wxutil/VFSTreePopulator.h → libs/wxutil/dataview/VFSTreePopulator.h
diff --git a/libs/wxutil/fsview/FileSystemView.h b/libs/wxutil/fsview/FileSystemView.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <sigc++/signal.h>
-#include "../TreeModel.h"
-#include "../TreeView.h"
+#include "../dataview/TreeModel.h"
+#include "../dataview/TreeView.h"
 #include "Populator.h"
 
 namespace wxutil

diff --git a/libs/wxutil/fsview/Populator.h b/libs/wxutil/fsview/Populator.h
@@ -2,7 +2,7 @@
 
 #include <wx/thread.h>
 #include "ifilesystem.h"
-#include "wxutil/VFSTreePopulator.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
 
 namespace wxutil
 {

diff --git a/plugins/dm.conversation/CommandEditor.h b/plugins/dm.conversation/CommandEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/XmlResourceBasedWidget.h"
 

diff --git a/plugins/dm.conversation/ConversationDialog.cpp b/plugins/dm.conversation/ConversationDialog.cpp
@@ -8,7 +8,7 @@
 #include "iscenegraph.h"
 #include "string/string.h"
 
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include "wxutil/dialog/MessageBox.h"
 
 #include "RandomOrigin.h"

diff --git a/plugins/dm.conversation/ConversationDialog.h b/plugins/dm.conversation/ConversationDialog.h
@@ -8,7 +8,7 @@
 #include "iradiant.h"
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 #include "ConversationEntity.h"
 

diff --git a/plugins/dm.conversation/ConversationEditor.h b/plugins/dm.conversation/ConversationEditor.h
@@ -2,7 +2,7 @@
 
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 #include <map>
 
 #include "Conversation.h"

diff --git a/plugins/dm.conversation/ConversationEntity.h b/plugins/dm.conversation/ConversationEntity.h
@@ -3,7 +3,7 @@
 #include "inode.h"
 #include "ientity.h"
 #include <memory>
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 #include "Conversation.h"
 

diff --git a/plugins/dm.difficulty/DifficultyEditor.cpp b/plugins/dm.difficulty/DifficultyEditor.cpp
@@ -3,7 +3,7 @@
 #include "i18n.h"
 #include "iuimanager.h"
 
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 #include "wxutil/ChoiceHelper.h"
 #include "wxutil/dialog/MessageBox.h"
 #include "wxutil/EntityClassChooser.h"

diff --git a/plugins/dm.difficulty/DifficultySettings.h b/plugins/dm.difficulty/DifficultySettings.h
@@ -4,7 +4,7 @@
 #include "entitylib.h"
 #include <map>
 #include <memory>
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 #include "DifficultyEntity.h"
 #include "Setting.h"

diff --git a/plugins/dm.editing/AIHeadChooserDialog.h b/plugins/dm.editing/AIHeadChooserDialog.h
@@ -2,7 +2,7 @@
 
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/preview/ModelPreview.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 #include <set>
 #include <map>

diff --git a/plugins/dm.editing/AIVocalSetChooserDialog.h b/plugins/dm.editing/AIVocalSetChooserDialog.h
@@ -3,7 +3,7 @@
 #include "wxutil/dialog/DialogBase.h"
 #include <set>
 #include <map>
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 #include "AIVocalSetPreview.h"
 

diff --git a/plugins/dm.editing/MissionInfoEditDialog.cpp b/plugins/dm.editing/MissionInfoEditDialog.cpp
@@ -9,7 +9,7 @@
 #include <fmt/format.h>
 #include <wx/button.h>
 #include <wx/textctrl.h>
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 #include "wxutil/preview/GuiView.h"
 #include "wxutil/dialog/MessageBox.h"
 #include "wxutil/menu/IconTextMenuItem.h"

diff --git a/plugins/dm.editing/MissionInfoEditDialog.h b/plugins/dm.editing/MissionInfoEditDialog.h
@@ -4,8 +4,8 @@
 
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/TreeModel.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeModel.h"
+#include "wxutil/dataview/TreeView.h"
 #include "wxutil/menu/PopupMenu.h"
 
 #include "DarkmodTxt.h"

diff --git a/plugins/dm.gui/GuiSelector.cpp b/plugins/dm.gui/GuiSelector.cpp
@@ -1,6 +1,6 @@
 #include "GuiSelector.h"
 
-#include "wxutil/VFSTreePopulator.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
 
 #include "i18n.h"
 #include "imainframe.h"

diff --git a/plugins/dm.gui/GuiSelector.h b/plugins/dm.gui/GuiSelector.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "wxutil/dialog/DialogBase.h"
-#include "wxutil/VFSTreePopulator.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
+#include "wxutil/dataview/TreeView.h"
 
 class wxNotebook;
 class wxBookCtrlEvent;

diff --git a/plugins/dm.gui/ReadablePopulator.h b/plugins/dm.gui/ReadablePopulator.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gui/GuiManager.h"
-#include "wxutil/VFSTreePopulator.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
 #include "wxutil/ModalProgressDialog.h"
 #include "EventRateLimiter.h"
 #include "i18n.h"

diff --git a/plugins/dm.gui/ReadableReloader.h b/plugins/dm.gui/ReadableReloader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gui/GuiManager.h"
-#include "wxutil/VFSTreePopulator.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
 #include "wxutil/ModalProgressDialog.h"
 #include "EventRateLimiter.h"
 #include "imainframe.h"

diff --git a/plugins/dm.gui/XDataSelector.h b/plugins/dm.gui/XDataSelector.h
@@ -2,8 +2,8 @@
 
 #include "XDataLoader.h"
 #include "wxutil/dialog/DialogBase.h"
-#include "wxutil/VFSTreePopulator.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/VFSTreePopulator.h"
+#include "wxutil/dataview/TreeView.h"
 
 namespace ui
 {

diff --git a/plugins/dm.gui/XdFileChooserDialog.h b/plugins/dm.gui/XdFileChooserDialog.h
@@ -3,7 +3,7 @@
 #include <stdexcept>
 #include "XDataLoader.h"
 #include "wxutil/dialog/DialogBase.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 namespace ui
 {

diff --git a/plugins/dm.objectives/ComponentsDialog.h b/plugins/dm.objectives/ComponentsDialog.h
@@ -11,7 +11,7 @@
 
 #include "wxutil/XmlResourceBasedWidget.h"
 #include "wxutil/dialog/DialogBase.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 #include <sigc++/connection.h>
 
 class wxChoice;

diff --git a/plugins/dm.objectives/ObjectiveConditionsDialog.h b/plugins/dm.objectives/ObjectiveConditionsDialog.h
@@ -3,7 +3,7 @@
 #include "wxutil/dialog/DialogBase.h"
 #include "wxutil/XmlResourceBasedWidget.h"
 #include "wxutil/WindowPosition.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 #include "ObjectiveCondition.h"
 #include "ObjectiveEntity.h"

diff --git a/plugins/dm.objectives/ObjectiveEntity.h b/plugins/dm.objectives/ObjectiveEntity.h
@@ -6,7 +6,7 @@
 
 #include "inode.h"
 #include <memory>
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 // FORWARD DECLS
 namespace objectives { class TargetList; }

diff --git a/plugins/dm.objectives/ObjectiveEntityFinder.h b/plugins/dm.objectives/ObjectiveEntityFinder.h
@@ -6,7 +6,7 @@
 
 #include <string>
 #include <fmt/format.h>
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 namespace objectives
 {

diff --git a/plugins/dm.objectives/ObjectivesEditor.h b/plugins/dm.objectives/ObjectivesEditor.h
@@ -12,7 +12,7 @@
 
 #include <map>
 #include <string>
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 /* FORWARD DECLS */
 class Entity;

diff --git a/plugins/dm.stimresponse/ClassEditor.h b/plugins/dm.stimresponse/ClassEditor.h
@@ -4,7 +4,7 @@
 #include "StimTypes.h"
 
 #include <wx/event.h>
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 
 class wxTextCtrl;
 class wxButton;

diff --git a/plugins/dm.stimresponse/CustomStimEditor.h b/plugins/dm.stimresponse/CustomStimEditor.h
@@ -3,8 +3,8 @@
 #include "StimTypes.h"
 #include "SREntity.h"
 #include <wx/event.h>
-#include "wxutil/TreeModelFilter.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeModelFilter.h"
+#include "wxutil/dataview/TreeView.h"
 #include <memory>
 
 class wxPanel;

diff --git a/plugins/dm.stimresponse/EffectEditor.cpp b/plugins/dm.stimresponse/EffectEditor.cpp
@@ -3,7 +3,7 @@
 #include "iscenegraph.h"
 #include "iregistry.h"
 #include "entitylib.h"
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include "ResponseEditor.h"
 #include <iostream>
 #include "i18n.h"

diff --git a/plugins/dm.stimresponse/ResponseEditor.cpp b/plugins/dm.stimresponse/ResponseEditor.cpp
@@ -1,6 +1,6 @@
 #include "ResponseEditor.h"
 
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include "wxutil/menu/IconTextMenuItem.h"
 #include "string/convert.h"
 

diff --git a/plugins/dm.stimresponse/ResponseEditor.h b/plugins/dm.stimresponse/ResponseEditor.h
@@ -2,7 +2,7 @@
 
 #include "ClassEditor.h"
 #include "wxutil/XmlResourceBasedWidget.h"
-#include "wxutil/TreeView.h"
+#include "wxutil/dataview/TreeView.h"
 #include <memory>
 
 namespace ui

diff --git a/plugins/dm.stimresponse/SREntity.h b/plugins/dm.stimresponse/SREntity.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <list>
 #include <string>
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include <memory>
 
 #include "StimResponse.h"

diff --git a/plugins/dm.stimresponse/StimResponse.h b/plugins/dm.stimresponse/StimResponse.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <string>
 #include "ResponseEffect.h"
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 namespace
 {

diff --git a/plugins/dm.stimresponse/StimTypes.cpp b/plugins/dm.stimresponse/StimTypes.cpp
@@ -3,7 +3,7 @@
 #include "iuimanager.h"
 #include "itextstream.h"
 #include "string/string.h"
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 #include "entitylib.h"
 #include "registry/registry.h"
 #include "SREntity.h"

diff --git a/plugins/dm.stimresponse/StimTypes.h b/plugins/dm.stimresponse/StimTypes.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <string>
 #include "ientity.h"
-#include "wxutil/TreeModel.h"
+#include "wxutil/dataview/TreeModel.h"
 
 class wxBitmapComboBox;
 class wxComboBox;