From b02a7445bfa11d1c1ea1f6762b7e845b780ab4ea Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 21 Apr 2013 13:10:42 -0400
Subject: Revert "add Group::clear(), do not clear _canvas member of Item when
 unparented (only the parent is changed)"

This reverts commit a4df65a56f83823aba27432685977f420458a213.
---
 libs/canvas/canvas/group.h |  1 -
 libs/canvas/group.cc       | 33 +--------------------------------
 libs/canvas/item.cc        |  4 ++--
 3 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'libs')

diff --git a/libs/canvas/canvas/group.h b/libs/canvas/canvas/group.h
index 236880a906..8dee5f2672 100644
--- a/libs/canvas/canvas/group.h
+++ b/libs/canvas/canvas/group.h
@@ -40,7 +40,6 @@ public:
 
 	void add (Item *);
 	void remove (Item *);
-        void clear (bool with_delete = false);
 	std::list<Item*> const & items () const {
 		return _items;
 	}
diff --git a/libs/canvas/group.cc b/libs/canvas/group.cc
index fe783ad8b5..907282f9cd 100644
--- a/libs/canvas/group.cc
+++ b/libs/canvas/group.cc
@@ -170,8 +170,6 @@ Group::compute_bounding_box () const
 void
 Group::add (Item* i)
 {
-	/* XXX should really notify canvas about this */
-
 	_items.push_back (i);
 	invalidate_lut ();
 	_bounding_box_dirty = true;
@@ -182,40 +180,11 @@ Group::add (Item* i)
 void
 Group::remove (Item* i)
 {
-
-	if (i->parent() != this) {
-		return;
-	}
-
-	begin_change ();
-
-	i->unparent ();
 	_items.remove (i);
 	invalidate_lut ();
 	_bounding_box_dirty = true;
 	
-	end_change ();
-}
-
-void
-Group::clear (bool with_delete)
-{
-	begin_change ();
-
-	for (list<Item*>::iterator i = _items.begin(); i != _items.end(); ++i) {
-		if (with_delete) {
-			delete *i;
-		} else {
-			(*i)->unparent ();
-		}
-	}
-
-	_items.clear ();
-
-	invalidate_lut ();
-	_bounding_box_dirty = true;
-
-	end_change ();
+	DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: group remove\n");
 }
 
 void
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index 786c2f81cd..f5aa39d20d 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -236,14 +236,13 @@ Item::parent_to_item (ArdourCanvas::Rect const & d) const
 void
 Item::unparent ()
 {
+	_canvas = 0;
 	_parent = 0;
 }
 
 void
 Item::reparent (Group* new_parent)
 {
-	assert (_canvas == _parent->canvas ());
-
 	if (_parent) {
 		_parent->remove (this);
 	}
@@ -251,6 +250,7 @@ Item::reparent (Group* new_parent)
 	assert (new_parent);
 
 	_parent = new_parent;
+	_canvas = _parent->canvas ();
 	_parent->add (this);
 }
 
-- 
cgit v1.2.3