r17727 by jghali - refactoring of itemSelection_ClearItem() to make code more readable

[scribus-commit]

Author: jghali
Date: Sat Jul 21 10:19:03 2012
New Revision: 17727

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17727
Log:
refactoring of itemSelection_ClearItem() to make code more readable

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17727&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Jul 21 10:19:03 2012
@@ -10606,37 +10606,37 @@
 {
 	Selection* itemSelection = (customSelection != 0) ? customSelection : m_Selection;
 	assert(itemSelection != 0);
+
 	uint selectedItemCount = itemSelection->count();
-	if (selectedItemCount != 0)
-	{
-		PageItem *currItem;
-		bool applyToAll = false;
-		for (uint i = 0; i < selectedItemCount; ++i)
-		{
-			currItem = itemSelection->itemAt(i);
-			if (currItem->asImageFrame())
-			{
-				if ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable))
-					ScCore->fileWatcher->removeFile(currItem->Pfile);
-			}
-			else if (currItem->asTextFrame() && ScCore->usingGUI() && (!applyToAll))
-			{
-				if (currItem->itemText.length() != 0 && (currItem->nextInChain() == 0 || currItem->prevInChain() == 0))
-				{
-					int btnYesToAll = (i < (selectedItemCount - 1)) ? QMessageBox::YesToAll : 0;
-					int t = ScMessageBox::warning(m_ScMW, CommonStrings::trWarning,
-										tr("Do you really want to clear all your text?"),
-										QMessageBox::Yes, QMessageBox::No | QMessageBox::Default, btnYesToAll);
-					if (t == QMessageBox::No)
-						continue;
-					applyToAll = (t == QMessageBox::YesToAll);
-				}
-			}
-			currItem->clearContents();
-		}
-		regionsChanged()->update(QRectF());
-		changed();
-	}
+	if (selectedItemCount <= 0) return;
+
+	PageItem *currItem;
+	bool applyToAll = false;
+	for (uint i = 0; i < selectedItemCount; ++i)
+	{
+		currItem = itemSelection->itemAt(i);
+		if (currItem->asImageFrame())
+		{
+			if ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable))
+				ScCore->fileWatcher->removeFile(currItem->Pfile);
+		}
+		else if (currItem->asTextFrame() && ScCore->usingGUI() && (!applyToAll))
+		{
+			if (currItem->itemText.length() != 0 && (currItem->nextInChain() == 0 || currItem->prevInChain() == 0))
+			{
+				int btnYesToAll = (i < (selectedItemCount - 1)) ? QMessageBox::YesToAll : 0;
+				int t = ScMessageBox::warning(m_ScMW, CommonStrings::trWarning,
+									tr("Do you really want to clear all your text?"),
+									QMessageBox::Yes, QMessageBox::No | QMessageBox::Default, btnYesToAll);
+				if (t == QMessageBox::No)
+					continue;
+				applyToAll = (t == QMessageBox::YesToAll);
+			}
+		}
+		currItem->clearContents();
+	}
+	regionsChanged()->update(QRectF());
+	changed();
 }
 
 QList<PageItem*>* ScribusDoc::GroupOfItem(QList<PageItem*>* itemList, PageItem* item)