#5613: EntityInspector no longer needs to implement Entity::Observer

codereader · Oct 17, 2021 · efcf6c7 · efcf6c7
1 parent b9d5317
commit efcf6c7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -197,14 +197,6 @@ void EntityInspector::onMapEditModeChanged(IMap::EditMode mode)
     requestIdleCallback();
 }
 
-// Entity::Observer implementation
-
-void EntityInspector::onKeyInsert(const std::string& key,
-                                  EntityKeyValue& value)
-{
-    //onKeyChange(key, value.get());
-}
-
 void EntityInspector::onKeyChange(const std::string& key, const std::string& value, bool isMultiValue)
 {
     wxDataViewItem keyValueIter;
@@ -378,29 +370,6 @@ void EntityInspector::onKeyChange(const std::string& key, const std::string& val
     }
 }
 
-void EntityInspector::onKeyErase(const std::string& key,
-                                 EntityKeyValue& value)
-{
-    return;
-
-    // Look up iter in the TreeIter map, and delete it from the list store
-    TreeIterMap::iterator i = _keyValueIterMap.find(key);
-    if (i != _keyValueIterMap.end())
-    {
-        // Erase row from tree store
-        _kvStore->RemoveItem(i->second);
-
-        // Erase iter from iter map
-        _keyValueIterMap.erase(i);
-    }
-    else
-    {
-        rConsoleError() << "EntityInspector: warning: removed key '" << key
-                  << "' not found in map." << std::endl;
-    }
-}
-
-// Create the context menu
 void EntityInspector::createContextMenu()
 {
     _contextMenu.reset(new wxutil::PopupMenu);

diff --git a/radiant/ui/einspector/EntityInspector.h b/radiant/ui/einspector/EntityInspector.h
@@ -51,8 +51,7 @@ class PropertyEditorFactory;
 class EntityInspector final :
 	public IEntityInspector,
     public selection::SelectionSystem::Observer,
-    public wxutil::SingleIdleCallback,
-    public Entity::Observer
+    public wxutil::SingleIdleCallback
 {
 public:
 	struct TreeColumns :
@@ -286,9 +285,7 @@ class EntityInspector final :
 	void onMainFrameConstructed();
 	void onMainFrameShuttingDown();
 
-    void onKeyInsert(const std::string& key, EntityKeyValue& value);
     void onKeyChange(const std::string& key, const std::string& value, bool isMultiValue = false);
-    void onKeyErase(const std::string& key, EntityKeyValue& value);
 
 	// greebo: Tells the inspector to reload the window settings from the registry.
 	void restoreSettings();