Use PathTable for engine side objects.

Re-implement renaming and destroying more cleanly (not to mention workingly).


git-svn-id: http://svn.drobilla.net/lad/ingen@638 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 8 insertions, 7 deletions

diff --git a/src/libs/engine/events/RenameEvent.hpp b/src/libs/engine/events/RenameEvent.hpp
index f50efcc7..52a3050e 100644
--- a/src/libs/engine/events/RenameEvent.hpp
+++ b/src/libs/engine/events/RenameEvent.hpp
@@ -19,8 +19,9 @@
 #define RENAMEEVENT_H
 
 #include <string>
-#include "QueuedEvent.hpp"
 #include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
+#include "ObjectStore.hpp"
 
 using std::string;
 
@@ -54,12 +55,12 @@ public:
 private:
 	enum ErrorType { NO_ERROR, OBJECT_NOT_FOUND, OBJECT_EXISTS, OBJECT_NOT_RENAMABLE, INVALID_NAME };
 
-	Path                 _old_path;
-	string               _name;
-	Path                 _new_path;
-	Patch*               _parent_patch;
-	TreeNode<GraphObject*>* _store_treenode;
-	ErrorType            _error;
+	Path                           _old_path;
+	string                         _name;
+	Path                           _new_path;
+	Patch*                         _parent_patch;
+	ObjectStore::Objects::iterator _store_iterator;
+	ErrorType                      _error;
 };