#5127: Remove a bunch of unused members from EntityClassChooser

codereader · Jan 3, 2021 · 0363efd · 0363efd
1 parent 46bd5c9
commit 0363efd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp
@@ -3,7 +3,6 @@
 #include "dataview/TreeViewItemStyle.h"
 #include "dataview/ThreadedResourceTreePopulator.h"
 #include "dataview/VFSTreePopulator.h"
-#include "menu/IconTextMenuItem.h"
 
 #include "i18n.h"
 #include "ifavourites.h"
@@ -143,11 +142,10 @@ class ThreadedEntityClassLoader final :
 };
 
 // Main constructor
-EntityClassChooser::EntityClassChooser()
-: DialogBase(_(ECLASS_CHOOSER_TITLE)),
-  _treeStore(nullptr),
-  _treeView(nullptr),
-  _selectedName("")
+EntityClassChooser::EntityClassChooser() : 
+    DialogBase(_(ECLASS_CHOOSER_TITLE)),
+    _treeView(nullptr),
+    _selectedName("")
 {
     loadNamedPanel(this, "EntityClassChooserMainPanel");
 
@@ -296,14 +294,9 @@ int EntityClassChooser::ShowModal()
 
 void EntityClassChooser::setupTreeView()
 {
-    _treeStore = new TreeModel(_columns);
-    TreeModel::Row row = _treeStore->AddItem();
-
-    row[_columns.iconAndName] = wxVariant(wxDataViewIconText(_("Loading...")));
-
     wxPanel* parent = findNamedObject<wxPanel>(this, "EntityClassChooserLeftPane");
 
-    _treeView = new ResourceTreeView(parent, _treeStore, _columns);
+    _treeView = new ResourceTreeView(parent, _columns);
     _treeView->AddSearchColumn(_columns.iconAndName);
     _treeView->SetExpandTopLevelItemsAfterPopulation(true);
     _treeView->EnableFavouriteManagement(decl::Type::EntityDef);
@@ -335,7 +328,7 @@ void EntityClassChooser::updateSelection()
 
     if (item.IsOk())
     {
-        TreeModel::Row row(item, *_treeStore);
+        TreeModel::Row row(item, *_treeView->GetModel());
 
         if (!row[_columns.isFolder].getBool())
         {

diff --git a/libs/wxutil/EntityClassChooser.h b/libs/wxutil/EntityClassChooser.h
@@ -5,13 +5,9 @@
 
 #include "preview/ModelPreview.h"
 #include "dialog/DialogBase.h"
-#include "dataview/TreeModelFilter.h"
-#include "dataview/TreeModel.h"
 #include "dataview/ResourceTreeView.h"
-#include "dataview/IResourceTreePopulator.h"
 #include "XmlResourceBasedWidget.h"
 #include "PanedPosition.h"
-#include "menu/PopupMenu.h"
 
 #include <memory>
 #include <sigc++/connection.h>
@@ -32,15 +28,8 @@ class EntityClassChooser :
 {
 private:
     ResourceTreeView::Columns _columns;
-
-    // Tree model holding the classnames
-    TreeModel::Ptr _treeStore;
-    TreeModelFilter::Ptr _treeModelFilter;
     ResourceTreeView* _treeView;
 
-    // Delegated object for loading entity classes in a separate thread
-    std::unique_ptr<wxutil::IResourceTreePopulator> _eclassLoader;
-
     // Last selected classname
     std::string _selectedName;
 
@@ -51,17 +40,7 @@ class EntityClassChooser :
 
     sigc::connection _defsReloaded;
 
-    wxDataViewItem _emptyFavouritesLabel;
-
-    enum class TreeMode
-    {
-        ShowAll,
-        ShowFavourites,
-    };
-    TreeMode _mode;
-
 private:
-    // Constructor. Creates the GTK widgets.
     EntityClassChooser();
 
     void loadEntityClasses();
@@ -107,4 +86,4 @@ class EntityClassChooser :
     static std::string chooseEntityClass(const std::string& preselectEclass = std::string());
 };
 
-} // namespace ui
+} // namespace