more code cleanups

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17294 11d20701-8431-0410-a711-e3c959e3b870

7 files changed, 14 insertions, 14 deletions

diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp
index f781812..aa1e17f 100644
--- a/scribus/pdflib_core.cpp
+++ b/scribus/pdflib_core.cpp
@@ -7584,7 +7584,7 @@ bool PDFLibCore::PDF_End_Doc(const QString& PrintPr, const QString& Name, int Co
 					PutDoc("   /F "+QString::number(threadObj + 1)+" 0 R\n");
 					PutDoc(">>\nendobj\n");
 					Beads[0].Prev = fir + Beads.count()-1;
-					Beads[Beads.count()-1].Next = fir;
+					Beads.last().Next = fir;
 				}
 				for (int beac = 0; beac < Beads.count(); ++beac)
 				{
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
diff --git a/scribus/scribusXml.cpp b/scribus/scribusXml.cpp
index f4d1af4..4f6193a 100644
--- a/scribus/scribusXml.cpp
+++ b/scribus/scribusXml.cpp
@@ -1392,7 +1392,7 @@ bool ScriXmlDoc::ReadElemToLayer(QString fileName, SCFonts &avail, ScribusDoc *d
 		{
 			LastStyles lastStyle;
 			view->PasteItem(&OB, true, true, false);
-			PageItem* Neu = doc->Items->at(doc->Items->count()-1);
+			PageItem* Neu = doc->Items->last();
 			Neu->doOverprint = doOverprint;
 			storyText.setDefaultStyle(Neu->itemText.defaultStyle());
 			if (Neu->asLatexFrame())
@@ -1694,7 +1694,7 @@ void ScriXmlDoc::ReadPattern(QXmlStreamReader &reader, ScribusDoc *doc, ScribusV
 		{
 			LastStyles lastStyle;
 			view->PasteItem(&OB, true, true, false);
-			PageItem* Neu = doc->Items->at(doc->Items->count()-1);
+			PageItem* Neu = doc->Items->last();
 			Neu->setXYPos(Neu->xPos() - doc->currentPage()->xOffset(), Neu->yPos() - doc->currentPage()->yOffset(), true);
 			storyText.setDefaultStyle(Neu->itemText.defaultStyle());
 			Neu->itemText = storyText;
diff --git a/scribus/shortcutwidget.cpp b/scribus/shortcutwidget.cpp
index c9137cc..aa335f3 100644
--- a/scribus/shortcutwidget.cpp
+++ b/scribus/shortcutwidget.cpp
@@ -65,7 +65,7 @@ void ShortcutWidget::keyPressEvent(QKeyEvent *k)
 		if (!keyDisplay->text().isEmpty())
 		{
 			tl = keyDisplay->text().split("+", QString::SkipEmptyParts);
-			Part4 = tl[tl.count()-1];
+			Part4 = tl.last();
 			if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4 == tr("Shift") || Part4 == tr("Meta"))
 				Part4 = "";
 		}
@@ -112,7 +112,7 @@ void ShortcutWidget::keyReleaseEvent(QKeyEvent *k)
 		{
 			QStringList tl;
 			tl = keyDisplay->text().split("+", QString::SkipEmptyParts);
-			Part4 = tl[tl.count()-1];
+			Part4 = tl.last();
 			if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4 == tr("Shift") || Part4 == tr("Meta"))
 				Part4 = "";
 		}
diff --git a/scribus/tabkeyboardshortcutswidget.cpp b/scribus/tabkeyboardshortcutswidget.cpp
index af081b6..aa958dd 100644
--- a/scribus/tabkeyboardshortcutswidget.cpp
+++ b/scribus/tabkeyboardshortcutswidget.cpp
@@ -493,7 +493,7 @@ void TabKeyboardShortcutsWidget::keyPressEvent(QKeyEvent *k)
 			tl = keyDisplay->text().split("+", QString::SkipEmptyParts);
 			if (tl.count() > 0)
 			{
-				Part4 = tl[tl.count()-1];
+				Part4 = tl.last();
 				if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4 == tr("Shift") || Part4 == tr("Meta"))
 					Part4 = "";
 			}
@@ -553,7 +553,7 @@ void TabKeyboardShortcutsWidget::keyReleaseEvent(QKeyEvent *k)
 			tl = keyDisplay->text().split("+", QString::SkipEmptyParts);
 			if (tl.count() > 0)
 			{
-				Part4 = tl[tl.count()-1];
+				Part4 = tl.last();
 				if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4 == tr("Shift") || Part4 == tr("Meta"))
 					Part4 = "";
 			}