r19865 by craig - Fix some welding var names and capitalisation

[scribus-commit]

Author: craig
Date: Mon Feb 23 19:13:44 2015
New Revision: 19865

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19865
Log:
Fix some welding var names and capitalisation

Modified:
    trunk/Scribus/scribus/pageitem.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19865&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Feb 23 19:13:44 2015
@@ -10684,22 +10684,22 @@
 	if (undoManager->undoEnabled())
 		activeTransaction = undoManager->beginTransaction(Um::UnweldItems + "/" + Um::Selection, Um::IGroup,
 														  Um::UnweldItems, "", Um::IDelete);
-	for (int a = 0 ; a < weldList.count(); a++)
-	{
-		WeldingInfo wInf = weldList.at(a);
+	for (int i = 0 ; i < weldList.count(); i++)
+	{
+		WeldingInfo wInf = weldList.at(i);
 		PageItem *item = wInf.weldItem;
 		if (item == NULL)
 		{
 			qDebug() << "unWeld - null pointer in weldList";
 			continue;
 		}
-		for (int b = 0 ; b < item->weldList.count(); b++)
-		{
-			WeldingInfo wInf2 = item->weldList.at(b);
-			PageItem *pIt2 = wInf2.weldItem;
-			if (pIt2 == this)
+		for (int j = 0 ; j < item->weldList.count(); j++)
+		{
+			WeldingInfo wInf2 = item->weldList.at(j);
+			PageItem *item2 = wInf2.weldItem;
+			if (item2 == this)
 			{
-				item->weldList.removeAt(b);
+				item->weldList.removeAt(j);
 				if (undoManager->undoEnabled())
 				{
 					ScItemState<PageItem*> *is = new ScItemState<PageItem*>(Um::UnweldItems,"",Um::IGroup);