[[ Bug 19577 ]] Remove CS_OWN_CONTROLS state from cards

runrevmark · runrevmark · commit fe568bc19213 · 2017-04-18T13:07:17.000+01:00
The MCCard object has a 'CS_OWN_CONTROLS' state which it moves to
when being deleted. However, this state has not been used since
clipboard operations moved to using serialize / unserialize rather
than control pointers and such can be be removed.
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -205,14 +205,6 @@ MCCard::~MCCard()
 		close();
 	while (objptrs != NULL)
 	{
-		if (state & CS_OWN_CONTROLS)
-		{
-			MCControl *cptr = objptrs->getref();
-			// MW-2011-08-09: [[ Groups ]] We mustn't delete a shared group even
-			//   if the card owns the controls.
-			if (cptr->gettype() != CT_GROUP || !static_cast<MCGroup *>(cptr)->isshared())
-				delete cptr;
-		}
 		MCObjptr *optr = objptrs->remove(objptrs);
 		delete optr;
 	}
@@ -1139,7 +1131,7 @@ Boolean MCCard::del(bool p_check_flag)
 	message(MCM_delete_card);
 	
 	MCundos->freestate();
-	state |= CS_NO_MESSAGES | CS_OWN_CONTROLS;
+	state |= CS_NO_MESSAGES;
 	getstack()->removecard(this);
 	state &= ~CS_NO_MESSAGES;
 	if (objptrs != NULL)
@@ -1423,8 +1415,6 @@ MCCard *MCCard::clone(Boolean attach, Boolean controls)
 
 	if (controls)
 	{
-		if (!attach)
-			newcptr->state |= CS_OWN_CONTROLS;
 		if (objptrs != NULL)
 		{
 			newcptr->clonedata(this);
@@ -1454,13 +1444,7 @@ MCCard *MCCard::clone(Boolean attach, Boolean controls)
 						newcontrol->setparent(newcptr);
 					if (attach)
 					{
-						if (state & CS_OWN_CONTROLS && oldcontrol->getid() != 0)
-						{
-							newcontrol->setid(oldcontrol->getid());
-							oldcontrol->setid(0);
-						}
-						else
-							newcontrol->setid(newcptr->getstack()->newid());
+                        newcontrol->setid(newcptr->getstack()->newid());
 						newoptr->setid(newcontrol->getid());
 						newcptr->getstack()->appendcontrol(newcontrol);
 					}
@@ -1473,15 +1457,8 @@ MCCard *MCCard::clone(Boolean attach, Boolean controls)
 		}
 		if (attach)
 		{
-			if (state & CS_OWN_CONTROLS && obj_id != 0)
-			{
-				newcptr->obj_id = obj_id;
-				obj_id = 0;
-			}
-			else
-				newcptr->obj_id = newcptr->getstack()->newid();
+            newcptr->obj_id = newcptr->getstack()->newid();
 			newcptr->getstack()->appendcard(newcptr);
-			newcptr->state &= ~CS_OWN_CONTROLS;
 			if (diffstack)
 				newcptr->replacedata(getstack());
 			else
@@ -2690,7 +2667,7 @@ MCObjptr *MCCard::getobjptrforcontrol(MCControl *p_control)
 
 void MCCard::clean()
 {
-	if (objptrs == NULL || state & CS_OWN_CONTROLS)
+	if (objptrs == NULL)
 		return;
 	clear();
 	MCObjptr *tptr = objptrs;
@@ -2717,8 +2694,6 @@ void MCCard::clean()
 
 void MCCard::clear()
 {
-	if (state & CS_OWN_CONTROLS)
-		return;
 	MCObjptr *tptr = objptrs;
 	do
 	{
diff --git a/engine/src/objdefs.h b/engine/src/objdefs.h
@@ -456,7 +456,6 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 // Uses CS_VSCROLL 15
 #define CS_SENDING_RESIZE		(1UL << 16)
 // MCCard state
-#define CS_OWN_CONTROLS         (1UL << 14)
 #define CS_INSIDE               (1UL << 15)
 // MCStack state
 #define CS_BEEN_MOVED           (1UL << 13)
