From 284259ccc87dd8627160adbb146ab2e1ae49f12f Mon Sep 17 00:00:00 2001
From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
Date: Sat, 11 Feb 2012 18:24:23 +0000
Subject: more code cleanups

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17294 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/plugins/import/ai/importai.cpp      | 10 +++++-----
 scribus/plugins/import/oodraw/oodrawimp.cpp |  2 +-
 scribus/plugins/import/svg/svgplugin.cpp    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'scribus/plugins')

diff --git a/scribus/plugins/import/ai/importai.cpp b/scribus/plugins/import/ai/importai.cpp
index a14254d..98645c4 100644
--- a/scribus/plugins/import/ai/importai.cpp
+++ b/scribus/plugins/import/ai/importai.cpp
@@ -1157,7 +1157,7 @@ void AIPlug::processData(QString data)
 				}
 				else
 				{
-					ite = m_Doc->Items->at(m_Doc->Items->count()-1);
+					ite = m_Doc->Items->last();
 					ite->PoLine.setMarker();
 					Coords.translate(m_Doc->currentPage()->xOffset(), m_Doc->currentPage()->yOffset());
 					ite->PoLine.putPoints(ite->PoLine.size(), Coords.size(), Coords);
@@ -1178,7 +1178,7 @@ void AIPlug::processData(QString data)
 		else if (command == "*U")
 		{
 			WasU = false;
-			ite = m_Doc->Items->at(m_Doc->Items->count()-1);
+			ite = m_Doc->Items->last();
 			FPoint wh = getMaxClipF(&ite->PoLine);
 			ite->setWidthHeight(wh.x(),wh.y());
 			m_Doc->AdjustItemSize(ite);
@@ -1328,7 +1328,7 @@ void AIPlug::processData(QString data)
 			if (itemRendered)
 			{
 				gradientMode = false;
-				ite = m_Doc->Items->at(m_Doc->Items->count()-1);
+				ite = m_Doc->Items->last();
 				ite->fill_gradient = m_gradients[currentGradientName];
 				if (ite->fill_gradient.type() == 0)
 					ite->GrType = 6;
@@ -1969,7 +1969,7 @@ void AIPlug::processGradientData(QString data)
 	{
 		Cdata = da[a];
 		QStringList da2 = Cdata.split(" ", QString::SkipEmptyParts);
-		command = da2[da2.count()-1];
+		command = da2.last();
 		if (command == "Bd")
 		{
 			QString tmpS = Cdata;
@@ -2144,7 +2144,7 @@ void AIPlug::processRaster(QDataStream &ts)
 	QString Cdata = "";
 	QStringList da;
 	getCommands(cumulated, da);
-	Cdata = da[da.count()-1];
+	Cdata = da.last();
 	ScTextStream gVals(&Cdata, QIODevice::ReadOnly);
 	gVals >> m1 >> m2 >> m3 >> m4 >> m5 >> m6 >> x1 >> y1 >> x2 >> y2 >> w >> h >> bits >> type >> alpha >> dummy >> bin;
 //	qDebug() << QString("Matrix: %1 %2 %3 %4 %5 %6").arg(m1).arg(m2).arg(m3).arg(m4).arg(m5).arg(m6);
diff --git a/scribus/plugins/import/oodraw/oodrawimp.cpp b/scribus/plugins/import/oodraw/oodrawimp.cpp
index 1a3a801..103fce5 100644
--- a/scribus/plugins/import/oodraw/oodrawimp.cpp
+++ b/scribus/plugins/import/oodraw/oodrawimp.cpp
@@ -612,7 +612,7 @@ QList<PageItem*> OODPlug::parseGroup(const QDomElement &e)
 		neu->Clip = FlattenPath(neu->PoLine, neu->Segments);
 		neu->Groups.push(m_Doc->GroupCounter);
 		neu->isGroupControl = true;
-		neu->groupsLastItem = cElements.at(cElements.count()-1);
+		neu->groupsLastItem = cElements.last();
 		if( !e.attribute("id").isEmpty() )
 			neu->setItemName(e.attribute("id"));
 		else
diff --git a/scribus/plugins/import/svg/svgplugin.cpp b/scribus/plugins/import/svg/svgplugin.cpp
index bc5dfee..a09952d 100644
--- a/scribus/plugins/import/svg/svgplugin.cpp
+++ b/scribus/plugins/import/svg/svgplugin.cpp
@@ -1009,7 +1009,7 @@ QList<PageItem*> SVGPlug::parseGroup(const QDomElement &e)
 		neu->Clip = FlattenPath(neu->PoLine, neu->Segments);
 		neu->Groups.push(m_Doc->GroupCounter);
 		neu->isGroupControl = true;
-		neu->groupsLastItem = gElements.at(gElements.count()-1);
+		neu->groupsLastItem = gElements.last();
 		if( !e.attribute("id").isEmpty() )
 			neu->setItemName(e.attribute("id"));
 		else
-- 
cgit