X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcontainer.cpp;h=6050f3217b73ecea8f7bb33ef63df8ec77d740d4;hb=c58b8a9f8b1ae5494857fc423ed8e33b2bbcf329;hp=976172fb38220f094838a7cc806ab1fa482a9712;hpb=6ce9d9112c232f02b2be6cbdedbeb89c28bc713a;p=architektonas

diff --git a/src/container.cpp b/src/container.cpp
index 976172f..6050f32 100644
--- a/src/container.cpp
+++ b/src/container.cpp
@@ -54,22 +54,12 @@ Container & Container::operator=(const Container & from)
 		return *this;
 
 	Clear();
-
-	// Small problem with this approach: if the copied object goes out of scope,
-	// all of the objects we copied in here will be deleted. D'oh!
-	// For this COPY constructor to be meaningful, we have to actually COPY the
-	// objects in this Container, not just MOVE a copy of the POINTER! D-:
 	std::vector<Object *>::const_iterator i;
 
-//	for(uint i=0; i<from.objects.size(); i++)
 	for(i=from.objects.begin(); i!=from.objects.end(); i++)
 	{
-//		Object * object = from.objects[i];
+printf("Container: Copying object $%08X...\n", *i);
 		Object * object = (*i)->Copy();
-
-		// Need to actually COPY the object here, not copy the pointer only!!
-		// (which we do now, above :-P)
-
 		objects.push_back(object);
 	}
 
@@ -493,7 +483,7 @@ void Container::CopySelectedContentsTo(Container * newContainer)
 	if (newContainer == NULL)
 		return;
 
-	// Shuffle the contents of this container to the new one
+	// Copy the contents of this container to the new one
 	for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
 	{
 		if ((*i)->state == OSSelected)