r22721 by jghali - code style fixes

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 5 20:35:20 UTC 2018


Author: jghali
Date: Fri Oct  5 20:35:20 2018
New Revision: 22721

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22721
Log:
code style fixes

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/canvasgesture_resize.cpp
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_editgradient.cpp
    trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
    trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/canvasmode_framelinks.cpp
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/canvasmode_rotate.cpp
    trunk/Scribus/scribus/color.h
    trunk/Scribus/scribus/colorsetmanager.cpp
    trunk/Scribus/scribus/fonts/scface.cpp
    trunk/Scribus/scribus/fonts/scface_ps.h
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
    trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
    trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
    trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
    trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
    trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
    trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
    trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
    trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
    trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
    trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
    trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
    trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
    trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
    trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
    trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
    trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
    trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
    trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
    trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/sclayer.cpp
    trunk/Scribus/scribus/scpainter.cpp
    trunk/Scribus/scribus/scpainterex_cairo.cpp
    trunk/Scribus/scribus/scpainterex_ps2.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/styles/styleset.h
    trunk/Scribus/scribus/text/specialchars.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
    trunk/Scribus/scribus/ui/arrowchooser.cpp
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/cpalette.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/fontcombo.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.cpp
    trunk/Scribus/scribus/ui/smsccombobox.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp	(original)
+++ trunk/Scribus/scribus/actionmanager.cpp	Fri Oct  5 20:35:20 2018
@@ -1387,9 +1387,9 @@
 
 void ActionManager::enableActionStringList(QMap<QString, QPointer<ScrAction> > *actionMap, QStringList *list, bool enabled, bool checkingUnicode, const QString& fontName)
 {
-	for ( QStringList::Iterator it = list->begin(); it != list->end(); ++it )
+	for (QStringList::Iterator it = list->begin(); it != list->end(); ++it)
 	{
-		if(!checkingUnicode)
+		if (!checkingUnicode)
 			(*actionMap)[*it]->setEnabled(enabled);
 		else
 		{
@@ -1397,7 +1397,7 @@
 			if (mainWindow->HaveDoc && (*actionMap)[*it]->actionType()==ScrAction::UnicodeChar)
 			{
 				int charCode=(*actionMap)[*it]->actionInt();
-				if(charCode==-1 ||
+				if (charCode==-1 ||
 					charCode==23 ||
 					charCode==24 ||
 					charCode==26 ||

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp	(original)
+++ trunk/Scribus/scribus/canvas.cpp	Fri Oct  5 20:35:20 2018
@@ -595,7 +595,7 @@
 			if ((level == itemLevel) && (item1id > itemid))
 				continue;
 			QRectF uRect(item1->getBoundingRect());
-			if(baseRect.intersects(uRect))
+			if (baseRect.intersects(uRect))
 				return item1;
 		}
 	}
@@ -1502,7 +1502,7 @@
 			{
 //					qDebug() << "skipping pageitem (move/resizeEdit/selected)" << m_viewMode.operItemMoving << currItem->isSelected();
 			}
-			else if(m_viewMode.operItemSelecting)
+			else if (m_viewMode.operItemSelecting)
 			{
 				currItem->invalid = false;
 				currItem->DrawObj(painter, cullingArea);
@@ -2566,7 +2566,7 @@
 	static QString rulerItemRef;
 	static double rulerDumbHash(0.0);
 	
-	if( (rulerItemRef != item->itemName()) 
+	if ((rulerItemRef != item->itemName()) 
 		   || forceAndReset )
 	{
 		rulerItemRef = item->itemName();
@@ -2592,7 +2592,7 @@
 		controlHash += tabrec.tabPosition;
 	}
 // 	qDebug()<<"Canvas::setupEditHRuler"<<rulerItemRef<<controlHash<<rulerDumbHash;
-	if(controlHash == rulerDumbHash)
+	if (controlHash == rulerDumbHash)
 		return;
 	
 	rulerDumbHash = controlHash;

Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp	(original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp	Fri Oct  5 20:35:20 2018
@@ -350,7 +350,7 @@
 		}
 		// We do not want to scale the text of a linked frame
 		// as it would alter text in other frames of the string
-		else if((currItem->itemType() == PageItem::TextFrame) 
+		else if ((currItem->itemType() == PageItem::TextFrame) 
 					   && (currItem->nextInChain() == nullptr)
 					   && (currItem->prevInChain() == nullptr)
 				       && scaleContent)
@@ -375,7 +375,7 @@
 					currItem->itemText.applyCharStyle(aa, 1, newChStyle);
 
 					// We need to scale the linespacing _only once_ per paragraph.
-					if((aa == 0) 
+					if ((aa == 0) 
 						|| ( SpecialChars::isBreak(currItem->itemText.text(aa - 1))))
 					{
 						ParagraphStyle ps(currItem->itemText.paragraphStyle(aa));

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Fri Oct  5 20:35:20 2018
@@ -288,7 +288,7 @@
 		{
 			curItem = m_doc->m_Selection->itemAt(a);
 			
-			if(drawHandles)
+			if (drawHandles)
 				drawHandles = !curItem->locked();
 		}
 		// items inside a a multi
@@ -348,7 +348,7 @@
 		psx->setPen(m_pen["selection-group"]);
 		psx->setBrush(m_brush["selection-group"]);
 		psx->drawRect(QRectF(x, y, w, h));
-		if(drawHandles)
+		if (drawHandles)
 			drawSelectionHandles(psx, QRectF(x, y, w, h), false);
 		psx->restore();
 	}
@@ -430,15 +430,15 @@
 				{
 					psx->setPen(ba);
 					psx->drawRect(QRectF(x, y, w, h));
-					if(drawHandles && !currItem->locked() && !currItem->isLine())
+					if (drawHandles && !currItem->locked() && !currItem->isLine())
 						drawSelectionHandles(psx, QRectF(x, y, w, h), true);
 					psx->setPen(m_pen["selection"]);
 					psx->setBrush(m_brush["selection"]);
 					psx->drawRect(QRectF(x, y, w, h));
 				}
-				if(drawHandles && !currItem->locked())
-				{
-					if(currItem->asLine())
+				if (drawHandles && !currItem->locked())
+				{
+					if (currItem->asLine())
 					{
 						const double markWidth = 4.0 / m_canvas->scale();
 						QRectF handleRect = QRectF(0, 0, markWidth, markWidth);
@@ -482,7 +482,7 @@
 	{
 		PageItem *currItem = m_doc->m_Selection->itemAt(0);
 				
-		if((scalex != 1.0) || (scaley != 1.0)) // changing size of page item
+		if ((scalex != 1.0) || (scaley != 1.0)) // changing size of page item
 		{
 			p->setBrush(m_brush["outline"]);
 			p->setPen(m_pen["outline"]);
@@ -527,9 +527,9 @@
 //			QRectF br(currItem->getVisualBoundingRect());
 #ifdef GESTURE_FRAME_PREVIEW
 			QImage *pixItem(0);
-			if( m_pixmapCache.contains(currItem) )
-			{
-				if( m_pixmapCache.value(currItem)->isReady() )
+			if ( m_pixmapCache.contains(currItem) )
+			{
+				if ( m_pixmapCache.value(currItem)->isReady() )
 					pixItem = m_pixmapCache.value(currItem)->getImage();
 			}
 			else
@@ -537,7 +537,7 @@
 				m_pixmapCache[currItem] = new PageItemPreview(currItem);
 			}
 
-			if(pixItem)
+			if (pixItem)
 			{
 				p->save();
 				p->translate(br.x(),br.y());
@@ -667,7 +667,7 @@
 				p->save();
 				if (docSelectionCount < m_canvas->moveWithFullOutlinesThreshold /*&& currItem->rotation() == 0*/)
 				{
-					if((scalex != 1.0) || (scaley != 1.0))
+					if ((scalex != 1.0) || (scaley != 1.0))
 					{
 						p->setBrush(m_brush["outline"]);
 						p->setPen(m_pen["outline"]);
@@ -686,9 +686,9 @@
 //						QRectF br(currItem->getVisualBoundingRect());
 #ifdef GESTURE_FRAME_PREVIEW
 						QImage *pixItem(0);
-						if( m_pixmapCache.contains(currItem) )
-						{
-							if( m_pixmapCache.value(currItem)->isReady() )
+						if ( m_pixmapCache.contains(currItem) )
+						{
+							if ( m_pixmapCache.value(currItem)->isReady() )
 								pixItem = m_pixmapCache.value(currItem)->getImage();
 						}
 						else
@@ -697,7 +697,7 @@
 						}
 			
 
-						if(pixItem)
+						if (pixItem)
 						{
 							p->save();
 //							p->translate(br.x() /*- x*/, br.y() /*- y*/);
@@ -931,11 +931,11 @@
 #ifdef GESTURE_FRAME_PREVIEW
 void CanvasMode::clearPixmapCache()
 {
-	if(m_pixmapCache.count())
+	if (m_pixmapCache.count())
 	{
 		foreach(PageItemPreview* ip, m_pixmapCache)
 		{
-			if(ip)
+			if (ip)
 				delete ip;
 		}
 		m_pixmapCache.clear();
@@ -1387,7 +1387,7 @@
 					else
 					{
 						//CB If in EditContour mode, allow contour line to be scaled with arrow keys too
-						if(m_doc->nodeEdit.isContourLine())
+						if (m_doc->nodeEdit.isContourLine())
 							m_view->TransformPoly(10, 0, resizeBy/unitGetRatioFromIndex(m_doc->unitIndex()));
 						else if (!currItem->sizeLocked())
 						{
@@ -1477,7 +1477,7 @@
 					else
 					{
 						//CB If in EditContour mode, allow contour line to be scaled with arrow keys too
-						if(m_doc->nodeEdit.isContourLine())
+						if (m_doc->nodeEdit.isContourLine())
 							m_view->TransformPoly(11, 0, resizeBy/unitGetRatioFromIndex(m_doc->unitIndex()));
 						else if (!currItem->sizeLocked())
 						{
@@ -1567,7 +1567,7 @@
 					else
 					{
 						//CB If in EditContour mode, allow contour line to be scaled with arrow keys too
-						if(m_doc->nodeEdit.isContourLine())
+						if (m_doc->nodeEdit.isContourLine())
 							m_view->TransformPoly(12, 0, resizeBy/unitGetRatioFromIndex(m_doc->unitIndex()));
 						else if (!currItem->sizeLocked())
 						{
@@ -1657,7 +1657,7 @@
 					else
 					{
 						//CB If in EditContour mode, allow contour line to be scaled with arrow keys too
-						if(m_doc->nodeEdit.isContourLine())
+						if (m_doc->nodeEdit.isContourLine())
 							m_view->TransformPoly(13, 0, resizeBy/unitGetRatioFromIndex(m_doc->unitIndex()));
 						else if (!currItem->sizeLocked())
 						{

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp	Fri Oct  5 20:35:20 2018
@@ -297,9 +297,9 @@
 				double ny = np2.y();
 				m_doc->ApplyGuides(&nx, &ny);
 				m_doc->ApplyGuides(&nx, &ny,true);
-				if(nx!=np2.x())
+				if (nx!=np2.x())
 					xSnap = nx;
-				if(ny!=np2.y())
+				if (ny!=np2.y())
 					ySnap = ny;
 				// #8959 : suppress qRound here as this prevent drawing line with angle constrain
 				// precisely and does not allow to stick precisely to grid or guides

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp	Fri Oct  5 20:35:20 2018
@@ -1099,7 +1099,7 @@
 	m_view->setObjectUndoMode();
 	Mxp = mx;
 	Myp = my;
-	if(currItem!=nullptr)
+	if (currItem!=nullptr)
 		cmen = new ContextMenu(*(m_doc->m_Selection), m_ScMW, m_doc);
 	else
 		cmen = new ContextMenu(m_ScMW, m_doc, mx, my);

Modified: trunk/Scribus/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_editgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editgradient.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_editgradient.cpp	Fri Oct  5 20:35:20 2018
@@ -886,7 +886,7 @@
 			m_gradientPoint = useGradientSkew;
 	}
 	m_canvas->m_viewMode.m_MouseButtonPressed = true;
-	if(m_gradientPoint != noPointDefined){
+	if (m_gradientPoint != noPointDefined){
 		OldGrStartX = currItem->gradientStartX();
 		OldGrStartY = currItem->gradientStartY();
 		OldGrEndX = currItem->gradientEndX();
@@ -929,7 +929,7 @@
 	m_canvas->resetRenderMode();
 	m->accept();
 	PageItem* currItem = m_doc->m_Selection->itemAt(0);
-	if(m_gradientPoint != noPointDefined && UndoManager::undoEnabled()){
+	if (m_gradientPoint != noPointDefined && UndoManager::undoEnabled()){
 		QList<FPoint> tmp;
 		ScItemState<QList<FPoint> > *is = new ScItemState<QList<FPoint> >(Um::GradPos + "i");
 		is->set("GRAD_POS");

Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp	Fri Oct  5 20:35:20 2018
@@ -976,14 +976,14 @@
 		ss->set("ARRAY",true);
 		ss->set("X",currItem->selectedMeshPointX);
 		ss->set("Y",currItem->selectedMeshPointY);
-		if((*m_old_mesh) == currItem->meshGradientArray[currItem->selectedMeshPointX][currItem->selectedMeshPointY])
+		if ((*m_old_mesh) == currItem->meshGradientArray[currItem->selectedMeshPointX][currItem->selectedMeshPointY])
 		{
 			delete ss;
 			ss=nullptr;
 		}
 		else
 			ss->setItem(qMakePair(*m_old_mesh,currItem->meshGradientArray[currItem->selectedMeshPointX][currItem->selectedMeshPointY]));
-		if(ss)
+		if (ss)
 			undoManager->action(currItem,ss);
 	}
 	currItem->update();

Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp	Fri Oct  5 20:35:20 2018
@@ -979,7 +979,7 @@
 		ss->set("ARRAY",false);
 		switch(m_currItem->selectedMeshPointY){
 			case 1:
-				if((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TL)
+				if ((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TL)
 				{
 					delete ss;
 					ss=nullptr;
@@ -988,7 +988,7 @@
 					ss->setItem(qMakePair(*m_old_mesh,m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TL));
 				break;
 			case 2:
-				if((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TR)
+				if ((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TR)
 				{
 					delete ss;
 					ss=nullptr;
@@ -997,7 +997,7 @@
 					ss->setItem(qMakePair(*m_old_mesh,m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TR));
 				break;
 			case 3:
-				if((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BR)
+				if ((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BR)
 				{
 					delete ss;
 					ss=nullptr;
@@ -1006,7 +1006,7 @@
 					ss->setItem(qMakePair(*m_old_mesh,m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BR));
 				break;
 			case 4:
-				if((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BL)
+				if ((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BL)
 				{
 					delete ss;
 					ss=nullptr;
@@ -1015,7 +1015,7 @@
 					ss->setItem(qMakePair(*m_old_mesh,m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].BL));
 				break;
 		}
-		if(ss)
+		if (ss)
 			undoManager->action(m_currItem,ss);
 	}
 	m_currItem = m_doc->m_Selection->itemAt(0);

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp	Fri Oct  5 20:35:20 2018
@@ -486,7 +486,7 @@
 	ContextMenu* cmen=nullptr;
 	m_view->setCursor(QCursor(Qt::ArrowCursor));
 	m_view->setObjectUndoMode();
-	if(currItem!=nullptr)
+	if (currItem!=nullptr)
 		cmen = new ContextMenu(*(m_doc->m_Selection), m_ScMW, m_doc);
 	else
 		cmen = new ContextMenu(m_ScMW, m_doc, mx, my);

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp	Fri Oct  5 20:35:20 2018
@@ -513,7 +513,7 @@
 	m_view->setObjectUndoMode();
 	m_Mxp = mx;
 	m_Myp = my;
-	if(currItem!=nullptr)
+	if (currItem!=nullptr)
 	{
 		cmen = new ContextMenu(*(m_doc->m_Selection), m_ScMW, m_doc);
 		cmen->exec(QCursor::pos());

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp	Fri Oct  5 20:35:20 2018
@@ -48,11 +48,11 @@
 void CanvasMode_ImageImport::setImageList(QStringList l)
 {
 	m_imageList = l;
-	if(l.size()==1)
+	if (l.size()==1)
 	{
 		while(!(m_doc->m_Selection->itemAt(0)->isImageFrame()))
 			m_doc->m_Selection->removeFirst();
-		if(!m_doc->m_Selection->isEmpty())
+		if (!m_doc->m_Selection->isEmpty())
 		{
 			setImage(m_doc->m_Selection->itemAt(0));
 			m_view->requestMode(submodePaintingDone);
@@ -72,7 +72,7 @@
 	p.begin(&pm);
 	p.fillRect(QRectF(0, 0, 80, 80), b);
 	QImage thumb;
-	if(thumb.load(name))
+	if (thumb.load(name))
 	{
 		thumb = thumb.scaled(80,80,Qt::KeepAspectRatio);
 		p.drawImage((80 - thumb.width()) / 2, (80 - thumb.height()) / 2, thumb);
@@ -166,10 +166,10 @@
 	QToolTip::showText(m->globalPos(), m_tipText + "<b></b>", qApp->activeWindow());
 	m->accept();
 	PageItem *item;
-	if((item = m_canvas->itemUnderCursor(m->globalPos())) != nullptr)
+	if ((item = m_canvas->itemUnderCursor(m->globalPos())) != nullptr)
 	{
 		PageItem_ImageFrame *currItem;
-		if((currItem = item->asImageFrame()) != nullptr)
+		if ((currItem = item->asImageFrame()) != nullptr)
 			m_view->setCursor(IconManager::instance()->loadCursor("drawimageframe.png"));
 		else
 			m_view->setCursor(QCursor(Qt::ArrowCursor));
@@ -191,12 +191,12 @@
 	m->accept();
 	m_view->registerMousePress(m->globalPos());
 	PageItem *item;
-	if(!m_imageList.empty())
-	{
-		if((item = m_canvas->itemUnderCursor(m->globalPos())) != nullptr)
+	if (!m_imageList.empty())
+	{
+		if ((item = m_canvas->itemUnderCursor(m->globalPos())) != nullptr)
 		{
 			PageItem_ImageFrame *currItem;
-			if((currItem = item->asImageFrame()) != nullptr)
+			if ((currItem = item->asImageFrame()) != nullptr)
 				setImage(currItem);
 		}
 		else
@@ -245,7 +245,7 @@
 
 void CanvasMode_ImageImport::updateList()
 {
-	if(m_imageList.isEmpty())
+	if (m_imageList.isEmpty())
 	{
 		m_view->requestMode(submodePaintingDone);
 		QToolTip::hideText();

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp	Fri Oct  5 20:35:20 2018
@@ -1154,10 +1154,10 @@
 					int prev = (curr+cli.size()-4)%cli.size();
 					int next = (curr+4)%cli.size();
 
-					if(std::abs(cli.point(prev).x()-cli.point(curr).x())<std::abs(cli.point(next).x()-cli.point(curr).x()))
+					if (std::abs(cli.point(prev).x()-cli.point(curr).x())<std::abs(cli.point(next).x()-cli.point(curr).x()))
 						tmpNode=next;
-					else if(std::abs(cli.point(prev).x()-cli.point(curr).x())==std::abs(cli.point(next).x()-cli.point(curr).x())){
-						if(cli.point(prev).y()!=cli.point(curr).y())
+					else if (std::abs(cli.point(prev).x()-cli.point(curr).x())==std::abs(cli.point(next).x()-cli.point(curr).x())){
+						if (cli.point(prev).y()!=cli.point(curr).y())
 							tmpNode=next;
 						else
 							tmpNode=prev;
@@ -1176,7 +1176,7 @@
 
 					m_doc->nodeEdit.moveClipPoint(currItem, npf1);
 
-					if(m_doc->nodeEdit.clre()==prev)
+					if (m_doc->nodeEdit.clre()==prev)
 						m_doc->nodeEdit.setClre(next);
 					else
 						m_doc->nodeEdit.setClre(prev);

Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp	Fri Oct  5 20:35:20 2018
@@ -455,7 +455,7 @@
 	ContextMenu* cmen=nullptr;
 	m_view->setObjectUndoMode();
 	m_canvasPressCoord.setXY(mx, my);
-	if(currItem!=nullptr)
+	if (currItem!=nullptr)
 		cmen = new ContextMenu(*(m_doc->m_Selection), m_view->m_ScMW, m_doc);
 	else
 		cmen = new ContextMenu(m_view->m_ScMW, m_doc, mx, my);

Modified: trunk/Scribus/scribus/color.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/color.h
==============================================================================
--- trunk/Scribus/scribus/color.h	(original)
+++ trunk/Scribus/scribus/color.h	Fri Oct  5 20:35:20 2018
@@ -18,299 +18,299 @@
 
 void keywordToRGB( QString rgbColor, int &r, int &g, int &b )
 {
-	if( rgbColor == "aliceblue" )
+	if (rgbColor == "aliceblue")
 		TORGB( 240, 248, 255)
-	if( rgbColor == "antiquewhite" )
+	if (rgbColor == "antiquewhite")
 		TORGB( 250, 235, 215)
-	if( rgbColor == "aqua" )
+	if (rgbColor == "aqua")
 		TORGB( 0, 255, 255)
-	if( rgbColor == "aquamarine" )
+	if (rgbColor == "aquamarine")
 		TORGB( 127, 255, 212 )
-	if( rgbColor == "azure" )
+	if (rgbColor == "azure")
 		TORGB( 240, 255, 255 )
-	if( rgbColor == "beige" )
+	if (rgbColor == "beige")
 		TORGB( 245, 245, 220 )
-	if( rgbColor == "bisque" )
+	if (rgbColor == "bisque")
 		TORGB( 255, 228, 196 )
-	if( rgbColor == "black" )
+	if (rgbColor == "black")
 		TORGB( 0, 0, 0 )
-	if( rgbColor == "blanchedalmond" )
+	if (rgbColor == "blanchedalmond")
 		TORGB( 255, 235, 205 )
-	if( rgbColor == "blue" )
+	if (rgbColor == "blue")
 		TORGB( 0, 0, 255 )
-	if( rgbColor == "blueviolet" )
+	if (rgbColor == "blueviolet")
 		TORGB( 138, 43, 226 )
-	if( rgbColor == "brown" )
+	if (rgbColor == "brown")
 		TORGB( 165, 42, 42 )
-	if( rgbColor == "burlywood" )
+	if (rgbColor == "burlywood")
 		TORGB( 222, 184, 135 )
-	if( rgbColor == "cadetblue" )
+	if (rgbColor == "cadetblue")
 		TORGB( 95, 158, 160 )
-	if( rgbColor == "chartreuse" )
+	if (rgbColor == "chartreuse")
 		TORGB( 127, 255, 0 )
-	if( rgbColor == "chocolate" )
+	if (rgbColor == "chocolate")
 		TORGB( 210, 105, 30 )
-	if( rgbColor == "coral" )
+	if (rgbColor == "coral")
 		TORGB( 255, 127, 80 )
-	if( rgbColor == "cornflowerblue" )
+	if (rgbColor == "cornflowerblue")
 		TORGB( 100, 149, 237 )
-	if( rgbColor == "cornsilk" )
+	if (rgbColor == "cornsilk")
 		TORGB( 255, 248, 220 )
-	if( rgbColor == "crimson" )
+	if (rgbColor == "crimson")
 		TORGB( 220, 20, 60 )
-	if( rgbColor == "cyan" )
+	if (rgbColor == "cyan")
 		TORGB( 0, 255, 255 )
-	if( rgbColor == "darkblue" )
+	if (rgbColor == "darkblue")
 		TORGB( 0, 0, 139 )
-	if( rgbColor == "darkcyan" )
+	if (rgbColor == "darkcyan")
 		TORGB( 0, 139, 139 )
-	if( rgbColor == "darkgoldenrod" )
+	if (rgbColor == "darkgoldenrod")
 		TORGB( 184, 134, 11 )
-	if( rgbColor == "darkgray" )
+	if (rgbColor == "darkgray")
 		TORGB( 169, 169, 169 )
-	if( rgbColor == "darkgrey" )
+	if (rgbColor == "darkgrey")
 		TORGB( 169, 169, 169 )
-	if( rgbColor == "darkgreen" )
+	if (rgbColor == "darkgreen")
 		TORGB( 0, 100, 0 )
-	if( rgbColor == "darkkhaki" )
+	if (rgbColor == "darkkhaki")
 		TORGB( 189, 183, 107 )
-	if( rgbColor == "darkmagenta" )
+	if (rgbColor == "darkmagenta")
 		TORGB( 139, 0, 139 )
-	if( rgbColor == "darkolivegreen" )
+	if (rgbColor == "darkolivegreen")
 		TORGB( 85, 107, 47 )
-	if( rgbColor == "darkorange" )
+	if (rgbColor == "darkorange")
 		TORGB( 255, 140, 0 )
-	if( rgbColor == "darkorchid" )
+	if (rgbColor == "darkorchid")
 		TORGB( 153, 50, 204 )
-	if( rgbColor == "darkred" )
+	if (rgbColor == "darkred")
 		TORGB( 139, 0, 0 )
-	if( rgbColor == "darksalmon" )
+	if (rgbColor == "darksalmon")
 		TORGB( 233, 150, 122 )
-	if( rgbColor == "darkseagreen" )
+	if (rgbColor == "darkseagreen")
 		TORGB( 143, 188, 143 )
-	if( rgbColor == "darkslateblue" )
+	if (rgbColor == "darkslateblue")
 		TORGB( 72, 61, 139 )
-	if( rgbColor == "darkslategray" )
+	if (rgbColor == "darkslategray")
 		TORGB( 47, 79, 79 )
-	if( rgbColor == "darkslategrey" )
+	if (rgbColor == "darkslategrey")
 		TORGB( 47, 79, 79 )
-	if( rgbColor == "darkturquoise" )
+	if (rgbColor == "darkturquoise")
 		TORGB( 0, 206, 209 )
-	if( rgbColor == "darkviolet" )
+	if (rgbColor == "darkviolet")
 		TORGB( 148, 0, 211 )
-	if( rgbColor == "deeppink" )
+	if (rgbColor == "deeppink")
 		TORGB( 255, 20, 147 )
-	if( rgbColor == "deepskyblue" )
+	if (rgbColor == "deepskyblue")
 		TORGB( 0, 191, 255 )
-	if( rgbColor == "dimgray" )
+	if (rgbColor == "dimgray")
 		TORGB( 105, 105, 105 )
-	if( rgbColor == "dimgrey" )
+	if (rgbColor == "dimgrey")
 		TORGB( 105, 105, 105 )
-	if( rgbColor == "dodgerblue" )
+	if (rgbColor == "dodgerblue")
 		TORGB( 30, 144, 255 )
-	if( rgbColor == "firebrick" )
+	if (rgbColor == "firebrick")
 		TORGB( 178, 34, 34 )
-	if( rgbColor == "floralwhite" )
+	if (rgbColor == "floralwhite")
 		TORGB( 255, 250, 240 )
-	if( rgbColor == "forestgreen" )
+	if (rgbColor == "forestgreen")
 		TORGB( 34, 139, 34 )
-	if( rgbColor == "fuchsia" )
+	if (rgbColor == "fuchsia")
 		TORGB( 255, 0, 255 )
-	if( rgbColor == "gainsboro" )
+	if (rgbColor == "gainsboro")
 		TORGB( 220, 220, 220 )
-	if( rgbColor == "ghostwhite" )
+	if (rgbColor == "ghostwhite")
 		TORGB( 248, 248, 255 )
-	if( rgbColor == "gold" )
+	if (rgbColor == "gold")
 		TORGB( 255, 215, 0 )
-	if( rgbColor == "goldenrod" )
+	if (rgbColor == "goldenrod")
 		TORGB( 218, 165, 32 )
-	if( rgbColor == "gray" )
+	if (rgbColor == "gray")
 		TORGB( 128, 128, 128 )
-	if( rgbColor == "grey" )
+	if (rgbColor == "grey")
 		TORGB( 128, 128, 128 )
-	if( rgbColor == "green" )
+	if (rgbColor == "green")
 		TORGB( 0, 128, 0 )
-	if( rgbColor == "greenyellow" )
+	if (rgbColor == "greenyellow")
 		TORGB( 173, 255, 47 )
-	if( rgbColor == "honeydew" )
+	if (rgbColor == "honeydew")
 		TORGB( 240, 255, 240 )
-	if( rgbColor == "hotpink" )
+	if (rgbColor == "hotpink")
 		TORGB( 255, 105, 180 )
-	if( rgbColor == "indianred" )
+	if (rgbColor == "indianred")
 		TORGB( 205, 92, 92 )
-	if( rgbColor == "indigo" )
+	if (rgbColor == "indigo")
 		TORGB( 75, 0, 130 )
-	if( rgbColor == "ivory" )
+	if (rgbColor == "ivory")
 		TORGB( 255, 255, 240 )
-	if( rgbColor == "khaki" )
+	if (rgbColor == "khaki")
 		TORGB( 240, 230, 140 )
-	if( rgbColor == "lavender" )
+	if (rgbColor == "lavender")
 		TORGB( 230, 230, 250 )
-	if( rgbColor == "lavenderblush" )
+	if (rgbColor == "lavenderblush")
 		TORGB( 255, 240, 245 )
-	if( rgbColor == "lawngreen" )
+	if (rgbColor == "lawngreen")
 		TORGB( 124, 252, 0 )
-	if( rgbColor == "lemonchiffon" )
+	if (rgbColor == "lemonchiffon")
 		TORGB( 255, 250, 205 )
-	if( rgbColor == "lightblue" )
+	if (rgbColor == "lightblue")
 		TORGB( 173, 216, 230 )
-	if( rgbColor == "lightcoral" )
+	if (rgbColor == "lightcoral")
 		TORGB( 240, 128, 128 )
-	if( rgbColor == "lightcyan" )
+	if (rgbColor == "lightcyan")
 		TORGB( 224, 255, 255 )
-	if( rgbColor == "lightgoldenrodyellow" )
+	if (rgbColor == "lightgoldenrodyellow")
 		TORGB( 250, 250, 210 )
-	if( rgbColor == "lightgray" )
+	if (rgbColor == "lightgray")
 		TORGB( 211, 211, 211 )
-	if( rgbColor == "lightgrey" )
+	if (rgbColor == "lightgrey")
 		TORGB( 211, 211, 211 )
-	if( rgbColor == "lightgreen" )
+	if (rgbColor == "lightgreen")
 		TORGB( 144, 238, 144 )
-	if( rgbColor == "lightpink" )
+	if (rgbColor == "lightpink")
 		TORGB( 255, 182, 193 )
-	if( rgbColor == "lightsalmon" )
+	if (rgbColor == "lightsalmon")
 		TORGB( 255, 160, 122 )
-	if( rgbColor == "lightseagreen" )
+	if (rgbColor == "lightseagreen")
 		TORGB( 32, 178, 170 )
-	if( rgbColor == "lightskyblue" )
+	if (rgbColor == "lightskyblue")
 		TORGB( 135, 206, 250 )
-	if( rgbColor == "lightslategray" )
+	if (rgbColor == "lightslategray")
 		TORGB( 119, 136, 153 )
-	if( rgbColor == "lightslategrey" )
+	if (rgbColor == "lightslategrey")
 		TORGB( 119, 136, 153 )
-	if( rgbColor == "lightsteelblue" )
+	if (rgbColor == "lightsteelblue")
 		TORGB( 176, 196, 222 )
-	if( rgbColor == "lightyellow" )
+	if (rgbColor == "lightyellow")
 		TORGB( 255, 255, 224 )
-	if( rgbColor == "lime" )
+	if (rgbColor == "lime")
 		TORGB( 0, 255, 0 )
-	if( rgbColor == "limegreen" )
+	if (rgbColor == "limegreen")
 		TORGB( 50, 205, 50 )
-	if( rgbColor == "linen" )
+	if (rgbColor == "linen")
 		TORGB( 250, 240, 230 )
-	if( rgbColor == "magenta" )
+	if (rgbColor == "magenta")
 		TORGB( 255, 0, 255 )
-	if( rgbColor == "maroon" )
+	if (rgbColor == "maroon")
 		TORGB( 128, 0, 0 )
-	if( rgbColor == "mediumaquamarine" )
+	if (rgbColor == "mediumaquamarine")
 		TORGB( 102, 205, 170 )
-	if( rgbColor == "mediumblue" )
+	if (rgbColor == "mediumblue")
 		TORGB( 0, 0, 205 )
-	if( rgbColor == "mediumorchid" )
+	if (rgbColor == "mediumorchid")
 		TORGB( 186, 85, 211 )
-	if( rgbColor == "mediumpurple" )
+	if (rgbColor == "mediumpurple")
 		TORGB( 147, 112, 219 )
-	if( rgbColor == "mediumseagreen" )
+	if (rgbColor == "mediumseagreen")
 		TORGB( 60, 179, 113 )
-	if( rgbColor == "mediumslateblue" )
+	if (rgbColor == "mediumslateblue")
 		TORGB( 123, 104, 238 )
-	if( rgbColor == "mediumspringgreen" )
+	if (rgbColor == "mediumspringgreen")
 		TORGB( 0, 250, 154 )
-	if( rgbColor == "mediumturquoise" )
+	if (rgbColor == "mediumturquoise")
 		TORGB( 72, 209, 204 )
-	if( rgbColor == "mediumvioletred" )
+	if (rgbColor == "mediumvioletred")
 		TORGB( 199, 21, 133 )
-	if( rgbColor == "midnightblue" )
+	if (rgbColor == "midnightblue")
 		TORGB( 25, 25, 112 )
-	if( rgbColor == "mintcream" )
+	if (rgbColor == "mintcream")
 		TORGB( 245, 255, 250 )
-	if( rgbColor == "mistyrose" )
+	if (rgbColor == "mistyrose")
 		TORGB( 255, 228, 225 )
-	if( rgbColor == "moccasin" )
+	if (rgbColor == "moccasin")
 		TORGB( 255, 228, 181 )
-	if( rgbColor == "navajowhite" )
+	if (rgbColor == "navajowhite")
 		TORGB( 255, 222, 173 )
-	if( rgbColor == "navy" )
+	if (rgbColor == "navy")
 		TORGB( 0, 0, 128 )
-	if( rgbColor == "oldlace" )
+	if (rgbColor == "oldlace")
 		TORGB( 253, 245, 230 )
-	if( rgbColor == "olive" )
+	if (rgbColor == "olive")
 		TORGB( 128, 128, 0 )
-	if( rgbColor == "olivedrab" )
+	if (rgbColor == "olivedrab")
 		TORGB( 107, 142, 35 )
-	if( rgbColor == "orange" )
+	if (rgbColor == "orange")
 		TORGB( 255, 165, 0 )
-	if( rgbColor == "orangered" )
+	if (rgbColor == "orangered")
 		TORGB( 255, 69, 0 )
-	if( rgbColor == "orchid" )
+	if (rgbColor == "orchid")
 		TORGB( 218, 112, 214 )
-	if( rgbColor == "palegoldenrod" )
+	if (rgbColor == "palegoldenrod")
 		TORGB( 238, 232, 170 )
-	if( rgbColor == "palegreen" )
+	if (rgbColor == "palegreen")
 		TORGB( 152, 251, 152 )
-	if( rgbColor == "paleturquoise" )
+	if (rgbColor == "paleturquoise")
 		TORGB( 175, 238, 238 )
-	if( rgbColor == "palevioletred" )
+	if (rgbColor == "palevioletred")
 		TORGB( 219, 112, 147 )
-	if( rgbColor == "papayawhip" )
+	if (rgbColor == "papayawhip")
 		TORGB( 255, 239, 213 )
-	if( rgbColor == "peachpuff" )
+	if (rgbColor == "peachpuff")
 		TORGB( 255, 218, 185 )
-	if( rgbColor == "peru" )
+	if (rgbColor == "peru")
 		TORGB( 205, 133, 63 )
-	if( rgbColor == "pink" )
+	if (rgbColor == "pink")
 		TORGB( 255, 192, 203 )
-	if( rgbColor == "plum" )
+	if (rgbColor == "plum")
 		TORGB( 221, 160, 221 )
-	if( rgbColor == "powderblue" )
+	if (rgbColor == "powderblue")
 		TORGB( 176, 224, 230 )
-	if( rgbColor == "purple" )
+	if (rgbColor == "purple")
 		TORGB( 128, 0, 128 )
-	if( rgbColor == "red" )
+	if (rgbColor == "red")
 		TORGB( 255, 0, 0 )
-	if( rgbColor == "rosybrown" )
+	if (rgbColor == "rosybrown")
 		TORGB( 188, 143, 143 )
-	if( rgbColor == "royalblue" )
+	if (rgbColor == "royalblue")
 		TORGB( 65, 105, 225 )
-	if( rgbColor == "saddlebrown" )
+	if (rgbColor == "saddlebrown")
 		TORGB( 139, 69, 19 )
-	if( rgbColor == "salmon" )
+	if (rgbColor == "salmon")
 		TORGB( 250, 128, 114 )
-	if( rgbColor == "sandybrown" )
+	if (rgbColor == "sandybrown")
 		TORGB( 244, 164, 96 )
-	if( rgbColor == "seagreen" )
+	if (rgbColor == "seagreen")
 		TORGB( 46, 139, 87 )
-	if( rgbColor == "seashell" )
+	if (rgbColor == "seashell")
 		TORGB( 255, 245, 238 )
-	if( rgbColor == "sienna" )
+	if (rgbColor == "sienna")
 		TORGB( 160, 82, 45 )
-	if( rgbColor == "silver" )
+	if (rgbColor == "silver")
 		TORGB( 192, 192, 192 )
-	if( rgbColor == "skyblue" )
+	if (rgbColor == "skyblue")
 		TORGB( 135, 206, 235 )
-	if( rgbColor == "slateblue" )
+	if (rgbColor == "slateblue")
 		TORGB( 106, 90, 205 )
-	if( rgbColor == "slategray" )
+	if (rgbColor == "slategray")
 		TORGB( 112, 128, 144 )
-	if( rgbColor == "slategrey" )
+	if (rgbColor == "slategrey")
 		TORGB( 112, 128, 144 )
-	if( rgbColor == "snow" )
+	if (rgbColor == "snow")
 		TORGB( 255, 250, 250 )
-	if( rgbColor == "springgreen" )
+	if (rgbColor == "springgreen")
 		TORGB( 0, 255, 127 )
-	if( rgbColor == "steelblue" )
+	if (rgbColor == "steelblue")
 		TORGB( 70, 130, 180 )
-	if( rgbColor == "tan" )
+	if (rgbColor == "tan")
 		TORGB( 210, 180, 140 )
-	if( rgbColor == "teal" )
+	if (rgbColor == "teal")
 		TORGB( 0, 128, 128 )
-	if( rgbColor == "thistle" )
+	if (rgbColor == "thistle")
 		TORGB( 216, 191, 216 )
-	if( rgbColor == "tomato" )
+	if (rgbColor == "tomato")
 		TORGB( 255, 99, 71 )
-	if( rgbColor == "turquoise" )
+	if (rgbColor == "turquoise")
 		TORGB( 64, 224, 208 )
-	if( rgbColor == "violet" )
+	if (rgbColor == "violet")
 		TORGB( 238, 130, 238 )
-	if( rgbColor == "wheat" )
+	if (rgbColor == "wheat")
 		TORGB( 245, 222, 179 )
-	if( rgbColor == "white" )
+	if (rgbColor == "white")
 		TORGB( 255, 255, 255 )
-	if( rgbColor == "whitesmoke" )
+	if (rgbColor == "whitesmoke")
 		TORGB( 245, 245, 245 )
-	if( rgbColor == "yellow" )
+	if (rgbColor == "yellow")
 		TORGB( 255, 255, 0 )
-	if( rgbColor == "yellowgreen" )
+	if (rgbColor == "yellowgreen")
 		TORGB( 154, 205, 50 )
 }
 

Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp	(original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp	Fri Oct  5 20:35:20 2018
@@ -288,14 +288,14 @@
 bool ColorSetManager::checkPaletteFormat(const QString& paletteFileName)
 {
 	QFile f(paletteFileName);
-	if(!f.open(QIODevice::ReadOnly))
+	if (!f.open(QIODevice::ReadOnly))
 		return false;
 	QDomDocument docu("scridoc");
 	QTextStream ts(&f);
 	ts.setCodec("UTF-8");
 	QString errorMsg;
 	int errorLine = 0, errorColumn = 0;
-	if( !docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn) )
+	if (!docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn))
 	{
 		f.close();
 		return false;

Modified: trunk/Scribus/scribus/fonts/scface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/fonts/scface.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scface.cpp	(original)
+++ trunk/Scribus/scribus/fonts/scface.cpp	Fri Oct  5 20:35:20 2018
@@ -435,7 +435,7 @@
 		return CONTROL_GLYPHS + ch;
 	if (ch == SpecialChars::NBSPACE)
 		return  m_m->char2CMap(' ');
-	if(ch == SpecialChars::NBHYPHEN)
+	if (ch == SpecialChars::NBHYPHEN)
 		return hyphenGlyph();
 	return 0;
 }

Modified: trunk/Scribus/scribus/fonts/scface_ps.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/fonts/scface_ps.h
==============================================================================
--- trunk/Scribus/scribus/fonts/scface_ps.h	(original)
+++ trunk/Scribus/scribus/fonts/scface_ps.h	Fri Oct  5 20:35:20 2018
@@ -146,18 +146,21 @@
 					cxxc=0;
 					for (int j = 0; j < ulen; ++j)
 					{
-						unsigned char u=bb[posi];
-						linebuf[cxxc]=((u >> 4) & 15) + '0';
-						if(u>0x9f) linebuf[cxxc]+='a'-':';
+						unsigned char u = bb[posi];
+						linebuf[cxxc] = ((u >> 4) & 15) + '0';
+						if (u>0x9f)
+							linebuf[cxxc] += 'a'-':';
 						++cxxc;
-						u&=15; linebuf[cxxc]=u + '0';
-						if(u>0x9) linebuf[cxxc]+='a'-':';
+						u&=15;
+						linebuf[cxxc]=u + '0';
+						if (u>0x9)
+							linebuf[cxxc] += 'a'-':';
 						++posi;
 						++cxxc;
 						if (cxxc > 72)
 						{
-							linebuf[cxxc++]='\n';
-							linebuf[cxxc++]=0;
+							linebuf[cxxc++] = '\n';
+							linebuf[cxxc++] = 0;
 							str += linebuf;
 							cxxc = 0;
 						}
@@ -171,7 +174,7 @@
 				{
 					if ((bb[j] == static_cast<char>(0x80)) && (j+1 < bb.size()) && (static_cast<int>(bb[j+1]) == 3))
 						break;
-					if(bb[j]=='\r')
+					if (bb[j]=='\r')
 						str+="\n";
 					else
 						str += bb[j];

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	Fri Oct  5 20:35:20 2018
@@ -123,7 +123,7 @@
 	{
 		s >> signature;
 		offset += 4;
-		if(((signature >> 24)&0xff) != '8' ||
+		if (((signature >> 24)&0xff) != '8' ||
 		        ((signature >> 16)&0xff) != 'B' ||
 		        ((signature >> 8)&0xff) != 'I' ||
 		        ((signature )&0xff) != 'M' )
@@ -134,7 +134,7 @@
 		resName = getPascalString(s);
 		offset += s.device()->pos() - adj;
 		s >> resSize;
-		if(offset + resSize > size)
+		if (offset + resSize > size)
 			break;
 		resBase = s.device()->pos();
 		if ( (resID >= 0x07d0) && (resID <= 0x0bb6) )
@@ -271,6 +271,6 @@
 			offset += 1;
 		}
 	}
-	if(offset<size)
+	if (offset<size)
 		s.device()->seek( size );
 }

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_kra.cpp	Fri Oct  5 20:35:20 2018
@@ -68,7 +68,7 @@
 					if (uz->read("maindoc.xml", f))
 					{
 						QDomDocument designMapDom;
-						if(designMapDom.setContent(f))
+						if (designMapDom.setContent(f))
 						{
 							QDomElement docElem = designMapDom.documentElement().firstChildElement("IMAGE");
 							m_imageInfoRecord.exifInfo.height = docElem.attribute("height", "0").toInt();
@@ -106,7 +106,7 @@
 			if (uz->read("maindoc.xml", f))
 			{
 				QDomDocument designMapDom;
-				if(designMapDom.setContent(f))
+				if (designMapDom.setContent(f))
 				{
 					QDomElement docElem = designMapDom.documentElement().firstChildElement("IMAGE");
 					m_imageInfoRecord.exifInfo.height = docElem.attribute("height", "0").toInt();

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp	Fri Oct  5 20:35:20 2018
@@ -63,7 +63,7 @@
 					if (uz->read("stack.xml", f))
 					{
 						QDomDocument designMapDom;
-						if(designMapDom.setContent(f))
+						if (designMapDom.setContent(f))
 						{
 							QDomElement docElem = designMapDom.documentElement();
 							m_imageInfoRecord.exifInfo.height = docElem.attribute("h", "0").toInt();
@@ -91,7 +91,7 @@
 			if (uz->read("stack.xml", f))
 			{
 				QDomDocument designMapDom;
-				if(designMapDom.setContent(f))
+				if (designMapDom.setContent(f))
 				{
 					m_inSubLayer = 0;
 					m_layerCount = 0;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp	Fri Oct  5 20:35:20 2018
@@ -85,12 +85,12 @@
 		QFile::remove(tmpFile);
 		if (!ScCore->havePNGAlpha())
 		{
-			for( int yi=0; yi < m_image.height(); ++yi )
+			for (int yi = 0; yi < m_image.height(); ++yi)
 			{
 				QRgb *s = (QRgb*)(m_image.scanLine( yi ));
-				for(int xi=0; xi < m_image.width(); ++xi )
+				for (int xi = 0; xi < m_image.width(); ++xi )
 				{
-					if((*s) == 0xffffffff)
+					if ((*s) == 0xffffffff)
 						(*s) &= 0x00ffffff;
 					s++;
 				}
@@ -145,7 +145,7 @@
 				s = (QRgb*)(m_image.scanLine( yi ));
 				for(int xi=0; xi < m_image.width(); ++xi )
 				{
-					if((*s) == 0xffffffff)
+					if ((*s) == 0xffffffff)
 						(*s) &= 0x00ffffff;
 					s++;
 				}

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pgf.cpp	Fri Oct  5 20:35:20 2018
@@ -204,9 +204,9 @@
 		m_imageInfoRecord.exifDataValid = false;
 		float xres = m_image.dotsPerMeterX() * 0.0254;
 		float yres = m_image.dotsPerMeterY() * 0.0254;
-		if( xres <= 1.0 || xres > 3000.0 )
+		if (xres <= 1.0 || xres > 3000.0)
 			xres = 72.0;
-		if( yres <= 1.0 || yres > 3000.0 )
+		if (yres <= 1.0 || yres > 3000.0)
 			yres = 72.0;
 		int resInf = m_imageInfoRecord.lowResType;
 		m_image = m_image.convertToFormat(QImage::Format_ARGB32);

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp	Fri Oct  5 20:35:20 2018
@@ -1710,7 +1710,7 @@
 		c = *ptrIn++;
 		count++;
 		len = c;
-		if( len < 128 )
+		if (len < 128)
 		{
 			// Copy next len+1 bytes literally.
 			len++;
@@ -1728,7 +1728,7 @@
 				}
 			}
 		}
-		else if( len > 128 )
+		else if (len > 128)
 		{
 			// Next -len+1 bytes in the dest are replicated from next source byte.
 			// (Interpret len as a negative 8-bit int.)
@@ -1760,7 +1760,7 @@
 				}
 			}
 		}
-		else if( len == 128 )
+		else if (len == 128)
 		{
 			// No-op.
 		}

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp	Fri Oct  5 20:35:20 2018
@@ -614,12 +614,12 @@
 					QRgb alphaFF = qRgba(255,255,255,255);
 					QRgb alpha00 = qRgba(255,255,255,  0);
 					QRgb *s;
-					for( int yi=0; yi < hi; ++yi )
+					for (int yi = 0; yi < hi; ++yi)
 					{
 						s = (QRgb*)(m_image.scanLine( yi ));
-						for(int xi=0; xi < wi; ++xi )
+						for (int xi = 0; xi < wi; ++xi)
 						{
-							if((*s) == alphaFF)
+							if ((*s) == alphaFF)
 								(*s) &= alpha00;
 							s++;
 						}
@@ -816,12 +816,12 @@
 				QRgb alphaFF = qRgba(255,255,255,255);
 				QRgb alpha00 = qRgba(255,255,255,  0);
 				QRgb *s;
-				for( int yi=0; yi < hi; ++yi )
+				for (int yi = 0; yi < hi; ++yi)
 				{
 					s = (QRgb*)(m_image.scanLine( yi ));
-					for(int xi=0; xi < wi; ++xi )
-					{
-						if((*s) == alphaFF)
+					for (int xi = 0; xi < wi; ++xi)
+					{
+						if ((*s) == alphaFF)
 							(*s) &= alpha00;
 						s++;
 					}
@@ -1730,12 +1730,12 @@
 				QRgb alphaFF = qRgba(255,255,255,255);
 				QRgb alpha00 = qRgba(255,255,255,  0);
 				QRgb *s;
-				for( int yi=0; yi < hi; ++yi )
-				{
-					s = (QRgb*)(m_image.scanLine( yi ));
-					for(int xi=0; xi < wi; ++xi )
-					{
-						if((*s) == alphaFF)
+				for (int yi = 0; yi < hi; ++yi)
+				{
+					s = (QRgb*)(m_image.scanLine(yi));
+					for (int xi = 0; xi < wi; ++xi)
+					{
+						if ((*s) == alphaFF)
 							(*s) &= alpha00;
 						s++;
 					}

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp	Fri Oct  5 20:35:20 2018
@@ -19,7 +19,7 @@
 {
 	s >> header.signature;
 	s >> header.version;
-	for( int i = 0; i < 6; i++ )
+	for (int i = 0; i < 6; i++)
 	{
 		s >> header.reserved[i];
 	}
@@ -65,12 +65,12 @@
 			PSDHeader header;
 			s >> header;
 			// Check image file format.
-			if( s.atEnd() || !IsValid( header ) )
+			if (s.atEnd() || !IsValid(header))
 				return;
 			// Check if it's a supported format.
-			if( !IsSupported( header ) )
+			if (!IsSupported(header))
 				return;
-			if( !LoadPSDResources(s, header, s.device()->pos()) )
+			if (!LoadPSDResources(s, header, s.device()->pos()))
 				return;
 			if (m_embeddedProfile.size() > 0)
 			{
@@ -112,12 +112,12 @@
 		PSDHeader header;
 		s >> header;
 		// Check image file format.
-		if( s.atEnd() || !IsValid( header ) )
+		if (s.atEnd() || !IsValid(header))
 			return false;
 		// Check if it's a supported format.
-		if( !IsSupported( header ) )
+		if (!IsSupported(header))
 			return false;
-		if( !LoadPSD(s, header) )
+		if (!LoadPSD(s, header))
 			r_image.resize(0);
 		f.close();
 		m_imageInfoRecord.valid = true;
@@ -157,14 +157,14 @@
 		PSDHeader header;
 		s >> header;
 		// Check image file format.
-		if( s.atEnd() || !IsValid( header ) )
+		if (s.atEnd() || !IsValid(header))
 			return false;
 		// Check if it's a supported format.
-		if( !IsSupported( header ) )
+		if (!IsSupported(header))
 			return false;
 		if (thumbnail)
 			header.reserved[0] = 't';
-		if( !LoadPSD(s, header) )
+		if (!LoadPSD(s, header))
 			return false;
 		if (m_embeddedProfile.size() > 0)
 		{
@@ -199,11 +199,11 @@
 				QRgb *s;
 				unsigned char cc, cm, cy, ck;
 				uchar *d;
-				for( int yit=0; yit < m_imageInfoRecord.exifInfo.thumbnail.height(); ++yit )
+				for (int yit = 0; yit < m_imageInfoRecord.exifInfo.thumbnail.height(); ++yit)
 				{
 					s = (QRgb*)(m_imageInfoRecord.exifInfo.thumbnail.scanLine( yit ));
 					d = r_image.scanLine( yit );
-					for(int xit=0; xit < m_imageInfoRecord.exifInfo.thumbnail.width(); ++xit )
+					for (int xit =0 ; xit < m_imageInfoRecord.exifInfo.thumbnail.width(); ++xit)
 					{
 						if (isCMYK)
 						{
@@ -511,7 +511,7 @@
 		}
 		// Try to decode simple psd file, no layers
 		s.device()->seek(startLayers + layerDataLen);
-		if(s.atEnd())
+		if (s.atEnd())
 			return false;
 		return loadLayer( s, header);
 	}
@@ -566,7 +566,7 @@
 			}
 			s >> signature;
 			blend = "";
-			for( int i = 0; i < 4; i++ )
+			for (int i = 0; i < 4; i++)
 			{
 				s >> blendKey[i];
 				blend += QChar(blendKey[i]);
@@ -608,7 +608,7 @@
 			lay.layerName = getLayerString(s);
 			m_imageInfoRecord.layerInfo.append(lay);
 			s >> signature;
-			if( signature == 0x3842494D )
+			if (signature == 0x3842494D)
 			{
 				while (signature == 0x3842494D )
 				{
@@ -623,7 +623,7 @@
 			{
 				s.device()->seek( s.device()->pos() - 2 );
 				s >> signature;
-				if( signature == 0x3842494D )
+				if (signature == 0x3842494D)
 				{
 					while (signature == 0x3842494D )
 					{
@@ -660,7 +660,7 @@
 	uchar cbyte;
 	ushort compression;
 	s >> compression;
-	if( compression > 1 )
+	if (compression > 1)
 		return false;
 	if (compression == 0)
 	{
@@ -720,11 +720,11 @@
 			ptr += component;
 			while( count < pixel_count )
 			{
-				if(s.atEnd())
+				if (s.atEnd())
 					return false;
 				s >> c;
 				len = c;
-				if( len < 128 )
+				if (len < 128)
 				{
 					// Copy next len+1 bytes literally.
 					len++;
@@ -768,7 +768,7 @@
 						len--;
 					}
 				}
-				else if( len > 128 )
+				else if (len > 128)
 				{
 					// Next -len+1 bytes in the dest are replicated from next source byte.
 					// (Interpret len as a negative 8-bit int.)
@@ -813,7 +813,7 @@
 						len--;
 					}
 				}
-				else if( len == 128 )
+				else if (len == 128)
 				{
 					// No-op.
 				}
@@ -849,9 +849,9 @@
 		createOk = r2_image.create(layerInfo[layer].width, layerInfo[layer].height, qMax(channel_num, (uint)4));
 		r2_image.fill(0);
 	}
-	if( !createOk )
-	{
-		for(uint channel = 0; channel < channel_num; channel++)
+	if (!createOk)
+	{
+		for (uint channel = 0; channel < channel_num; channel++)
 		{
 			base2 += layerInfo[layer].channelLen[channel];
 		}
@@ -860,7 +860,7 @@
 	}
 	channel_num = qMin(channel_num, (uint)39);
 	uint components[40];
-	for(uint channel = 0; channel < channel_num; channel++)
+	for (uint channel = 0; channel < channel_num; channel++)
 	{
 		switch(layerInfo[layer].channelType[channel])
 		{
@@ -905,7 +905,7 @@
 	}
 	if (!hasAlpha)
 		r2_image.fill('\xff');
-	for(uint channel = 0; channel < channel_num; channel++)
+	for (uint channel = 0; channel < channel_num; channel++)
 	{
 		if (layerInfo[layer].channelType[channel] == -2)
 		{
@@ -919,7 +919,7 @@
 		if (!loadChannel(s, header, layerInfo, layer, channel, components[channel], r2_image))
 			break;
 	}
-	for(uint channel = 0; channel < channel_num; channel++)
+	for (uint channel = 0; channel < channel_num; channel++)
 	{
 		base2 += layerInfo[layer].channelLen[channel];
 	}
@@ -1033,13 +1033,13 @@
 		{
 			unsigned char *s;
 			unsigned char *d;
-			for( int yi=static_cast<int>(startSrcY); yi < qMin(r2_image.height(),  r_image.height()); ++yi )
+			for (int yi=static_cast<int>(startSrcY); yi < qMin(r2_image.height(),  r_image.height()); ++yi)
 			{
 				s = r2_image.scanLine( yi );
 				d = r_image.scanLine( qMin(static_cast<int>(startDstY),  r_image.height()-1) );
 				d += qMin(static_cast<int>(startDstX), r_image.width()-1) * r_image.channels();
 				s += qMin(static_cast<int>(startSrcX), r2_image.width()-1) * r2_image.channels();
-				for(int xi=static_cast<int>(startSrcX); xi < qMin(r2_image.width(),  r_image.width()); ++xi )
+				for (int xi=static_cast<int>(startSrcX); xi < qMin(r2_image.width(),  r_image.width()); ++xi)
 				{
 					d[0] = s[0];
 					d[1] = s[1];
@@ -1338,7 +1338,7 @@
 	ushort compression;
 	uchar cbyte;
 	s >> compression;
-	if( compression > 1 )
+	if (compression > 1)
 	{
 		// Unknown compression type.
 		return false;
@@ -1347,11 +1347,11 @@
 	r_image.fill('\xff');
 	const uint pixel_count = header.height * header.width;
 	static const uint components[5] = {0, 1, 2, 3, 4};
-	if( compression )
+	if (compression)
 	{
 		// Skip row lengths.
 		ushort w;
-		for(uint i = 0; i < header.height * header.channel_count; i++)
+		for (uint i = 0; i < header.height * header.channel_count; i++)
 		{
 			s >> w;
 		}
@@ -1360,24 +1360,24 @@
 		uint count = 0;
 		uchar c;
 		uint len;
-		for(uint channel = 0; channel < channel_num; channel++)
+		for (uint channel = 0; channel < channel_num; channel++)
 		{
 			ptr = r_image.bits() + components[channel];
 			count = 0;
 			while( count < pixel_count )
 			{
-				if(s.atEnd())
+				if (s.atEnd())
 					return false;
 				s >> c;
 				len = c;
-				if( len < 128 )
+				if (len < 128)
 				{
 					// Copy next len+1 bytes literally.
 					len++;
 					count += len;
-					if ( count > pixel_count )
+					if (count > pixel_count)
 						return false;
-					while( len != 0 )
+					while (len != 0)
 					{
 						s >> cbyte;
 						if ((header.color_mode == CM_CMYK) && (components[channel] < 4))
@@ -1411,14 +1411,14 @@
 						len--;
 					}
 				}
-				else if( len > 128 )
+				else if (len > 128)
 				{
 					// Next -len+1 bytes in the dest are replicated from next source byte.
 					// (Interpret len as a negative 8-bit int.)
 					len ^= 0xFF;
 					len += 2;
 					count += len;
-					if(s.atEnd() || count > pixel_count)
+					if (s.atEnd() || count > pixel_count)
 						return false;
 					uchar val;
 					s >> val;
@@ -1455,7 +1455,7 @@
 						len--;
 					}
 				}
-				else if( len == 128 )
+				else if (len == 128)
 				{
 					// No-op.
 				}
@@ -1469,12 +1469,12 @@
 		// Read the data by channel.
 		uchar * ptr;
 		uint count = 0;
-		for(uint channel = 0; channel < channel_num; channel++)
+		for (uint channel = 0; channel < channel_num; channel++)
 		{
 			ptr =  r_image.bits() + components[channel];
 			// Read the data.
 			count = pixel_count;
-			while( count != 0 )
+			while (count != 0)
 			{
 				s >> cbyte;
 				if ((header.color_mode == CM_CMYK) && (components[channel] < 4))
@@ -1536,7 +1536,7 @@
 		s >> tmp;
 		return ret;
 	}
-	for( int i = 0; i < len; i++ )
+	for (int i = 0; i < len; i++)
 	{
 		s >> tmp;
 		ret += QChar(tmp);

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_qt.cpp	Fri Oct  5 20:35:20 2018
@@ -51,9 +51,9 @@
 		m_imageInfoRecord.exifDataValid = false;
 		float xres = m_image.dotsPerMeterX() * 0.0254;
 		float yres = m_image.dotsPerMeterY() * 0.0254;
-		if( xres <= 1.0 || xres > 3000.0 )
+		if (xres <= 1.0 || xres > 3000.0)
 			xres = 72.0;
-		if( yres <= 1.0 || yres > 3000.0 )
+		if (yres <= 1.0 || yres > 3000.0)
 			yres = 72.0;
 		int resInf = m_imageInfoRecord.lowResType;
 		m_imageInfoRecord.colorspace = ColorSpaceRGB;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Fri Oct  5 20:35:20 2018
@@ -131,7 +131,7 @@
 bool Scribus12Format::fileSupported(QIODevice* /* file */, const QString & fileName) const
 {
 	QByteArray docBytes("");
-	if(fileName.right(2) == "gz")
+	if (fileName.right(2) == "gz")
 	{
 		QFile file(fileName);
 		QtIOCompressor compressor(&file);
@@ -153,7 +153,7 @@
 QString Scribus12Format::readSLA(const QString & fileName)
 {
 	QByteArray docBytes("");
-	if(fileName.right(2) == "gz")
+	if (fileName.right(2) == "gz")
 	{
 		QFile file(fileName);
 		QtIOCompressor compressor(&file);
@@ -766,7 +766,7 @@
 	int ObCount = 0;
 	int activeLayer = 0;
 	PrefsManager* prefsManager=PrefsManager::instance();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc=DOC.toElement();
 	/*
@@ -889,14 +889,14 @@
 		m_Doc->LastAuto = nullptr;
 		QDomNode PAGE=DOC.firstChild();
 		counter = 0;
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			ObCount++;
 			if (m_mwProgressBar!=nullptr)
 				m_mwProgressBar->setValue(ObCount);
 			QDomElement pg=PAGE.toElement();
 			// 10/25/2004 pv - None is "reserved" color. cannot be defined in any file...
-			if(pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
+			if (pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
 			{
 				if (pg.hasAttribute("CMYK"))
 					lf.setNamedColor(pg.attribute("CMYK"));
@@ -906,7 +906,7 @@
 				lf.setRegistrationColor(false);
 				m_Doc->PageColors.insert(pg.attribute("NAME"), lf);
 			}
-			if(pg.tagName()=="STYLE")
+			if (pg.tagName()=="STYLE")
 			{
 				vg.erase();
 				GetStyle(&pg, &vg, nullptr, m_Doc, true);
@@ -914,9 +914,9 @@
 				temp.create(vg);
 				m_Doc->redefineStyles(temp, false);
 			}
-			if(pg.tagName()=="JAVA")
+			if (pg.tagName()=="JAVA")
 				m_Doc->JavaScripts[pg.attribute("NAME")] = pg.attribute("SCRIPT");
-			if(pg.tagName()=="LAYERS")
+			if (pg.tagName()=="LAYERS")
 			{
 				int lId   = pg.attribute("NUMMER").toInt();
 				int level = pg.attribute("LEVEL").toInt();
@@ -925,11 +925,11 @@
 				la.isPrintable = pg.attribute("DRUCKEN").toInt();
 				m_Doc->Layers.append(la);
 			}
-			if(pg.tagName()=="MultiLine")
+			if (pg.tagName()=="MultiLine")
 			{
 				multiLine ml;
 				QDomNode MuLn = PAGE.firstChild();
-				while(!MuLn.isNull())
+				while (!MuLn.isNull())
 				{
 					QDomElement MuL = MuLn.toElement();
 					struct SingleLine sl;
@@ -944,7 +944,7 @@
 				}
 				m_Doc->MLineStyles.insert(pg.attribute("Name"), ml);
 			}
-			if(pg.tagName()=="PAGE")
+			if (pg.tagName()=="PAGE")
 			{
 				TableItems.clear();
 				TableID.clear();
@@ -993,7 +993,7 @@
 				QDomNode OBJ=PAGE.firstChild();
 				int pageNo = a;
 				int pageItem = 0;
-				while(!OBJ.isNull())
+				while (!OBJ.isNull())
 				{
 					QDomElement obj=OBJ.toElement();
 					/*
@@ -1057,7 +1057,7 @@
 					else
 						OB.Groups.clear();
 					QDomNode IT=OBJ.firstChild();
-					while(!IT.isNull())
+					while (!IT.isNull())
 					{
 						QDomElement it=IT.toElement();
 						if (it.tagName()=="CSTOP")
@@ -1086,7 +1086,7 @@
 					Neu->setRedrawBounding();
 					IT=OBJ.firstChild();
 					LastStyles * lastS = new LastStyles();
-					while(!IT.isNull())
+					while (!IT.isNull())
 					{
 						QDomElement it=IT.toElement();
 						if (it.tagName()=="ITEXT")
@@ -1135,10 +1135,10 @@
 		}
 		m_Doc->setMasterPageMode(false);
 		PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
-			if(pg.tagName()=="Bookmark")
+			if (pg.tagName()=="Bookmark")
 			{
 				int elem = pg.attribute("Element").toInt();
 				if (elem < m_Doc->Items->count())
@@ -1156,7 +1156,7 @@
 					m_Doc->BookMarks.append(bok);
 				}
 			}
-			if(pg.tagName()=="PDF")
+			if (pg.tagName()=="PDF")
 			{
 				m_Doc->pdfOptions().Articles = static_cast<bool>(pg.attribute("Articles").toInt());
 				m_Doc->pdfOptions().Thumbnails = static_cast<bool>(pg.attribute("Thumbnails").toInt());
@@ -1208,10 +1208,10 @@
 				m_Doc->pdfOptions().UseSpotColors = true;
 				m_Doc->pdfOptions().doMultiFile = false;
 				QDomNode PFO = PAGE.firstChild();
-				while(!PFO.isNull())
+				while (!PFO.isNull())
 				{
 					QDomElement pdfF = PFO.toElement();
-					if(pdfF.tagName() == "LPI")
+					if (pdfF.tagName() == "LPI")
 					{
 						struct LPIData lpo;
 						lpo.Angle = pdfF.attribute("Angle").toInt();
@@ -1219,17 +1219,17 @@
 						lpo.SpotFunc = pdfF.attribute("SpotFunction").toInt();
 						m_Doc->pdfOptions().LPISettings[pdfF.attribute("Color")] = lpo;
 					}
-					if(pdfF.tagName() == "Fonts")
+					if (pdfF.tagName() == "Fonts")
 					{
 						if (!m_Doc->pdfOptions().EmbedList.contains(pdfF.attribute("Name")))
 							m_Doc->pdfOptions().EmbedList.append(pdfF.attribute("Name"));
 					}
-					if(pdfF.tagName() == "Subset")
+					if (pdfF.tagName() == "Subset")
 					{
 						if (!m_Doc->pdfOptions().SubsetList.contains(pdfF.attribute("Name")))
 							m_Doc->pdfOptions().SubsetList.append(pdfF.attribute("Name"));
 					}
-					if(pdfF.tagName() == "Effekte")
+					if (pdfF.tagName() == "Effekte")
 					{
 						struct PDFPresentationData ef;
 						ef.pageEffectDuration = pdfF.attribute("pageEffectDuration").toInt();
@@ -1869,18 +1869,18 @@
 	if (elem.hasAttribute("Version"))
 		newVersion = true;
 	QDomNode DOC=elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc=DOC.toElement();
 	/*
 	* Attribute von DOCUMENT auslesen
 	*/
 		QDomNode PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
 			// 10/25/2004 pv - None is "reserved" color. cannot be defined in any file...
-			if(pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
+			if (pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
 			{
 				if (pg.hasAttribute("CMYK"))
 					lf.setNamedColor(pg.attribute("CMYK"));
@@ -1890,14 +1890,14 @@
 				lf.setRegistrationColor(false);
 				m_Doc->PageColors.insert(pg.attribute("NAME"), lf);
 			}
-			if(pg.tagName()=="STYLE")
+			if (pg.tagName()=="STYLE")
 			{
 				GetStyle(&pg, &vg, nullptr, m_Doc, true);
 				VorLFound = true;
 			}
-			if(pg.tagName()=="JAVA")
+			if (pg.tagName()=="JAVA")
 				m_Doc->JavaScripts[pg.attribute("NAME")] = pg.attribute("SCRIPT");
-			if(pg.tagName()=="LAYERS")
+			if (pg.tagName()=="LAYERS")
 			{
 				int lId   = pg.attribute("NUMMER").toInt();
 				int level = pg.attribute("LEVEL").toInt();
@@ -1918,11 +1918,11 @@
 					m_Doc->Layers.append(la);
 				}
 			}
-			if(pg.tagName()=="MultiLine")
+			if (pg.tagName()=="MultiLine")
 			{
 				multiLine ml;
 				QDomNode MuLn = PAGE.firstChild();
-				while(!MuLn.isNull())
+				while (!MuLn.isNull())
 				{
 					QDomElement MuL = MuLn.toElement();
 					struct SingleLine sl;
@@ -1998,7 +1998,7 @@
 				counter = m_Doc->Items->count();
 			//	baseobj = counter;
 				int pageItem = 0;
-				while(!OBJ.isNull())
+				while (!OBJ.isNull())
 				{
 					QDomElement obj=OBJ.toElement();
 				/*
@@ -2061,7 +2061,7 @@
 					else
 						OB.Groups.clear();
 					QDomNode IT=OBJ.firstChild();
-					while(!IT.isNull())
+					while (!IT.isNull())
 					{
 						QDomElement it=IT.toElement();
 						if (it.tagName()=="CSTOP")
@@ -2082,7 +2082,7 @@
 					Neu = m_Doc->Items->at(counter);
 					IT=OBJ.firstChild();
 					LastStyles* last = new LastStyles();
-					while(!IT.isNull())
+					while (!IT.isNull())
 					{
 						QDomElement it=IT.toElement();
 						if (it.tagName()=="ITEXT")
@@ -2213,10 +2213,10 @@
 				if (!Mpage)
 					m_View->reformPages();
 				PAGE=DOC.firstChild();
-				while(!PAGE.isNull())
+				while (!PAGE.isNull())
 				{
 					QDomElement pg=PAGE.toElement();
-					if(pg.tagName()=="Bookmark")
+					if (pg.tagName()=="Bookmark")
 					{
 						int elem = pg.attribute("Element").toInt();
 						if (elem < m_Doc->Items->count())
@@ -2318,7 +2318,7 @@
 	{
 		QList<ParagraphStyle::TabRecord> tbs;
 		QDomNode IT = pg->firstChild();
-		while(!IT.isNull())
+		while (!IT.isNull())
 		{
 			QDomElement it = IT.toElement();
 			if (it.tagName()=="Tabs")
@@ -2401,20 +2401,20 @@
 	QString f (readSLA(fileName));
 	if (f.isEmpty())
 		return false;
-	if(!docu.setContent(f))
+	if (!docu.setContent(f))
 		return false;
 	QDomElement elem=docu.documentElement();
 	if ((elem.tagName() != "SCRIBUS") && (elem.tagName() != "SCRIBUSUTF8"))
 		return false;
 	QDomNode DOC=elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc=DOC.toElement();
 		QDomNode PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
-			if(pg.tagName()=="STYLE")
+			if (pg.tagName()=="STYLE")
 			{
 				pstyle.erase();
 				GetStyle(&pg, &pstyle, &docParagraphStyles, doc, false);
@@ -2432,24 +2432,24 @@
 	QString f(readSLA(fileName));
 	if (f.isEmpty())
 		return false;
-	if(!docu.setContent(f))
+	if (!docu.setContent(f))
 		return false;
 	QDomElement elem=docu.documentElement();
 	if ((elem.tagName() != "SCRIBUS") && (elem.tagName() != "SCRIBUSUTF8"))
 		return false;
 	QDomNode DOC=elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc=DOC.toElement();
 		QDomNode PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
-			if(pg.tagName()=="MultiLine")
+			if (pg.tagName()=="MultiLine")
 			{
 				multiLine ml;
 				QDomNode MuLn = PAGE.firstChild();
-				while(!MuLn.isNull())
+				while (!MuLn.isNull())
 				{
 					QDomElement MuL = MuLn.toElement();
 					struct SingleLine sl;
@@ -2490,7 +2490,7 @@
 	if (f.isEmpty())
 		return false;
 	QDomDocument docu("scridoc");
-	if(!docu.setContent(f))
+	if (!docu.setContent(f))
 		return false;
 	colors.clear();
 	ScColor lf = ScColor();
@@ -2498,15 +2498,15 @@
 	if ((elem.tagName() != "SCRIBUS") && (elem.tagName() != "SCRIBUSUTF8"))
 		return false;
 	QDomNode DOC=elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc=DOC.toElement();
 		QDomNode PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
 			// 10/25/2004 pv - None is "reserved" color. cannot be defined in any file...
-			if(pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
+			if (pg.tagName()=="COLOR" && pg.attribute("NAME")!=CommonStrings::None)
 			{
 				if (pg.hasAttribute("CMYK"))
 					lf.setNamedColor(pg.attribute("CMYK"));
@@ -2538,19 +2538,19 @@
 	QString f(readSLA(fileName));
 	if (f.isEmpty())
 		return false;
-	if(!docu.setContent(f))
+	if (!docu.setContent(f))
 		return false;
 	QDomElement elem=docu.documentElement();
 	if ((elem.tagName() != "SCRIBUS") && (elem.tagName() != "SCRIBUSUTF8"))
 		return false;
 	QDomNode DOC=elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomNode PAGE=DOC.firstChild();
-		while(!PAGE.isNull())
+		while (!PAGE.isNull())
 		{
 			QDomElement pg=PAGE.toElement();
-			if(pg.tagName()=="PAGE")
+			if (pg.tagName()=="PAGE")
 			{
 				PgNam = pg.attribute("NAM", "");
 				if (PgNam.isEmpty())

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp	Fri Oct  5 20:35:20 2018
@@ -1243,30 +1243,30 @@
 	QString unitval=unit;
 	if (unit.isEmpty())
 		return 0.0;
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt")
 		unitval.replace( "pt", "" );
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		unitval.replace( "cm", "" );
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		unitval.replace( "mm" , "" );
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		unitval.replace( "in", "" );
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		unitval.replace( "px", "" );
-	else if( unit.right( 1 ) == "%" )
+	else if (unit.right( 1 ) == "%" )
 		unitval.replace( "%", "" );
 	double value = ScCLocale::toDoubleC(unitval);
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt" )
 		{}/* value = value; */ //no change
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		value = ( value / 2.54 ) * 72;
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		value = ( value / 25.4 ) * 72;
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		value = value * 72;
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		{}/* value = value; */ //no change
-	else if( unit.right( 1 ) == "%" )
+	else if (unit.right( 1 ) == "%")
 		value = value / 100.0;
 	return value;
 }
@@ -1284,24 +1284,24 @@
 	QString ret = CommonStrings::None;
 	if ((s == "") || s.isEmpty())
 		return ret;
-	if( s.startsWith( "rgb(" ) )
+	if (s.startsWith( "rgb(" ))
 	{
 		QString parse = s.trimmed();
 		QStringList colors = parse.split( ',', QString::SkipEmptyParts );
 		QString r = colors[0].right( ( colors[0].length() - 4 ) );
 		QString g = colors[1];
 		QString b = colors[2].left( ( colors[2].length() - 1 ) );
-		if( r.contains( "%" ) )
+		if (r.contains( "%" ))
 		{
 			r.chop(1);
 			r = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(r) ) / 100.0 ) ) );
 		}
-		if( g.contains( "%" ) )
+		if (g.contains( "%" ))
 		{
 			g.chop(1);
 			g = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(g) ) / 100.0 ) ) );
 		}
-		if( b.contains( "%" ) )
+		if (b.contains( "%" ))
 		{
 			b.chop(1);
 			b = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(b) ) / 100.0 ) ) );
@@ -1311,7 +1311,7 @@
 	else
 	{
 		QString rgbColor = s.trimmed();
-		if( rgbColor.startsWith( "#" ) )
+		if (rgbColor.startsWith( "#" ))
 			c.setNamedColor( rgbColor );
 		else
 			c = parseColorN( rgbColor );

Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp	Fri Oct  5 20:35:20 2018
@@ -142,7 +142,7 @@
 		ScCore->primaryMainWindow()->mainWindowProgressBar->setValue(rec_num);
 		fseek( m_pdfp, PDB_HEADER_SIZE + PDB_RECORD_HEADER_SIZE * rec_num, SEEK_SET);
 		GET_DWord( m_pdfp, offset );
-		if( rec_num < num_records )
+		if (rec_num < num_records)
 		{
 			fseek( m_pdfp, PDB_HEADER_SIZE + PDB_RECORD_HEADER_SIZE * (rec_num + 1), SEEK_SET);
 			GET_DWord( m_pdfp, next_offset );

Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp	Fri Oct  5 20:35:20 2018
@@ -427,7 +427,7 @@
 	if (m_token != "$")
 		font = getFontName(m_token);
 	m_currentCharStyle.setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[font]);
-	if(!m_doc->UsedFonts.contains(font))
+	if (!m_doc->UsedFonts.contains(font))
 		m_doc->AddFont(font);
 }
 

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp	Fri Oct  5 20:35:20 2018
@@ -2832,7 +2832,7 @@
 				tmp = readLineFromDataStream(ts);
 				if (tmp.contains("EndRaster"))
 					break;
-				if(progressDialog)
+				if (progressDialog)
 				{
 					progressDialog->setProgress("GI", ts.device()->pos());
 					qApp->processEvents();
@@ -2930,7 +2930,7 @@
 				tmp = readLineFromDataStream(ts);
 				if (tmp.contains("EndRaster"))
 					break;
-				if(progressDialog)
+				if (progressDialog)
 				{
 					progressDialog->setProgress("GI", ts.device()->pos());
 					qApp->processEvents();
@@ -3143,7 +3143,7 @@
 				processSymbol(ts, false);
 			if (tmp.startsWith("End_NonPrinting"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3160,7 +3160,7 @@
 			if (tmp.startsWith("EndGradient"))
 				break;
 			processGradientData(tmp);
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3174,7 +3174,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndPalette"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3192,7 +3192,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndSymbol"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3206,7 +3206,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndDocumentData"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3227,7 +3227,7 @@
 			}
 		//	else
 		//		dataStringT += tmp.mid(1);
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3241,7 +3241,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("%%EndProlog"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3255,7 +3255,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("%%EndData"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3269,7 +3269,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("%%EndCrops"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3279,7 +3279,7 @@
 	else if (tmp.startsWith("BeginRaster"))
 	{
 		processRaster(ts);
-		if(progressDialog)
+		if (progressDialog)
 		{
 			progressDialog->setProgress("GI", ts.device()->pos());
 			qApp->processEvents();
@@ -3292,7 +3292,7 @@
 			tmp = readLineFromDataStream(ts);
 			if (tmp.contains("EndRaster"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3306,7 +3306,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndSVGFilter"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3320,7 +3320,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndArtStyles"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3334,7 +3334,7 @@
 			tmp = removeAIPrefix(readLineFromDataStream(ts));
 			if (tmp.startsWith("EndPluginObject"))
 				break;
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3355,7 +3355,7 @@
 			if (tmp.startsWith("EndLayer"))
 				break;
 			processData(rl);
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();
@@ -3442,7 +3442,7 @@
 	commandList << "P" << "R";							// unimplemented
 	commandList << "XI" << "XF" << "XG" << "XT" << "Z" << "`" << "~" << "_" << "@";	// unimplemented
 	commandList << "&" << "*w" << "*W" << "Ap" << "Ar";				// unimplemented
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -3465,7 +3465,7 @@
 				processComment(ts, tmp);
 			else
 				processData(tmp);
-			if(progressDialog)
+			if (progressDialog)
 			{
 				progressDialog->setProgress("GI", ts.device()->pos());
 				qApp->processEvents();

Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -122,7 +122,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importai");
@@ -229,7 +229,7 @@
 
 QImage ImportAIPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;
@@ -243,7 +243,7 @@
 
 bool ImportAIPlugin::readColors(const QString& fileName, ColorList &colors)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return false;
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdrplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -118,7 +118,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importcdr");
@@ -180,7 +180,7 @@
 
 QImage ImportCdrPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp	Fri Oct  5 20:35:20 2018
@@ -428,7 +428,7 @@
 	textScaleMode = 1;
 	currentRegion = 0;
 	pictName = "";
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -121,7 +121,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importcgm");
@@ -162,7 +162,7 @@
 
 QImage ImportCgmPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp	Fri Oct  5 20:35:20 2018
@@ -335,7 +335,7 @@
 	QList<PageItem*> gElements;
 	groupStack.push(gElements);
 	currentItemNr = 0;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -114,7 +114,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importcvg");
@@ -155,7 +155,7 @@
 
 QImage ImportCvgPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp	Fri Oct  5 20:35:20 2018
@@ -360,7 +360,7 @@
 	imageValid = false;
 	thumbRead = false;
 	currentItem = nullptr;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -122,7 +122,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importdrw");
@@ -163,7 +163,7 @@
 
 QImage ImportDrwPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp	Fri Oct  5 20:35:20 2018
@@ -1063,7 +1063,7 @@
 	emfStyleMap.insert(U_DC_PEN, sty);
 	emfStyleMapEMP.clear();
 	clipGroup = nullptr;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemfplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -119,7 +119,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importemf");
@@ -165,7 +165,7 @@
 
 QImage ImportEmfPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfhplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -116,7 +116,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importfh");
@@ -161,7 +161,7 @@
 
 QImage ImportFhPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp	Fri Oct  5 20:35:20 2018
@@ -124,7 +124,7 @@
 	}
 	if (!f.isEmpty())
 	{
-		if(!designMapDom.setContent(f))
+		if (!designMapDom.setContent(f))
 			return QImage();
 		bool found = false;
 		QDomElement docElem = designMapDom.documentElement();
@@ -236,7 +236,7 @@
 	}
 	if (!f.isEmpty())
 	{
-		if(designMapDom.setContent(f))
+		if (designMapDom.setContent(f))
 		{
 			QDomElement docElem = designMapDom.documentElement();
 			if (ext == "idms")
@@ -501,7 +501,7 @@
 	styleTranslate.clear();
 	charStyleTranslate.clear();
 	ObjectStyles.clear();
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -530,7 +530,7 @@
 	}
 	if (!f.isEmpty())
 	{
-		if(designMapDom.setContent(f))
+		if (designMapDom.setContent(f))
 		{
 			QDomElement docElem = designMapDom.documentElement();
 			QString activeLayer = docElem.attribute("ActiveLayer");
@@ -694,7 +694,7 @@
 	{
 		QByteArray f2;
 		fun->read(grElem.attribute("src"), f2);
-		if(grMapDom.setContent(f2))
+		if (grMapDom.setContent(f2))
 			grNode = grMapDom.documentElement();
 		else
 			return false;
@@ -742,7 +742,7 @@
 	{
 		QByteArray f2;
 		fun->read(grElem.attribute("src"), f2);
-		if(grMapDom.setContent(f2))
+		if (grMapDom.setContent(f2))
 			grNode = grMapDom.documentElement();
 		else
 			return false;
@@ -881,7 +881,7 @@
 	{
 		QByteArray f2;
 		fun->read(sElem.attribute("src"), f2);
-		if(sMapDom.setContent(f2))
+		if (sMapDom.setContent(f2))
 			sNode = sMapDom.documentElement();
 		else
 			return false;
@@ -1303,7 +1303,7 @@
 	{
 		QByteArray f2;
 		fun->read(prElem.attribute("src"), f2);
-		if(prMapDom.setContent(f2))
+		if (prMapDom.setContent(f2))
 			prNode = prMapDom.documentElement();
 		else
 			return false;
@@ -1515,7 +1515,7 @@
 	{
 		QByteArray f2;
 		fun->read(spElem.attribute("src"), f2);
-		if(spMapDom.setContent(f2))
+		if (spMapDom.setContent(f2))
 			spNode = spMapDom.documentElement();
 		else
 			return false;
@@ -2710,7 +2710,7 @@
 	{
 		QByteArray f2;
 		fun->read(stElem.attribute("src"), f2);
-		if(stMapDom.setContent(f2))
+		if (stMapDom.setContent(f2))
 			stNode = stMapDom.documentElement();
 		else
 			return false;

Modified: trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidmlplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -139,7 +139,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importidml");
@@ -180,7 +180,7 @@
 
 QImage ImportIdmlPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;
@@ -194,7 +194,7 @@
 
 bool ImportIdmlPlugin::readColors(const QString& fileName, ColorList &colors)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return false;
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp	Fri Oct  5 20:35:20 2018
@@ -110,7 +110,7 @@
 			{
 				QDomDocument designMapDom;
 				QByteArray f;
-				if(designMapDom.setContent(f))
+				if (designMapDom.setContent(f))
 				{
 					QDomElement docElem = designMapDom.documentElement();
 					for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
@@ -336,7 +336,7 @@
 	m_Styles.clear();
 	m_Layers.clear();
 	firstLayer = true;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -963,7 +963,7 @@
 						{
 							double erg = 0;
 							int ret = fpa.Parse(itf.value().toStdString(), "", false);
-							if(ret < 0)
+							if (ret < 0)
 							{
 								QString formNam = itf.key();
 								erg = fpa.Eval(nullptr);
@@ -1924,15 +1924,15 @@
 		subtransform[1] = subtransform[1].simplified();
 		QRegExp reg("[,( ]");
 		QStringList params = subtransform[1].split(reg, QString::SkipEmptyParts);
-		if(subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
+		if (subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
 			subtransform[0] = subtransform[0].right(subtransform[0].length() - 1);
-		if(subtransform[0] == "rotate")
+		if (subtransform[0] == "rotate")
 		{
 			*rotation = -parseUnit(params[0]) * 180 / M_PI;
 		}
-		else if(subtransform[0] == "translate")
-		{
-			if(params.count() == 2)
+		else if (subtransform[0] == "translate")
+		{
+			if (params.count() == 2)
 			{
 				dx = parseUnit(params[0]);
 				dy = parseUnit(params[1]);
@@ -1962,17 +1962,17 @@
 		subtransform[1] = subtransform[1].simplified();
 		QRegExp reg("[,( ]");
 		QStringList params = subtransform[1].split(reg, QString::SkipEmptyParts);
-		if(subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
+		if (subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
 			subtransform[0] = subtransform[0].right(subtransform[0].length() - 1);
-		if(subtransform[0] == "rotate")
+		if (subtransform[0] == "rotate")
 		{
 			result = QTransform();
 			result.rotate(-parseUnit(params[0]) * 180 / M_PI);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "translate")
-		{
-			if(params.count() == 2)
+		else if (subtransform[0] == "translate")
+		{
+			if (params.count() == 2)
 			{
 				dx = parseUnit(params[0]);
 				dy = parseUnit(params[1]);
@@ -1986,13 +1986,13 @@
 			result.translate(dx, dy);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "skewx")
+		else if (subtransform[0] == "skewx")
 		{
 			result = QTransform();
 			result.shear(-tan(ScCLocale::toDoubleC(params[0])), 0.0);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "skewy")
+		else if (subtransform[0] == "skewy")
 		{
 			result = QTransform();
 			result.shear(0.0, -tan(ScCLocale::toDoubleC(params[0])));
@@ -2003,7 +2003,7 @@
 
 void OdgPlug::parseViewBox( const QDomElement& object, double *x, double *y, double *w, double *h )
 {
-	if( !object.attribute( "svg:viewBox" ).isEmpty() )
+	if (!object.attribute( "svg:viewBox" ).isEmpty())
 	{
 		QString viewbox( object.attribute( "svg:viewBox" ) );
 		QStringList points = viewbox.replace( QRegExp(","), " ").simplified().split( ' ', QString::SkipEmptyParts );
@@ -2770,30 +2770,30 @@
 	QString unitval=unit;
 	if (unit.isEmpty())
 		return 0.0;
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt")
 		unitval.replace( "pt", "" );
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		unitval.replace( "cm", "" );
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		unitval.replace( "mm" , "" );
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		unitval.replace( "in", "" );
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		unitval.replace( "px", "" );
-	else if( unit.right( 1 ) == "%" )
+	else if (unit.right( 1 ) == "%")
 		unitval.replace( "%", "" );
 	double value = ScCLocale::toDoubleC(unitval);
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt")
 		{}/* value = value; */ //no change
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		value = ( value / 2.54 ) * 72;
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		value = ( value / 25.4 ) * 72;
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		value = value * 72;
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		{}/* value = value; */ //no change
-	else if( unit.right( 1 ) == "%" )
+	else if (unit.right( 1 ) == "%")
 		value = value / 100.0;
 	return value;
 }
@@ -2812,9 +2812,9 @@
 	expsign = 1;
 
 	// read the sign
-	if(*ptr == '+')
+	if (*ptr == '+')
 		ptr++;
-	else if(*ptr == '-')
+	else if (*ptr == '-')
 	{
 		ptr++;
 		sign = -1;
@@ -2823,21 +2823,21 @@
 	// read the integer part
 	while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		integer = (integer * 10) + *(ptr++) - '0';
-	if(*ptr == '.') // read the decimals
+	if (*ptr == '.') // read the decimals
 	{
 		ptr++;
 		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
-	if(*ptr == 'e' || *ptr == 'E') // read the exponent part
+	if (*ptr == 'e' || *ptr == 'E') // read the exponent part
 	{
 		ptr++;
 
 		// read the sign of the exponent
-		if(*ptr == '+')
+		if (*ptr == '+')
 			ptr++;
-		else if(*ptr == '-')
+		else if (*ptr == '-')
 		{
 			ptr++;
 			expsign = -1;
@@ -2855,7 +2855,7 @@
 	number *= sign * pow( static_cast<double>(10), static_cast<double>( expsign * exponent ) );
 
 	// skip the following space
-	if(*ptr == ' ')
+	if (*ptr == ' ')
 		ptr++;
 
 	return ptr;
@@ -2868,7 +2868,7 @@
 	bool ret = false;
 	fill = true;
 	stroke = true;
-	if( !d.isEmpty() )
+	if (!d.isEmpty())
 	{
 		bool xDir = true;
 		bool yDir = false;
@@ -2883,11 +2883,11 @@
 		int moveCount = 0;
 		result.svgInit();
 		char command = *(ptr++), lastCommand = ' ';
-		while( ptr < end )
-		{
-			if( *ptr == ' ' )
+		while (ptr < end)
+		{
+			if (*ptr == ' ')
 				ptr++;
-			switch( command )
+			switch (command)
 			{
 			case 'A':
 			case 'B':
@@ -3038,10 +3038,10 @@
 				}
 			}
 			lastCommand = command;
-			if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
+			if (*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
 			{
 				// there are still coords in this command
-				if(command == 'M')
+				if (command == 'M')
 					command = 'L';
 			}
 			else
@@ -3240,24 +3240,24 @@
 	QString ret = CommonStrings::None;
 	if ((s == "") || s.isEmpty())
 		return ret;
-	if( s.startsWith( "rgb(" ) )
+	if (s.startsWith( "rgb(" ))
 	{
 		QString parse = s.trimmed();
 		QStringList colors = parse.split( ',', QString::SkipEmptyParts );
 		QString r = colors[0].right( ( colors[0].length() - 4 ) );
 		QString g = colors[1];
 		QString b = colors[2].left( ( colors[2].length() - 1 ) );
-		if( r.contains( "%" ) )
+		if (r.contains( "%" ))
 		{
 			r.chop(1);
 			r = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(r) ) / 100.0 ) ) );
 		}
-		if( g.contains( "%" ) )
+		if (g.contains( "%" ))
 		{
 			g.chop(1);
 			g = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(g) ) / 100.0 ) ) );
 		}
-		if( b.contains( "%" ) )
+		if (b.contains( "%" ))
 		{
 			b.chop(1);
 			b = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(b) ) / 100.0 ) ) );
@@ -3267,7 +3267,7 @@
 	else
 	{
 		QString rgbColor = s.trimmed();
-		if( rgbColor.startsWith( "#" ) )
+		if (rgbColor.startsWith( "#" ))
 			c.setNamedColor( rgbColor );
 		else
 			c = parseColorN( rgbColor );

Modified: trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodgplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -138,7 +138,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importodg");
@@ -179,7 +179,7 @@
 
 QImage ImportOdgPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Fri Oct  5 20:35:20 2018
@@ -211,7 +211,7 @@
 
 QImage OODrawImportPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;
@@ -234,10 +234,10 @@
 	tmpSel=new Selection(this, false);
 }
 
-QImage OODPlug::readThumbnail(const QString& fileName )
+QImage OODPlug::readThumbnail(const QString& fileName)
 {
 	QByteArray f, f2, f3;
-	if ( !QFile::exists(fileName) )
+	if (!QFile::exists(fileName))
 		return QImage();
 	ScZipHandler* fun = new ScZipHandler();
 	if (!fun->open(fileName))
@@ -259,9 +259,9 @@
 		return QImage();
 	if (f2.isEmpty())
 		return QImage();
-	if(!inpStyles.setContent(f))
+	if (!inpStyles.setContent(f))
 		return QImage();
-	if(!inpContents.setContent(f2))
+	if (!inpContents.setContent(f2))
 		return QImage();
 	QString CurDirP = QDir::currentPath();
 	QFileInfo efp(fileName);
@@ -272,11 +272,11 @@
 	createStyleMap( inpStyles );
 	QDomElement docElem = inpContents.documentElement();
 	QDomNode automaticStyles = docElem.namedItem( "office:automatic-styles" );
-	if( !automaticStyles.isNull() )
+	if (!automaticStyles.isNull())
 		insertStyles( automaticStyles.toElement() );
 	QDomNode body = docElem.namedItem( "office:body" );
 	QDomNode drawPage = body.namedItem( "draw:page" );
-	if ( drawPage.isNull() )
+	if (drawPage.isNull())
 	{
 		QDomNode offDraw = body.namedItem( "office:drawing" );
 		drawPage = offDraw.namedItem( "draw:page" );
@@ -352,12 +352,12 @@
 	return tmpImage;
 }
 
-bool OODPlug::import(const QString& fileName, const TransactionSettings& trSettings, int flags )
+bool OODPlug::import(const QString& fileName, const TransactionSettings& trSettings, int flags)
 {
 	bool importDone = false;
 	interactive = (flags & LoadSavePlugin::lfInteractive);
 	QByteArray f, f2, f3;
-	if ( !QFile::exists(fileName) )
+	if (!QFile::exists(fileName))
 		return false;
 	ScZipHandler* fun = new ScZipHandler();
 	if (!fun->open(fileName))
@@ -379,9 +379,9 @@
 		return false;
 	if (f2.isEmpty())
 		return false;
-	if(!inpStyles.setContent(f))
+	if (!inpStyles.setContent(f))
 		return false;
-	if(!inpContents.setContent(f2))
+	if (!inpContents.setContent(f2))
 		return false;
 	QString CurDirP = QDir::currentPath();
 	QFileInfo efp(fileName);
@@ -401,11 +401,11 @@
 	createStyleMap( inpStyles );
 	QDomElement docElem = inpContents.documentElement();
 	QDomNode automaticStyles = docElem.namedItem( "office:automatic-styles" );
-	if( !automaticStyles.isNull() )
+	if (!automaticStyles.isNull() )
 		insertStyles( automaticStyles.toElement() );
 	QDomNode body = docElem.namedItem( "office:body" );
 	QDomNode drawPage = body.namedItem( "draw:page" );
-	if ( drawPage.isNull() )
+	if (drawPage.isNull())
 	{
 		QDomNode offDraw = body.namedItem( "office:drawing" );
 		drawPage = offDraw.namedItem( "draw:page" );
@@ -482,7 +482,7 @@
 		if (!mpg.isNull())
 		{
 			QString Keys = "";
-			for( QDomNode n = mpg.firstChild(); !n.isNull(); n = n.nextSibling() )
+			for (QDomNode n = mpg.firstChild(); !n.isNull(); n = n.nextSibling())
 			{
 				Keys += n.toElement().text()+", ";
 			}
@@ -501,7 +501,7 @@
 	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
 	if (!m_Doc->PageColors.contains("Black"))
 		m_Doc->PageColors.insert("Black", ScColor(0, 0, 0, 255));
-	for( QDomNode drawPag = drawPagePNode.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+	for (QDomNode drawPag = drawPagePNode.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
 	{
 		QDomElement dpg = drawPag.toElement();
 		if (!interactive)
@@ -612,7 +612,7 @@
 	for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		QDomElement b = n.toElement();
-		if( b.isNull() )
+		if (b.isNull() )
 			continue;
 		QList<PageItem*> el = parseElement(b);
 		for (int ec = 0; ec < el.count(); ++ec)
@@ -629,7 +629,7 @@
 	{
 		PageItem *neu = m_Doc->groupObjectsList(cElements);
 		elements.append(neu);
-		if( !e.attribute("id").isEmpty() )
+		if (!e.attribute("id").isEmpty() )
 			neu->setItemName(e.attribute("id"));
 		else
 			neu->setItemName( tr("Group%1").arg(m_Doc->GroupCounter));
@@ -641,28 +641,28 @@
 {
 	QList<PageItem*> GElements;
 	QString STag = e.tagName();
-	if ( STag == "draw:g" )
+	if (STag == "draw:g")
 	{
 		GElements = parseGroup(e);
 		return GElements;
 	}
-	if ( STag == "draw:rect" )
+	if (STag == "draw:rect")
 		GElements = parseRect(e);
-	else if ( STag == "draw:circle" || STag == "draw:ellipse" )
+	else if (STag == "draw:circle" || STag == "draw:ellipse")
 		GElements = parseEllipse(e);
-	else if ( STag == "draw:line" )
+	else if (STag == "draw:line")
 		GElements = parseLine(e);
-	else if ( STag == "draw:polygon" )
+	else if (STag == "draw:polygon")
 		GElements = parsePolygon(e);
-	else if ( STag == "draw:polyline" )
+	else if (STag == "draw:polyline")
 		GElements = parsePolyline(e);
-	else if( STag == "draw:path" )
+	else if (STag == "draw:path")
 		GElements = parsePath(e);
-	else if ( STag == "draw:text-box" )
+	else if (STag == "draw:text-box")
 		GElements = parseTextBox(e);
-	else if ( STag == "draw:frame" )
+	else if (STag == "draw:frame")
 		GElements = parseFrame(e);
-	else if ( STag == "draw:connector" )
+	else if (STag == "draw:connector")
 		GElements = parseConnector(e);
 	else
 	{
@@ -892,7 +892,7 @@
 	parseStyle(oostyle, e);
 	QDomNode n = e.firstChild();
 	QString STag2 = n.toElement().tagName();
-	if ( STag2 == "draw:text-box" )
+	if (STag2 == "draw:text-box")
 	{
 		int z = m_Doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, BaseX+x, BaseY+y, w, h+(h*0.1), oostyle.strokeWidth, CommonStrings::None, oostyle.strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -927,34 +927,34 @@
 {
 	oostyle.haveGradient = false;
 	oostyle.gradient.clearStops();
-	if( m_styleStack.hasAttribute("draw:stroke") )
-	{
-		if( m_styleStack.attribute( "draw:stroke" ) == "none" )
+	if (m_styleStack.hasAttribute("draw:stroke") )
+	{
+		if (m_styleStack.attribute( "draw:stroke" ) == "none" )
 			oostyle.strokeWidth = 0.0;
 		else
 		{
-			if( m_styleStack.hasAttribute("svg:stroke-width"))
+			if (m_styleStack.hasAttribute("svg:stroke-width"))
 			{
 				oostyle.strokeWidth = parseUnit(m_styleStack.attribute("svg:stroke-width"));
 				if (oostyle.strokeWidth == 0)
 					oostyle.strokeWidth = 1;
 			}
-			if( m_styleStack.hasAttribute("svg:stroke-color"))
+			if (m_styleStack.hasAttribute("svg:stroke-color"))
 				oostyle.strokeColor = parseColor(m_styleStack.attribute("svg:stroke-color"));
-			if( m_styleStack.hasAttribute( "svg:stroke-opacity" ) )
+			if (m_styleStack.hasAttribute( "svg:stroke-opacity" ) )
 				oostyle.strokeTrans = 1.0 - ScCLocale::toDoubleC(m_styleStack.attribute( "svg:stroke-opacity" ).remove( '%' )) / 100.0;
-			if( m_styleStack.attribute( "draw:stroke" ) == "dash" )
+			if (m_styleStack.attribute( "draw:stroke" ) == "dash" )
 			{
 				QString style = m_styleStack.attribute( "draw:stroke-dash" );
-				if( style == "Ultrafine Dashed")
+				if (style == "Ultrafine Dashed")
 					oostyle.dashes << 1.4 << 1.4;
-				else if( style == "Fine Dashed" )
+				else if (style == "Fine Dashed" )
 					oostyle.dashes << 14.4 << 14.4;
-				else if( style == "Fine Dotted")
+				else if (style == "Fine Dotted")
 					oostyle.dashes << 13 << 13;
-				else if( style == "Ultrafine 2 Dots 3 Dashes")
+				else if (style == "Ultrafine 2 Dots 3 Dashes")
 					oostyle.dashes << 1.45 << 3.6 << 1.45 << 3.6 << 7.2 << 3.6 << 7.2 << 3.6 << 7.2 << 3.6;
-				else if( style == "Line with Fine Dots")
+				else if (style == "Line with Fine Dots")
 				{
 					oostyle.dashes << 56.9 << 4.31;
 					for (int dd = 0; dd < 10; ++ dd)
@@ -962,22 +962,22 @@
 						oostyle.dashes << 8.6 << 4.31;
 					}
 				}
-				else if( style == "2 Dots 1 Dash" )
+				else if (style == "2 Dots 1 Dash" )
 					oostyle.dashes << 2.8 << 5.75 << 2.8 << 5.75 << 5.75 << 5.75;
 			}
 		}
 	}
-	if( m_styleStack.hasAttribute( "draw:fill" ) )
+	if (m_styleStack.hasAttribute( "draw:fill" ) )
 	{
 		QString fill = m_styleStack.attribute( "draw:fill" );
-		if( fill == "solid" )
-		{
-			if( m_styleStack.hasAttribute( "draw:fill-color" ) )
+		if (fill == "solid" )
+		{
+			if (m_styleStack.hasAttribute( "draw:fill-color" ) )
 				oostyle.fillColor = parseColor( m_styleStack.attribute("draw:fill-color"));
-			if( m_styleStack.hasAttribute( "draw:transparency" ) )
+			if (m_styleStack.hasAttribute( "draw:transparency" ) )
 				oostyle.fillTrans = 1.0 - ScCLocale::toDoubleC(m_styleStack.attribute( "draw:transparency" ).remove( '%' )) / 100.0;
 		}
-		else if( fill == "gradient" )
+		else if (fill == "gradient" )
 		{
 			oostyle.haveGradient = true;
 			oostyle.gradientAngle = 0;
@@ -985,31 +985,31 @@
 			oostyle.gradient.setRepeatMethod( VGradient::none );
 			QString style = m_styleStack.attribute( "draw:fill-gradient-name" );
 			QDomElement* draw = m_draws[style];
-			if( draw )
+			if (draw )
 			{
 				double border = 0.0;
 				int shadeS = 100;
 				int shadeE = 100;
-				if( draw->hasAttribute( "draw:border" ) )
+				if (draw->hasAttribute( "draw:border" ) )
 					border += ScCLocale::toDoubleC(draw->attribute( "draw:border" ).remove( '%' )) / 100.0;
-				if( draw->hasAttribute( "draw:start-intensity" ) )
+				if (draw->hasAttribute( "draw:start-intensity" ) )
 					shadeS = draw->attribute( "draw:start-intensity" ).remove( '%' ).toInt();
-				if( draw->hasAttribute( "draw:end-intensity" ) )
+				if (draw->hasAttribute( "draw:end-intensity" ) )
 					shadeE = draw->attribute( "draw:end-intensity" ).remove( '%' ).toInt();
 				QString type = draw->attribute( "draw:style" );
-				if( type == "linear" || type == "axial" )
+				if (type == "linear" || type == "axial" )
 				{
 					oostyle.gradient.setType( VGradient::linear );
 					oostyle.gradientAngle = ScCLocale::toDoubleC(draw->attribute( "draw:angle" )) / 10;
 					oostyle.gradientType = 1;
 				}
-				else if( type == "radial" || type == "ellipsoid" )
-				{
-					if( draw->hasAttribute( "draw:cx" ) )
+				else if (type == "radial" || type == "ellipsoid" )
+				{
+					if (draw->hasAttribute( "draw:cx" ) )
 						oostyle.gradientPointX = ScCLocale::toDoubleC(draw->attribute( "draw:cx" ).remove( '%' )) / 100.0;
 					else
 						oostyle.gradientPointX = 0.5;
-					if( draw->hasAttribute( "draw:cy" ) )
+					if (draw->hasAttribute( "draw:cy" ) )
 						oostyle.gradientPointY = ScCLocale::toDoubleC(draw->attribute( "draw:cy" ).remove( '%' )) / 100.0;
 					else
 						oostyle.gradientPointY = 0.5;
@@ -1039,7 +1039,7 @@
 
 void OODPlug::parseCharStyle(CharStyle& style, const QDomElement &e)
 {
-	if ( m_styleStack.hasAttribute("fo:font-size") )
+	if (m_styleStack.hasAttribute("fo:font-size"))
 	{
 		QString fs = m_styleStack.attribute("fo:font-size").remove( "pt" );
 		int FontSize = (int) (ScCLocale::toFloatC(fs) * 10.0);
@@ -1049,7 +1049,7 @@
 
 void OODPlug::parseParagraphStyle(ParagraphStyle& style, const QDomElement &e)
 {
-	if ( m_styleStack.hasAttribute("fo:text-align") )
+	if (m_styleStack.hasAttribute("fo:text-align"))
 	{
 		QString attValue = m_styleStack.attribute("fo:text-align");
 		if (attValue == "left")
@@ -1059,7 +1059,7 @@
 		if (attValue == "right")
 			style.setAlignment(ParagraphStyle::Rightaligned);
 	}
-	if ( m_styleStack.hasAttribute("fo:font-size") )
+	if (m_styleStack.hasAttribute("fo:font-size"))
 	{
 		QString fs = m_styleStack.attribute("fo:font-size").remove( "pt" );
 		int FontSize = (int) (ScCLocale::toFloatC(fs) * 10.0);
@@ -1072,10 +1072,10 @@
 {
 	for ( QDomNode n = elm.firstChild(); !n.isNull(); n = n.nextSibling() )
 	{
-		if ( !n.hasAttributes() && !n.hasChildNodes() )
+		if (!n.hasAttributes() && !n.hasChildNodes())
 			continue;
 		QDomElement e = n.toElement();
-		if ( e.text().isEmpty() )
+		if (e.text().isEmpty())
 			continue;
 		storeObjectStyles(e);
 		item->itemText.insertChars(-1, SpecialChars::PARSEP);
@@ -1104,14 +1104,14 @@
 		if (chars.isEmpty())
 			continue;
 		int pos = item->itemText.length();
-		if ( firstSpan && (m_styleStack.hasAttribute("fo:text-align") || m_styleStack.hasAttribute("fo:font-size")) )
+		if (firstSpan && (m_styleStack.hasAttribute("fo:text-align") || m_styleStack.hasAttribute("fo:font-size")))
 		{
 			ParagraphStyle newStyle;
 			parseParagraphStyle(newStyle, n.isElement() ? e : elm);
 			item->itemText.applyStyle(-1, newStyle);
 		}
 		item->itemText.insertChars( -2, chars);
-		if ( !firstSpan && m_styleStack.hasAttribute("fo:font-size") )
+		if (!firstSpan && m_styleStack.hasAttribute("fo:font-size"))
 		{
 			CharStyle newStyle;
 			parseCharStyle(newStyle, n.isElement() ? e : elm);
@@ -1254,76 +1254,76 @@
 	return item;
 }
 
-void OODPlug::createStyleMap( QDomDocument &docstyles )
+void OODPlug::createStyleMap( QDomDocument &docstyles)
 {
 	QDomElement styles = docstyles.documentElement();
-	if( styles.isNull() )
+	if (styles.isNull())
 		return;
 
 	QDomNode fixedStyles = styles.namedItem( "office:styles" );
-	if( !fixedStyles.isNull() )
+	if (!fixedStyles.isNull())
 	{
 		insertDraws( fixedStyles.toElement() );
 		insertStyles( fixedStyles.toElement() );
 	}
 	QDomNode automaticStyles = styles.namedItem( "office:automatic-styles" );
-	if( !automaticStyles.isNull() )
+	if (!automaticStyles.isNull())
 		insertStyles( automaticStyles.toElement() );
 
 	QDomNode masterStyles = styles.namedItem( "office:master-styles" );
-	if( !masterStyles.isNull() )
+	if (!masterStyles.isNull())
 		insertStyles( masterStyles.toElement() );
 }
 
-void OODPlug::insertDraws( const QDomElement& styles )
-{
-	for( QDomNode n = styles.firstChild(); !n.isNull(); n = n.nextSibling() )
+void OODPlug::insertDraws(const QDomElement& styles)
+{
+	for (QDomNode n = styles.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		QDomElement e = n.toElement();
-		if( !e.hasAttribute( "draw:name" ) )
+		if (!e.hasAttribute( "draw:name" ))
 			continue;
 		QString name = e.attribute( "draw:name" );
-		m_draws.insert( name, new QDomElement( e ) );
+		m_draws.insert(name, new QDomElement(e) );
 	}
 }
 
 void OODPlug::insertStyles( const QDomElement& styles )
 {
-	for ( QDomNode n = styles.firstChild(); !n.isNull(); n = n.nextSibling() )
+	for (QDomNode n = styles.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		QDomElement e = n.toElement();
-		if( !e.hasAttribute( "style:name" ) )
+		if (!e.hasAttribute( "style:name" ))
 			continue;
 		QString name = e.attribute( "style:name" );
-		m_styles.insert( name, new QDomElement( e ) );
+		m_styles.insert(name, new QDomElement(e));
 	}
 }
 
 void OODPlug::fillStyleStack( const QDomElement& object )
 {
-	if( object.hasAttribute( "presentation:style-name" ) )
+	if (object.hasAttribute( "presentation:style-name" ))
 		addStyles( m_styles.value(object.attribute( "presentation:style-name" ), nullptr) );
-	if( object.hasAttribute( "draw:style-name" ) )
+	if (object.hasAttribute( "draw:style-name" ))
 		addStyles( m_styles.value(object.attribute( "draw:style-name" ), nullptr) );
-	if( object.hasAttribute( "draw:text-style-name" ) )
+	if (object.hasAttribute( "draw:text-style-name" ))
 		addStyles( m_styles.value(object.attribute( "draw:text-style-name" ), nullptr) );
-	if( object.hasAttribute( "text:style-name" ) )
+	if (object.hasAttribute( "text:style-name" ))
 		addStyles( m_styles.value(object.attribute( "text:style-name" ), nullptr) );
 }
 
-void OODPlug::addStyles( const QDomElement* style )
+void OODPlug::addStyles(const QDomElement* style)
 {
 	if (style)
 	{
-		if( style->hasAttribute( "style:parent-style-name" ) )
-			addStyles( m_styles.value(style->attribute( "style:parent-style-name" ), nullptr) );
-		m_styleStack.push( *style );
-	}
-}
-
-void OODPlug::storeObjectStyles( const QDomElement& object )
-{
-	fillStyleStack( object );
+		if (style->hasAttribute( "style:parent-style-name" ))
+			addStyles(m_styles.value(style->attribute( "style:parent-style-name" ), nullptr));
+		m_styleStack.push(*style);
+	}
+}
+
+void OODPlug::storeObjectStyles(const QDomElement& object)
+{
+	fillStyleStack(object);
 }
 
 double OODPlug::parseUnit(const QString &unit)
@@ -1331,26 +1331,26 @@
 	QString unitval=unit;
 	if (unit.isEmpty())
 		return 0.0;
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt")
 		unitval.replace( "pt", "" );
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		unitval.replace( "cm", "" );
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		unitval.replace( "mm" , "" );
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		unitval.replace( "in", "" );
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		unitval.replace( "px", "" );
 	double value = ScCLocale::toDoubleC(unitval);
-	if( unit.right( 2 ) == "pt" )
+	if (unit.right( 2 ) == "pt")
 		{}/* value = value; */ // no change
-	else if( unit.right( 2 ) == "cm" )
+	else if (unit.right( 2 ) == "cm")
 		value = ( value / 2.54 ) * 72;
-	else if( unit.right( 2 ) == "mm" )
+	else if (unit.right( 2 ) == "mm")
 		value = ( value / 25.4 ) * 72;
-	else if( unit.right( 2 ) == "in" )
+	else if (unit.right( 2 ) == "in")
 		value = value * 72;
-	else if( unit.right( 2 ) == "px" )
+	else if (unit.right( 2 ) == "px")
 		{}/* value = value; */ // no change
 	return value;
 }
@@ -1366,24 +1366,24 @@
 {
 	QColor c;
 	QString ret = CommonStrings::None;
-	if( s.startsWith( "rgb(" ) )
+	if (s.startsWith( "rgb(" ))
 	{
 		QString parse = s.trimmed();
 		QStringList colors = parse.split( ',', QString::SkipEmptyParts );
 		QString r = colors[0].right( ( colors[0].length() - 4 ) );
 		QString g = colors[1];
 		QString b = colors[2].left( ( colors[2].length() - 1 ) );
-		if( r.contains( "%" ) )
+		if (r.contains( "%" ))
 		{
 			r.chop(1);
 			r = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(r) ) / 100.0 ) ) );
 		}
-		if( g.contains( "%" ) )
+		if (g.contains( "%" ))
 		{
 			g.chop(1);
 			g = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(g) ) / 100.0 ) ) );
 		}
-		if( b.contains( "%" ) )
+		if (b.contains( "%" ) )
 		{
 			b.chop(1);
 			b = QString::number( static_cast<int>( ( static_cast<double>( 255 * ScCLocale::toDoubleC(b) ) / 100.0 ) ) );
@@ -1393,10 +1393,10 @@
 	else
 	{
 		QString rgbColor = s.trimmed();
-		if( rgbColor.startsWith( "#" ) )
-			c.setNamedColor( rgbColor );
+		if (rgbColor.startsWith( "#" ))
+			c.setNamedColor(rgbColor);
 		else
-			c = parseColorN( rgbColor );
+			c = parseColorN(rgbColor);
 	}
 	ScColor tmp;
 	tmp.fromQColor(c);
@@ -1423,17 +1423,17 @@
 		subtransform[1] = subtransform[1].simplified();
 		QRegExp reg("[,( ]");
 		QStringList params = subtransform[1].split(reg, QString::SkipEmptyParts);
-		if(subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
+		if (subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
 			subtransform[0] = subtransform[0].right(subtransform[0].length() - 1);
-		if(subtransform[0] == "rotate")
+		if (subtransform[0] == "rotate")
 		{
 			result = QTransform();
 			result.rotate(-parseUnit(params[0]) * 180 / M_PI);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "translate")
-		{
-			if(params.count() == 2)
+		else if (subtransform[0] == "translate")
+		{
+			if (params.count() == 2)
 			{
 				dx = parseUnit(params[0]);
 				dy = parseUnit(params[1]);
@@ -1447,13 +1447,13 @@
 			result.translate(dx, dy);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "skewx")
+		else if (subtransform[0] == "skewx")
 		{
 			result = QTransform();
 			result.shear(-tan(ScCLocale::toDoubleC(params[0])), 0.0);
 			composite->map(result);
 		}
-		else if(subtransform[0] == "skewy")
+		else if (subtransform[0] == "skewy")
 		{
 			result = QTransform();
 			result.shear(0.0, -tan(ScCLocale::toDoubleC(params[0])));
@@ -1462,12 +1462,12 @@
 	}
 }
 
-void OODPlug::parseViewBox( const QDomElement& object, double *x, double *y, double *w, double *h )
-{
-	if( !object.attribute( "svg:viewBox" ).isEmpty() )
+void OODPlug::parseViewBox(const QDomElement& object, double *x, double *y, double *w, double *h)
+{
+	if (!object.attribute( "svg:viewBox" ).isEmpty())
 	{
 		QString viewbox( object.attribute( "svg:viewBox" ) );
-		QStringList points = viewbox.replace( QRegExp(","), " ").simplified().split( ' ', QString::SkipEmptyParts );
+		QStringList points = viewbox.replace( QRegExp(","), " ").simplified().split(' ', QString::SkipEmptyParts);
 		*x = ScCLocale::toDoubleC(points[0]);
 		*y = ScCLocale::toDoubleC(points[1]);
 		*w = ScCLocale::toDoubleC(points[2]);
@@ -1491,7 +1491,7 @@
 	QStringList ptList = object.attribute( "draw:points" ).split( ' ', QString::SkipEmptyParts );
 	FPoint point, firstP;
 	bool bFirst = true;
-	for( QStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it )
+	for (QStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it)
 	{
 		point = FPoint(ScCLocale::toDoubleC((*it).section( ',', 0, 0 )), ScCLocale::toDoubleC((*it).section( ',', 1, 1 )));
 		if (bFirst)
@@ -1534,39 +1534,39 @@
 	expsign = 1;
 
 	// read the sign
-	if(*ptr == '+')
+	if (*ptr == '+')
 		ptr++;
-	else if(*ptr == '-')
+	else if (*ptr == '-')
 	{
 		ptr++;
 		sign = -1;
 	}
 
 	// read the integer part
-	while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+	while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		integer = (integer * 10) + *(ptr++) - '0';
-	if(*ptr == '.') // read the decimals
+	if (*ptr == '.') // read the decimals
 	{
 		ptr++;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
-	if(*ptr == 'e' || *ptr == 'E') // read the exponent part
+	if (*ptr == 'e' || *ptr == 'E') // read the exponent part
 	{
 		ptr++;
 
 		// read the sign of the exponent
-		if(*ptr == '+')
+		if (*ptr == '+')
 			ptr++;
-		else if(*ptr == '-')
+		else if (*ptr == '-')
 		{
 			ptr++;
 			expsign = -1;
 		}
 
 		exponent = 0;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		{
 			exponent *= 10;
 			exponent += *ptr - '0';
@@ -1577,18 +1577,18 @@
 	number *= sign * pow( static_cast<double>(10), static_cast<double>( expsign * exponent ) );
 
 	// skip the following space
-	if(*ptr == ' ')
+	if (*ptr == ' ')
 		ptr++;
 
 	return ptr;
 }
 
-bool OODPlug::parseSVG( const QString &s, FPointArray *ite )
+bool OODPlug::parseSVG(const QString &s, FPointArray *ite)
 {
 	QString d = s;
 	d = d.replace( QRegExp( "," ), " ");
 	bool ret = false;
-	if( !d.isEmpty() )
+	if (!d.isEmpty())
 	{
 		d = d.simplified();
 		QByteArray data = d.toLatin1();
@@ -1600,12 +1600,12 @@
 		FirstM = true;
 		char command = *(ptr++), lastCommand = ' ';
 		curx = cury = contrlx = contrly = 0.0;
-		while( ptr < end )
-		{
-			if( *ptr == ' ' )
+		while (ptr < end)
+		{
+			if (*ptr == ' ')
 				ptr++;
 			relative = false;
-			switch( command )
+			switch (command)
 			{
 			case 'm':
 				relative = true;
@@ -1769,18 +1769,18 @@
 				}
 			}
 			lastCommand = command;
-			if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
+			if (*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
 			{
 				// there are still coords in this command
-				if(command == 'M')
+				if (command == 'M')
 					command = 'L';
-				else if(command == 'm')
+				else if (command == 'm')
 					command = 'l';
 			}
 			else
 				command = *(ptr++);
 
-			if( lastCommand != 'C' && lastCommand != 'c' &&
+			if (lastCommand != 'C' && lastCommand != 'c' &&
 			        lastCommand != 'S' && lastCommand != 's' &&
 			        lastCommand != 'Q' && lastCommand != 'q' &&
 			        lastCommand != 'T' && lastCommand != 't')
@@ -1811,12 +1811,12 @@
 	sin_th = sin(angle * (M_PI / 180.0));
 	cos_th = cos(angle * (M_PI / 180.0));
 	double dx;
-	if(!relative)
+	if (!relative)
 		dx = (curx - x) / 2.0;
 	else
 		dx = -x / 2.0;
 	double dy;
-	if(!relative)
+	if (!relative)
 		dy = (cury - y) / 2.0;
 	else
 		dy = -y / 2.0;
@@ -1827,7 +1827,7 @@
 	double Px = _x1 * _x1;
 	double Py = _y1 * _y1;
 	double check = Px / Pr1 + Py / Pr2;
-	if(check > 1)
+	if (check > 1)
 	{
 		r1 = r1 * sqrt(check);
 		r2 = r2 * sqrt(check);
@@ -1838,20 +1838,20 @@
 	a11 = cos_th / r2;
 	x0 = a00 * curx + a01 * cury;
 	y0 = a10 * curx + a11 * cury;
-	if(!relative)
+	if (!relative)
 		x1 = a00 * x + a01 * y;
 	else
 		x1 = a00 * (curx + x) + a01 * (cury + y);
-	if(!relative)
+	if (!relative)
 		y1 = a10 * x + a11 * y;
 	else
 		y1 = a10 * (curx + x) + a11 * (cury + y);
 	d = (x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0);
 	sfactor_sq = 1.0 / d - 0.25;
-	if(sfactor_sq < 0)
+	if (sfactor_sq < 0)
 		sfactor_sq = 0;
 	sfactor = sqrt(sfactor_sq);
-	if(sweepFlag == largeArcFlag)
+	if (sweepFlag == largeArcFlag)
 		sfactor = -sfactor;
 	xc = 0.5 * (x0 + x1) - sfactor * (y1 - y0);
 	yc = 0.5 * (y0 + y1) + sfactor * (x1 - x0);
@@ -1859,9 +1859,9 @@
 	th0 = atan2(y0 - yc, x0 - xc);
 	th1 = atan2(y1 - yc, x1 - xc);
 	th_arc = th1 - th0;
-	if(th_arc < 0 && sweepFlag)
+	if (th_arc < 0 && sweepFlag)
 		th_arc += 2 * M_PI;
-	else if(th_arc > 0 && !sweepFlag)
+	else if (th_arc > 0 && !sweepFlag)
 		th_arc -= 2 * M_PI;
 	n_segs = static_cast<int>(ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))));
 	for(i = 0; i < n_segs; i++)
@@ -1891,11 +1891,11 @@
 			svgCurveToCubic(ite, a00 * x1 + a01 * y1, a10 * x1 + a11 * y1, a00 * x2 + a01 * y2, a10 * x2 + a11 * y2, a00 * x3 + a01 * y3, a10 * x3 + a11 * y3 );
 		}
 	}
-	if(!relative)
+	if (!relative)
 		curx = x;
 	else
 		curx += x;
-	if(!relative)
+	if (!relative)
 		cury = y;
 	else
 		cury += y;

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp	Fri Oct  5 20:35:20 2018
@@ -516,7 +516,7 @@
 		{
 			if (uz->read("index.xml", f))
 			{
-				if(designMapDom.setContent(f))
+				if (designMapDom.setContent(f))
 				{
 					QDomElement docElem = designMapDom.documentElement();
 					for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
@@ -804,7 +804,7 @@
 	importedPatterns.clear();
 	m_StyleSheets.clear();
 	m_currentStyleSheet = "";
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpagesplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -122,7 +122,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importpages");
@@ -163,7 +163,7 @@
 
 QImage ImportPagesPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp	Fri Oct  5 20:35:20 2018
@@ -442,7 +442,7 @@
 	QList<PageItem*> gElements;
 	groupStack.push(gElements);
 	currentItemNr = 0;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -2093,12 +2093,12 @@
 	quint16 count = 0;
 	uchar c, c2;
 	quint16 len;
-	while( count < in.size() )
+	while (count < in.size())
 	{
 		c = *ptrIn++;
 		count++;
 		len = c;
-		if( len < 128 )
+		if (len < 128)
 		{
 			// Copy next len+1 bytes literally.
 			len++;
@@ -2116,7 +2116,7 @@
 				}
 			}
 		}
-		else if( len > 128 )
+		else if (len > 128)
 		{
 			// Next -len+1 bytes in the dest are replicated from next source byte.
 			// (Interpret len as a negative 8-bit int.)
@@ -2148,7 +2148,7 @@
 				}
 			}
 		}
-		else if( len == 128 )
+		else if (len == 128)
 		{
 			// No-op.
 		}

Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -114,7 +114,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importpct");
@@ -156,7 +156,7 @@
 
 QImage ImportPctPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -154,7 +154,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importpdf");
@@ -236,7 +236,7 @@
 
 QImage ImportPdfPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importpm");
@@ -160,7 +160,7 @@
 
 QImage ImportPmPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpubplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -116,7 +116,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importpub");
@@ -157,7 +157,7 @@
 
 QImage ImportPubPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importqxp");
@@ -160,7 +160,7 @@
 
 QImage ImportQxpPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	Fri Oct  5 20:35:20 2018
@@ -688,18 +688,18 @@
 	m_style.clear();
 	m_style = propList;
 	isGradient = false;
-	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "none")
+	if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "none")
 		CurrColorFill = CommonStrings::None;
-	else if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "solid")
+	else if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "solid")
 	{
 		if (propList["draw:fill-color"])
 		{
 			CurrColorFill = parseColor(QString(propList["draw:fill-color"]->getStr().cstr()));
-			if(propList["draw:opacity"])
+			if (propList["draw:opacity"])
 				CurrFillTrans = 1.0 - qMin(1.0, qMax(fromPercentage(QString(propList["draw:opacity"]->getStr().cstr())), 0.0));
 		}
 	}
-	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
+	if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
 	{
 	//	double angle = 0;
 	//	if (propList["draw:angle"])
@@ -728,10 +728,10 @@
 				{
 					QString stopName = parseColor(QString(grad["svg:stop-color"]->getStr().cstr()));
 					double rampPoint = dr * c;
-					if(grad["svg:offset"])
+					if (grad["svg:offset"])
 						rampPoint = fromPercentage(QString(grad["svg:offset"]->getStr().cstr()));
 					const ScColor& gradC = m_Doc->PageColors[stopName];
-					if(grad["svg:stop-opacity"])
+					if (grad["svg:stop-opacity"])
 						opacity = qMin(1.0, qMax(fromPercentage(QString(grad["svg:stop-opacity"]->getStr().cstr())), 0.0));
 					currentGradient.addStop( ScColorEngine::getRGBColor(gradC, m_Doc), rampPoint, 0.5, opacity, stopName, 100 );
 					if (c == 0)
@@ -781,7 +781,7 @@
 			}
 		}
 	}
-	if(propList["svg:fill-rule"])
+	if (propList["svg:fill-rule"])
 	{
 		if (QString(propList["svg:fill-rule"]->getStr().cstr()) == "nonzero")
 			fillrule = false;
@@ -799,7 +799,7 @@
 			if (propList["svg:stroke-color"])
 			{
 				CurrColorStroke = parseColor(QString(propList["svg:stroke-color"]->getStr().cstr()));
-				if(propList["svg:stroke-opacity"])
+				if (propList["svg:stroke-opacity"])
 					CurrStrokeTrans = 1.0 - qMin(1.0, qMax(fromPercentage(QString(propList["svg:stroke-opacity"]->getStr().cstr())), 0.0));
 			}
 			if (propList["draw:stroke"]->getStr() == "dash")
@@ -836,11 +836,11 @@
 	if (propList["svg:stroke-linecap"])
 	{
 		QString params = QString(propList["svg:stroke-linecap"]->getStr().cstr());
-		if( params == "butt" )
+		if (params == "butt")
 			lineEnd = Qt::FlatCap;
-		else if( params == "round" )
+		else if (params == "round")
 			lineEnd = Qt::RoundCap;
-		else if( params == "square" )
+		else if (params == "square")
 			lineEnd = Qt::SquareCap;
 		else
 			lineEnd = Qt::FlatCap;
@@ -848,11 +848,11 @@
 	if (propList["svg:stroke-linejoin"])
 	{
 		QString params = QString(propList["svg:stroke-linejoin"]->getStr().cstr());
-		if( params == "miter" )
+		if (params == "miter")
 			lineJoin = Qt::MiterJoin;
-		else if( params == "round" )
+		else if (params == "round")
 			lineJoin = Qt::RoundJoin;
-		else if( params == "bevel" )
+		else if (params == "bevel")
 			lineJoin = Qt::BevelJoin;
 		else
 			lineJoin = Qt::MiterJoin;
@@ -906,7 +906,7 @@
 	if (!doProcessing)
 		return;
 	librevenge::RVNGPropertyListVector vertices = *propList.child("svg:points");
-	if(vertices.count() < 2)
+	if (vertices.count() < 2)
 		return;
 	if ((fileType == "pmd") || (fileType == "pm5") || (fileType == "p65"))
 		setStyle(propList);
@@ -933,7 +933,7 @@
 	if (!doProcessing)
 		return;
 	librevenge::RVNGPropertyListVector vertices = *propList.child("svg:points");
-	if(vertices.count() < 2)
+	if (vertices.count() < 2)
 		return;
 	if ((fileType == "pmd") || (fileType == "pm5") || (fileType == "p65"))
 		setStyle(propList);
@@ -948,7 +948,7 @@
 	Coords.svgClosePath();
 	if (!Coords.empty())
 	{
-		if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
+		if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
 		{
 		  if (m_style["draw:fill-image"] && m_style["librevenge:mime-type"])
 		  {
@@ -991,7 +991,7 @@
 					  if (testResult != -1)
 					  {
 						  const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-						  if( fmt )
+						  if (fmt)
 						  {
 							  fmt->setupTargets(m_Doc, nullptr, nullptr, nullptr, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 							  fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -1101,7 +1101,7 @@
 	PageItem *ite=nullptr;
 	if (isClosed)
 	{
-		if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
+		if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
 		{
 		  if (m_style["draw:fill-image"] && m_style["librevenge:mime-type"])
 		  {
@@ -1144,7 +1144,7 @@
 					  if (testResult != -1)
 					  {
 						  const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-						  if( fmt )
+						  if (fmt)
 						  {
 							  fmt->setupTargets(m_Doc, nullptr, nullptr, nullptr, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 							  fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -1286,7 +1286,7 @@
 					if (testResult != -1)
 					{
 						const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-						if( fmt )
+						if (fmt)
 						{
 							fmt->setupTargets(m_Doc, nullptr, nullptr, nullptr, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 							fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -1829,7 +1829,7 @@
 
 void RawPainter::applyFill(PageItem* ite)
 {
-	if(isGradient)
+	if (isGradient)
 	{
 		QString gradMode = "normal";
 		if (m_style["libmspub:shade"])
@@ -2125,7 +2125,7 @@
 			ite->GrType = 12;
 		}
 	}
-	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap")
+	if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap")
 	{
 		QByteArray ba(m_style["draw:fill-image"]->getStr().cstr());
 		QByteArray imageData = QByteArray::fromBase64(ba);
@@ -2382,18 +2382,18 @@
 	m_style.clear();
 	m_style = propList;
 	isGradient = false;
-	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "none")
+	if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "none")
 		CurrColorFill = CommonStrings::None;
-	else if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "solid")
+	else if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "solid")
 	{
 		if (propList["draw:fill-color"])
 		{
 			CurrColorFill = parseColor(QString(propList["draw:fill-color"]->getStr().cstr()));
-			if(propList["draw:opacity"])
+			if (propList["draw:opacity"])
 				CurrFillTrans = 1.0 - qMin(1.0, qMax(fromPercentage(QString(propList["draw:opacity"]->getStr().cstr())), 0.0));
 		}
 	}
-	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
+	if (propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
 	{
 		if (gradient.count() > 1)
 		{
@@ -2409,10 +2409,10 @@
 				{
 					QString stopName = parseColor(QString(grad["svg:stop-color"]->getStr().cstr()));
 					double rampPoint = dr * c;
-					if(grad["svg:offset"])
+					if (grad["svg:offset"])
 						rampPoint = fromPercentage(QString(grad["svg:offset"]->getStr().cstr()));
 					const ScColor& gradC = m_Doc->PageColors[stopName];
-					if(grad["svg:stop-opacity"])
+					if (grad["svg:stop-opacity"])
 						opacity = qMin(1.0, qMax(fromPercentage(QString(grad["svg:stop-opacity"]->getStr().cstr())), 0.0));
 					currentGradient.addStop( ScColorEngine::getRGBColor(gradC, m_Doc), rampPoint, 0.5, opacity, stopName, 100 );
 					if (c == 0)
@@ -2462,7 +2462,7 @@
 			}
 		}
 	}
-	if(propList["svg:fill-rule"])
+	if (propList["svg:fill-rule"])
 	{
 		if (QString(propList["svg:fill-rule"]->getStr().cstr()) == "nonzero")
 			fillrule = false;
@@ -2480,7 +2480,7 @@
 			if (propList["svg:stroke-color"])
 			{
 				CurrColorStroke = parseColor(QString(propList["svg:stroke-color"]->getStr().cstr()));
-				if(propList["svg:stroke-opacity"])
+				if (propList["svg:stroke-opacity"])
 					CurrStrokeTrans = 1.0 - qMin(1.0, qMax(fromPercentage(QString(propList["svg:stroke-opacity"]->getStr().cstr())), 0.0));
 			}
 			if (propList["draw:stroke"]->getStr() == "dash")
@@ -2517,11 +2517,11 @@
 	if (propList["svg:stroke-linecap"])
 	{
 		QString params = QString(propList["svg:stroke-linecap"]->getStr().cstr());
-		if( params == "butt" )
+		if (params == "butt")
 			lineEnd = Qt::FlatCap;
-		else if( params == "round" )
+		else if (params == "round")
 			lineEnd = Qt::RoundCap;
-		else if( params == "square" )
+		else if (params == "square")
 			lineEnd = Qt::SquareCap;
 		else
 			lineEnd = Qt::FlatCap;
@@ -2529,11 +2529,11 @@
 	if (propList["svg:stroke-linejoin"])
 	{
 		QString params = QString(propList["svg:stroke-linejoin"]->getStr().cstr());
-		if( params == "miter" )
+		if (params == "miter")
 			lineJoin = Qt::MiterJoin;
-		else if( params == "round" )
+		else if (params == "round")
 			lineJoin = Qt::RoundJoin;
-		else if( params == "bevel" )
+		else if (params == "bevel")
 			lineJoin = Qt::BevelJoin;
 		else
 			lineJoin = Qt::MiterJoin;
@@ -2610,7 +2610,7 @@
 {
 	if (!doProcessing)
 		return;
-	if(vertices.count() < 2)
+	if (vertices.count() < 2)
 		return;
 	Coords.resize(0);
 	Coords.svgInit();
@@ -2624,7 +2624,7 @@
 		return;
 	PageItem *ite = nullptr;
 	int z = 0;
-	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
+	if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
 	{
 		if (m_style["draw:fill-image"] && m_style["libwpg:mime-type"])
 		{
@@ -2667,7 +2667,7 @@
 				  if (testResult != -1)
 				  {
 					  const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-					  if( fmt )
+					  if (fmt)
 					  {
 						  fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 						  fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -2772,7 +2772,7 @@
 	int z;
 	if (isClosed)
 	{
-		if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
+		if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap" && m_style["style:repeat"] && m_style["style:repeat"]->getStr() == "stretch")
 		{
 		  if (m_style["draw:fill-image"] && m_style["libwpg:mime-type"])
 		  {
@@ -2815,7 +2815,7 @@
 					  if (testResult != -1)
 					  {
 						  const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-						  if( fmt )
+						  if (fmt)
 						  {
 							  fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 							  fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -2950,7 +2950,7 @@
 					if (testResult != -1)
 					{
 						const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-						if( fmt )
+						if (fmt)
 						{
 							fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 							fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
@@ -3234,7 +3234,7 @@
 
 void RawPainter::applyFill(PageItem* ite)
 {
-	if(isGradient)
+	if (isGradient)
 	{
 		QString gradMode = "normal";
 		if (m_style["libmspub:shade"])
@@ -3356,7 +3356,7 @@
 			ite->GrType = 12;
 		}
 	}
-	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap")
+	if (m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap")
 	{
 		QByteArray ba(m_style["draw:fill-image"]->getStr().cstr());
 		QByteArray imageData = QByteArray::fromBase64(ba);
@@ -3623,7 +3623,7 @@
 {
 	if (ite == nullptr)
 		return;
-	if(m_style["draw:shadow"] && m_style["draw:shadow"]->getStr() == "visible")
+	if (m_style["draw:shadow"] && m_style["draw:shadow"]->getStr() == "visible")
 	{
 		double xof = 0.0;
 		double yof = 0.0;
@@ -3636,7 +3636,7 @@
 		if (m_style["draw:shadow-color"])
 		{
 			shadowColor = parseColor(QString(m_style["draw:shadow-color"]->getStr().cstr()));
-			if(m_style["draw:shadow-opacity"])
+			if (m_style["draw:shadow-opacity"])
 				shadowTrans = 1.0 - qMin(1.0, qMax(fromPercentage(QString(m_style["draw:shadow-opacity"]->getStr().cstr())), 0.0));
 		}
 		ite->setHasSoftShadow(true);

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp	Fri Oct  5 20:35:20 2018
@@ -344,7 +344,7 @@
 	importedColors.clear();
 	QList<PageItem*> gElements;
 	groupStack.push(gElements);
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -476,22 +476,22 @@
 			}
 			else if (command == "stroke-width")
 				strokewidth = ScCLocale::toDoubleC(params);
-			else if( command == "stroke-linejoin" )
-			{
-				if( params == "miter" )
+			else if (command == "stroke-linejoin")
+			{
+				if (params == "miter")
 					LineJoin = Qt::MiterJoin;
-				else if( params == "round" )
+				else if (params == "round")
 					LineJoin = Qt::RoundJoin;
-				else if( params == "bevel" )
+				else if (params == "bevel")
 					LineJoin = Qt::BevelJoin;
 			}
-			else if( command == "stroke-linecap" )
-			{
-				if( params == "butt" )
+			else if (command == "stroke-linecap")
+			{
+				if (params == "butt")
 					LineEnd = Qt::FlatCap;
-				else if( params == "round" )
+				else if (params == "round")
 					LineEnd = Qt::RoundCap;
-				else if( params == "square" )
+				else if (params == "square")
 					LineEnd = Qt::SquareCap;
 			}
 		}
@@ -532,7 +532,7 @@
 			{
 				x = ScCLocale::toDoubleC(*(it++));
 				y = ScCLocale::toDoubleC(*it);
-				if( bFirst )
+				if (bFirst)
 				{
 					svgMoveTo(x * Conversion, y * Conversion);
 					bFirst = false;
@@ -707,7 +707,7 @@
 			{
 				x = ScCLocale::toDoubleC(*(it1++));
 				y = ScCLocale::toDoubleC(*it1);
-				if( bFirst )
+				if (bFirst)
 				{
 					svgMoveTo(x * Conversion, y * Conversion);
 					bFirst = false;
@@ -821,42 +821,42 @@
 	
 	bool noUnit = false;
 	QString unitval(unit);
-	if( unit.right( 2 ) == sPT )
+	if (unit.right( 2 ) == sPT)
 		unitval.replace( sPT, "" );
-	else if( unit.right( 2 ) == sCM )
+	else if (unit.right( 2 ) == sCM)
 		unitval.replace( sCM, "" );
-	else if( unit.right( 2 ) == sMM )
+	else if (unit.right( 2 ) == sMM)
 		unitval.replace( sMM , "" );
-	else if( unit.right( 2 ) == sIN )
+	else if (unit.right( 2 ) == sIN)
 		unitval.replace( sIN, "" );
-	else if( unit.right( 2 ) == sPX )
+	else if (unit.right( 2 ) == sPX)
 		unitval.replace( sPX, "" );
 	if (unitval == unit)
 		noUnit = true;
 	double value = ScCLocale::toDoubleC(unitval);
-	if( unit.right( 2 ) == sPT )
+	if (unit.right( 2 ) == sPT)
 		{}/* value = value; */ //no change
-	else if( unit.right( 2 ) == sCM )
+	else if (unit.right( 2 ) == sCM)
 	{
 		value = cm2pts(value);
 		Conversion = 1/unitGetRatioFromIndex(SC_CM);
 	}
-	else if( unit.right( 2 ) == sMM )
+	else if (unit.right( 2 ) == sMM)
 	{
 		value = mm2pts(value);
 		Conversion = 1/unitGetRatioFromIndex(SC_MM);
 	}
-	else if( unit.right( 2 ) == sIN )
+	else if (unit.right( 2 ) == sIN)
 	{
 		value = in2pts(value);
 		Conversion = 1/unitGetRatioFromIndex(SC_IN);
 	}
-	else if( unit.right( 2 ) == sPX )
+	else if (unit.right( 2 ) == sPX)
 	{
 		value = value * 0.8;
 		Conversion = 0.8;
 	}
-	else if(noUnit)
+	else if (noUnit)
 		{}/* value = value; */ //no change
 	return value;
 }
@@ -875,9 +875,9 @@
 	expsign = 1;
 
 	// read the sign
-	if(*ptr == '+')
+	if (*ptr == '+')
 		ptr++;
-	else if(*ptr == '-')
+	else if (*ptr == '-')
 	{
 		ptr++;
 		sign = -1;
@@ -886,21 +886,21 @@
 	// read the integer part
 	while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		integer = (integer * 10) + *(ptr++) - '0';
-	if(*ptr == '.') // read the decimals
+	if (*ptr == '.') // read the decimals
 	{
 		ptr++;
 		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
-	if(*ptr == 'e' || *ptr == 'E') // read the exponent part
+	if (*ptr == 'e' || *ptr == 'E') // read the exponent part
 	{
 		ptr++;
 
 		// read the sign of the exponent
-		if(*ptr == '+')
+		if (*ptr == '+')
 			ptr++;
-		else if(*ptr == '-')
+		else if (*ptr == '-')
 		{
 			ptr++;
 			expsign = -1;
@@ -917,7 +917,7 @@
 	number = integer + decimal;
 	number *= sign * pow( static_cast<double>(10), static_cast<double>( expsign * exponent ) );
 	// skip the following space
-	if(*ptr == ' ')
+	if (*ptr == ' ')
 		ptr++;
 
 	return ptr;
@@ -928,7 +928,7 @@
 	QString d = s;
 	d = d.replace( QRegExp( "," ), " ");
 	bool ret = false;
-	if( !d.isEmpty() )
+	if (!d.isEmpty())
 	{
 		d = d.simplified();
 		QByteArray pathData = d.toLatin1();
@@ -942,7 +942,7 @@
 		subpathx = subpathy = curx = cury = contrlx = contrly = 0.0;
 		while( ptr < end )
 		{
-			if( *ptr == ' ' )
+			if (*ptr == ' ')
 				ptr++;
 			relative = false;
 			switch( command )
@@ -1118,18 +1118,18 @@
 				}
 			}
 			lastCommand = command;
-			if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
+			if (*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
 			{
 				// there are still coords in this command
-				if(command == 'M')
+				if (command == 'M')
 					command = 'L';
-				else if(command == 'm')
+				else if (command == 'm')
 					command = 'l';
 			}
 			else
 				command = *(ptr++);
 
-			if( lastCommand != 'C' && lastCommand != 'c' &&
+			if (lastCommand != 'C' && lastCommand != 'c' &&
 			        lastCommand != 'S' && lastCommand != 's' &&
 			        lastCommand != 'Q' && lastCommand != 'q' &&
 			        lastCommand != 'T' && lastCommand != 't')

Modified: trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importshape");
@@ -156,7 +156,7 @@
 
 QImage ImportShapePlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp	Fri Oct  5 20:35:20 2018
@@ -346,7 +346,7 @@
 	QList<PageItem*> gElements;
 	groupStack.push(gElements);
 	currentItemNr = 0;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importsml");
@@ -156,7 +156,7 @@
 
 QImage ImportSmlPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -206,7 +206,7 @@
 
 QImage SVGImportPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;
@@ -263,7 +263,7 @@
 	viewTransformY = 0;
 	viewScaleX = 1;
 	viewScaleY = 1;
-	if( !docElem.attribute( "viewBox" ).isEmpty() )
+	if (!docElem.attribute( "viewBox" ).isEmpty())
 	{
 		QString viewbox( docElem.attribute( "viewBox" ) );
 		QStringList points = viewbox.replace( QRegExp(","), " ").simplified().split( ' ', QString::SkipEmptyParts );
@@ -409,7 +409,7 @@
 	viewTransformY = 0;
 	viewScaleX = 1;
 	viewScaleY = 1;
-	if( !docElem.attribute( "viewBox" ).isEmpty() )
+	if (!docElem.attribute( "viewBox" ).isEmpty())
 	{
 		QString viewbox( docElem.attribute( "viewBox" ) );
 		QStringList points = viewbox.replace( QRegExp(","), " ").simplified().split( ' ', QString::SkipEmptyParts );
@@ -670,7 +670,7 @@
 		if (!(importerFlags & LoadSavePlugin::lfCreateDoc))
 		{
 			QString nodeId = e.toElement().attribute("id");
-			if( !nodeId.isEmpty() )
+			if (!nodeId.isEmpty())
 				item->setItemName(" "+nodeId);
 		}
 	}
@@ -1193,7 +1193,7 @@
 	for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() )
 	{
 		QDomElement b = n.toElement();
-		if( b.isNull() || isIgnorableNode(b) )
+		if (b.isNull() || isIgnorableNode(b))
 			continue;
 		SvgStyle svgStyle;
 		parseStyle( &svgStyle, b);
@@ -1229,7 +1229,7 @@
 		for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() )
 		{
 			QDomElement b = n.toElement();
-			if( b.isNull() || isIgnorableNode(b) )
+			if (b.isNull() || isIgnorableNode(b))
 				continue;
 			SvgStyle svgStyle;
 			parseStyle( &svgStyle, b);
@@ -1254,7 +1254,7 @@
 		for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() )
 		{
 			QDomElement b = n.toElement();
-			if( b.isNull() || isIgnorableNode(b) )
+			if (b.isNull() || isIgnorableNode(b))
 				continue;
 			SvgStyle svgStyle;
 			parseStyle( &svgStyle, b);
@@ -1322,7 +1322,7 @@
 				}
 				else
 					neu->SetRectFrame();
-				if( !e.attribute("id").isEmpty() )
+				if (!e.attribute("id").isEmpty())
 					neu->setItemName(e.attribute("id"));
 				else
 					neu->setItemName( tr("Group%1").arg(m_Doc->GroupCounter));
@@ -1370,7 +1370,7 @@
 	for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() )
 	{
 		QDomElement b = n.toElement();
-		if( b.isNull() || isIgnorableNode(b) )
+		if (b.isNull() || isIgnorableNode(b))
 			continue;
 		SvgStyle svgStyle;
 		parseStyle( &svgStyle, b);
@@ -1506,7 +1506,7 @@
 		fclose(source);
 		fclose(dest);
 	} */
-/*	else if( STag == "image" )
+/*	else if (STag == "image")
 		GElements = parseImage(e);
 	} */
 	else if (!isIgnorableNodeName(STag))
@@ -1736,7 +1736,7 @@
 		{
 			x = ScCLocale::toDoubleC(*(it++));
 			y = ScCLocale::toDoubleC(*it);
-			if( bFirst )
+			if (bFirst)
 			{
 				ite->PoLine.svgMoveTo(x, y);
 				bFirst = false;
@@ -1879,9 +1879,9 @@
 	QFontMetrics fm(textFont);
 	double width   = fm.width(textString);
 
-	if( gc->textAnchor == "middle" )
+	if (gc->textAnchor == "middle")
 		StartX -= chunkW / 2.0;
-	else if( gc->textAnchor == "end")
+	else if (gc->textAnchor == "end")
 		StartX -= chunkW;
 
 	FPointArray textPath;
@@ -1949,7 +1949,7 @@
 {
 	QList<PageItem*> SElements;
 	QString id = e.attribute("id");
-	if( !id.isEmpty() )
+	if (!id.isEmpty())
 		m_nodeMap.insert(id, e);
 	return SElements;
 }
@@ -1958,7 +1958,7 @@
 {
 	QList<PageItem*> UElements;
 	setupNode(e);
-	if( e.hasAttribute("x") || e.hasAttribute("y") )
+	if (e.hasAttribute("x") || e.hasAttribute("y"))
 	{
 		QTransform matrix;
 		double  xAtt = ScCLocale::toDoubleC(e.attribute("x", "0.0"));
@@ -2217,7 +2217,7 @@
 		}
 		else if (subtransform[0] == "scale")
 		{
-			if(params.count() == 2)
+			if (params.count() == 2)
 				result.scale(params[0], params[1]);
 			else    // Spec : if only one param given, assume uniform scaling
 				result.scale(params[0], params[0]);
@@ -2258,9 +2258,9 @@
 	expsign = 1;
 
 	// read the sign
-	if(*ptr == '+')
+	if (*ptr == '+')
 		ptr++;
-	else if(*ptr == '-')
+	else if (*ptr == '-')
 	{
 		ptr++;
 		sign = -1;
@@ -2269,21 +2269,21 @@
 	// read the integer part
 	while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		integer = (integer * 10) + *(ptr++) - '0';
-	if(*ptr == '.') // read the decimals
+	if (*ptr == '.') // read the decimals
 	{
 		ptr++;
 		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
-	if(*ptr == 'e' || *ptr == 'E') // read the exponent part
+	if (*ptr == 'e' || *ptr == 'E') // read the exponent part
 	{
 		ptr++;
 
 		// read the sign of the exponent
-		if(*ptr == '+')
+		if (*ptr == '+')
 			ptr++;
-		else if(*ptr == '-')
+		else if (*ptr == '-')
 		{
 			ptr++;
 			expsign = -1;
@@ -2300,7 +2300,7 @@
 	number = integer + decimal;
 	number *= sign * pow( static_cast<double>(10), static_cast<double>( expsign * exponent ) );
 	// skip the following space
-	if(*ptr == ' ')
+	if (*ptr == ' ')
 		ptr++;
 
 	return ptr;
@@ -2706,7 +2706,7 @@
 	else if (command == "stroke-dasharray")
 	{
 		QVector<double> array;
-		if(params != "none")
+		if (params != "none")
 		{
 			QString params2 = params.simplified().replace(',', " ");
 			QStringList dashes = params2.split(' ', QString::SkipEmptyParts);
@@ -2773,7 +2773,7 @@
 			obj->startMarker = params.mid(start, end - start);
 		}
 	}
-	else if( !isIgnorableNodeName(command) )
+	else if (!isIgnorableNodeName(command))
 	{
 		if (!m_unsupportedFeatures.contains(command))
 		{
@@ -2870,7 +2870,7 @@
 		if (parseTagName(stop) == "stop")
 		{
 			QString temp = stop.attribute( "offset" );
-			if( temp.contains( '%' ) )
+			if (temp.contains( '%' ))
 			{
 				temp.chop(1);
 				offset = ScCLocale::toDoubleC(temp) / 100.0;
@@ -3052,7 +3052,7 @@
 		}
 		m_nodeMap.insert(origName, b);
 		QString transf = b.attribute("patternTransform");
-		if( !transf.isEmpty() )
+		if (!transf.isEmpty())
 		{
 			gradhelper.matrix = parseTransform( b.attribute("patternTransform") );
 			gradhelper.matrixValid = true;
@@ -3184,7 +3184,7 @@
 		gradhelper.cspaceValid = false;
 	}
 	QString transf = e.attribute("gradientTransform");
-	if( !transf.isEmpty() )
+	if (!transf.isEmpty())
 	{
 		gradhelper.matrix = parseTransform( e.attribute("gradientTransform") );
 		gradhelper.matrixValid = true;
@@ -3192,11 +3192,11 @@
 	else
 		gradhelper.matrixValid = false;
 	QString spreadMethod = e.attribute( "spreadMethod" );
-	if( !spreadMethod.isEmpty() )
-	{
-		if( spreadMethod == "reflect" )
+	if (!spreadMethod.isEmpty())
+	{
+		if (spreadMethod == "reflect")
 			gradhelper.gradient.setRepeatMethod( VGradient::reflect );
-		else if( spreadMethod == "repeat" )
+		else if (spreadMethod == "repeat")
 			gradhelper.gradient.setRepeatMethod( VGradient::repeat );
 	}
 	parseColorStops(&gradhelper, e);

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp	Fri Oct  5 20:35:20 2018
@@ -688,7 +688,7 @@
 	m_currObjSize = 0;
 	emfStyleMapEMP.clear();
 	seen_XGRAD_SEQ_BEGIN = false;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvmplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -120,7 +120,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importsvm");
@@ -166,7 +166,7 @@
 
 QImage ImportSvmPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp	Fri Oct  5 20:35:20 2018
@@ -174,10 +174,10 @@
 	importedColors.clear();
 	QByteArray f;
 	loadRawText(fNameIn, f);
-	if(designMapDom.setContent(f))
+	if (designMapDom.setContent(f))
 	{
 		QDomElement docElem = designMapDom.documentElement();
-		for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+		for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
 		{
 			QDomElement dpg = drawPag.toElement();
 			if (dpg.tagName() == "vc:colors")
@@ -380,7 +380,7 @@
 	Coords.svgInit();
 	importedColors.clear();
 	facingPages = false;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -391,7 +391,7 @@
 	storyMap.clear();
 	QByteArray f;
 	loadRawText(fn, f);
-	if(designMapDom.setContent(f))
+	if (designMapDom.setContent(f))
 	{
 		QDomElement docElem = designMapDom.documentElement();
 		for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )

Modified: trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/viva/importvivaplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -122,7 +122,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importviva");
@@ -163,7 +163,7 @@
 
 QImage ImportVivaPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;
@@ -177,7 +177,7 @@
 
 bool ImportVivaPlugin::readColors(const QString& fileName, ColorList &colors)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return false;
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsdplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -116,7 +116,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importvsd");
@@ -157,7 +157,7 @@
 
 QImage ImportVsdPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp	Fri Oct  5 20:35:20 2018
@@ -244,7 +244,8 @@
 	QString r;
 	const unsigned char * c = (const unsigned char *) chars.data();
 	
-	if( chars.size() == 0 ) return r;
+	if (chars.size() == 0)
+		return r;
 	
 	for (int i = 0; i < chars.size(); ++i) 
 	{
@@ -756,7 +757,7 @@
 	QTransform gcm  = m_context.worldMatrix();
 	double coeff1 = sqrt(gcm.m11() * gcm.m11() + gcm.m12() * gcm.m12());
 	double coeff2 = sqrt(gcm.m21() * gcm.m21() + gcm.m22() * gcm.m22());
-	if( item->asImageFrame() )
+	if (item->asImageFrame())
 	{
 		item->moveBy(gcm.dx(), gcm.dy());
 		item->setWidthHeight(item->width() * gcm.m11(), item->height() * gcm.m22());
@@ -764,7 +765,7 @@
 		if (item->imageIsAvailable)
 			item->setImageXYScale(item->width() / item->pixm.width(), item->height() / item->pixm.height());
 	}
-	else if( item->asTextFrame() )
+	else if (item->asTextFrame())
 	{
 		item->setLineWidth(qMax(item->lineWidth() * (coeff1 + coeff2) / 2.0, 0.25));
 	}
@@ -864,7 +865,7 @@
 		lineWidth = 1.0;
 	FPointArray paramPoints = pointsFromParam( params[0], &params[1] );
 	FPointArray points      = pointsToPolyline( paramPoints, true );
-	if( !paramPoints.empty() )
+	if (!paramPoints.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -904,7 +905,7 @@
 	double  lineWidth   = m_context.pen().width();
 	if (doStroke && lineWidth <= 0.0 )
 		lineWidth = 1.0;
-	if( !pointsPoly.empty() )
+	if (!pointsPoly.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -928,7 +929,7 @@
 		lineWidth = 1.0;
 	FPointArray paramPoints = pointsFromParam( params[0], &params[1] );
 	FPointArray points      = pointsToPolyline( paramPoints, false );
-	if( !paramPoints.empty() )
+	if (!paramPoints.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -1017,7 +1018,7 @@
 	painterPath.arcMoveTo(x, y, xWidth, yHeight, angleStart);
 	painterPath.arcTo(x, y, xWidth, yHeight, angleStart, angleLength);
 	pointArray.fromQPainterPath(painterPath);
-	if( !pointArray.empty() )
+	if (!pointArray.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -1054,7 +1055,7 @@
 	painterPath.arcTo (x, y, xWidth, yHeight, angleStart, angleLength);
 	painterPath.lineTo(firstPoint);
 	pointArray.fromQPainterPath(painterPath);
-	if( !pointArray.empty() )
+	if (!pointArray.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);
@@ -1092,7 +1093,7 @@
 	painterPath.lineTo(xCenter, yCenter);
 	painterPath.lineTo(firstPoint);
 	pointArray.fromQPainterPath(painterPath);
-	if( !pointArray.empty() )
+	if (!pointArray.empty())
 	{
 		int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, BaseX, BaseY, 10, 10, lineWidth, fillColor, strokeColor);
 		PageItem* ite = m_Doc->Items->at(z);

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -185,7 +185,7 @@
 
 QImage WMFImportPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp	Fri Oct  5 20:35:20 2018
@@ -127,7 +127,7 @@
 		importedColors.append(newColorName);
 	CurrColorStroke = fNam;
 	CurrStrokeTrans = pen.foreColor.alpha / 255.0;
-	if(!pen.solid)
+	if (!pen.solid)
 	{
 		dashArray.clear();
 		for(unsigned i = 0; i < pen.dashArray.count(); i++)
@@ -175,7 +175,7 @@
 	CurrColorFill = "Black";
 	CurrFillShade = 100.0;
 	int Rc, Gc, Bc;
-	if(brush.style == libwpg::WPGBrush::Solid)
+	if (brush.style == libwpg::WPGBrush::Solid)
 	{
 		Rc = brush.foreColor.red;
 		Gc = brush.foreColor.green;
@@ -222,7 +222,7 @@
 
 void ScrPainter::setFillRule(FillRule rule)
 {
-	if(rule == libwpg::WPGPaintInterface::WindingFill)
+	if (rule == libwpg::WPGPaintInterface::WindingFill)
 		fillrule = false;
 	else
 		fillrule = true;
@@ -261,7 +261,7 @@
 
 void ScrPainter::drawPolygon(const libwpg::WPGPointArray& vertices, bool closed)
 {
-	if(vertices.count() < 2)
+	if (vertices.count() < 2)
 		return;
 	Coords.resize(0);
 	Coords.svgInit();
@@ -325,7 +325,7 @@
 			if (!path.framed)
 				CurrColorStroke = CommonStrings::None;
 		}
-		if(path.closed)
+		if (path.closed)
 		{
 			Coords.svgClosePath();
 			z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10, LineW, CurrColorFill, CurrColorStroke);

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -114,7 +114,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importwpg");
@@ -155,7 +155,7 @@
 
 QImage ImportWpgPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp	Fri Oct  5 20:35:20 2018
@@ -531,7 +531,7 @@
 	ignoreableTags << 2205 << 2900 << 2901;
 	ignoreableTags << 4031 << 4081 << 4082 << 4083 << 4087 << 4102 << 4103 << 4104 << 4105 << 4106 << 4107 << 4108 << 4109;
 	ignoreableTags << 4110 << 4111 << 4112 << 4113 << 4114 << 4115 << 4116 << 4124;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importxar");
@@ -156,7 +156,7 @@
 
 QImage ImportXarPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = ScCore->primaryMainWindow()->doc;
@@ -170,7 +170,7 @@
 
 bool ImportXarPlugin::readColors(const QString& fileName, ColorList &colors)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return false;
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp	Fri Oct  5 20:35:20 2018
@@ -1607,7 +1607,7 @@
 	QList<PageItem*> gElements;
 	groupStack.push(gElements);
 	currentItemNr = 0;
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -114,7 +114,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importxfig");
@@ -155,7 +155,7 @@
 
 QImage ImportXfigPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp	Fri Oct  5 20:35:20 2018
@@ -95,7 +95,7 @@
 		QDomDocument designMapDom;
 		if (!uz->read("_rels/.rels", f))
 			return QImage();
-		if(designMapDom.setContent(f))
+		if (designMapDom.setContent(f))
 		{
 			QDomElement docElem = designMapDom.documentElement();
 			for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
@@ -398,7 +398,7 @@
 	linkTargets.clear();
 	linkSources.clear();
 	pathResources.clear();
-	if(progressDialog)
+	if (progressDialog)
 	{
 		progressDialog->setOverallProgress(2);
 		progressDialog->setLabel("GI", tr("Generating Items"));
@@ -575,7 +575,7 @@
 	if (uz->read(designMap, f))
 	{
 		QDomDocument designMapDom;
-		if(designMapDom.setContent(f))
+		if (designMapDom.setContent(f))
 		{
 			QDomElement docElem = designMapDom.documentElement();
 			docWidth = docElem.attribute("Width", QString("%1").arg(PrefsManager::instance()->appPrefs.docSetupPrefs.pageWidth)).toDouble() * conversionFactor;
@@ -1586,7 +1586,7 @@
 	if (uz->read(resFile, f))
 	{
 		QDomDocument designMapDom;
-		if(designMapDom.setContent(f))
+		if (designMapDom.setContent(f))
 		{
 			QDomElement docElem = designMapDom.documentElement();
 			for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )

Modified: trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxpsplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -138,7 +138,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importxps");
@@ -179,7 +179,7 @@
 
 QImage ImportXpsPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp	Fri Oct  5 20:35:20 2018
@@ -115,7 +115,7 @@
 {
 	if (!checkFlags(flags))
 		return false;
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 	{
 		flags |= lfInteractive;
 		PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("importzmf");
@@ -160,7 +160,7 @@
 
 QImage ImportZmfPlugin::readThumbnail(const QString& fileName)
 {
-	if( fileName.isEmpty() )
+	if (fileName.isEmpty())
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);
 	m_Doc = nullptr;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp	Fri Oct  5 20:35:20 2018
@@ -75,7 +75,7 @@
 	int aValue;
 	if (!PyArg_ParseTuple(args, "i", &aValue))
 		return nullptr;
-	if(!checkHaveDocument())
+	if (!checkHaveDocument())
 		return nullptr;
 	ScCore->primaryMainWindow()->slotDocCh(static_cast<bool>(aValue));
 	/*
@@ -91,7 +91,7 @@
 	double zoomFactor;
 	if (!PyArg_ParseTuple(args, "d", &zoomFactor))
 		return nullptr;
-	if(!checkHaveDocument())
+	if (!checkHaveDocument())
 		return nullptr;
 	if (zoomFactor > 0.0 || zoomFactor == -100.0)
 		ScCore->primaryMainWindow()->slotZoom(zoomFactor);
@@ -110,9 +110,9 @@
 PyObject *scribus_scrolldocument(PyObject*,PyObject* args)
 {
 	int moveX = 0, moveY = 0;
-	if(!PyArg_ParseTuple(args, "ii", &moveX, &moveY))
+	if (!PyArg_ParseTuple(args, "ii", &moveX, &moveY))
 		return nullptr;
-	if(!checkHaveDocument())
+	if (!checkHaveDocument())
 		return nullptr;
 	ScCore->primaryMainWindow()->view->scrollBy(moveX,moveY);
 	Py_RETURN_NONE;

Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp	(original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp	Fri Oct  5 20:35:20 2018
@@ -317,7 +317,7 @@
 {
 	QString prFile = QDir::toNativeSeparators(PrefsManager::instance()->preferencesLocation()+"/scribusshapes.xml");
 	QFile f(prFile);
-	if(!f.open(QIODevice::WriteOnly))
+	if (!f.open(QIODevice::WriteOnly))
 		return;
 	QDomDocument docu = QDomDocument("svgdoc");
 	QString vo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp	Fri Oct  5 20:35:20 2018
@@ -122,7 +122,7 @@
 void HunspellDialog::changeWord()
 {
 	//If we have ignored a word or its already changed, skip to the next.
-	if(m_wfList->at(m_wfListIndex).ignore || m_wfList->at(m_wfListIndex).changed)
+	if (m_wfList->at(m_wfListIndex).ignore || m_wfList->at(m_wfListIndex).changed)
 		goToNextWord();
 	replaceWord(m_wfListIndex);
 	goToNextWord();
@@ -130,12 +130,12 @@
 
 void HunspellDialog::changeAllWords()
 {
-	if(m_wfList->at(m_wfListIndex).ignore && !m_wfList->at(m_wfListIndex).changed)
+	if (m_wfList->at(m_wfListIndex).ignore && !m_wfList->at(m_wfListIndex).changed)
 		return;
 	QString wordToChange=m_wfList->at(m_wfListIndex).w;
 	//Do we start from 0 or from the instance of the word where we are... 0 for now
 	for(int i=0;i<m_wfList->count();++i)
-		if(m_wfList->at(i).w==wordToChange)
+		if (m_wfList->at(i).w==wordToChange)
 			replaceWord(i);
 	goToNextWord();
 }

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp	Fri Oct  5 20:35:20 2018
@@ -137,7 +137,7 @@
 		{
 			const StyleSet<CharStyle> &tmp(m_doc->charStyles());
 			for (int i = 0; i < tmp.count(); ++i)
-				if(tmp[i].isDefaultStyle())
+				if (tmp[i].isDefaultStyle())
 				{
 					//check out why we are getting "German" back here next
 					wordLang=tmp[i].language();

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Fri Oct  5 20:35:20 2018
@@ -412,7 +412,7 @@
 
 void PSLib::PutStream(const QByteArray& array, bool hexEnc)
 {
-	if(hexEnc)
+	if (hexEnc)
 		WriteASCII85Bytes(array);
 	else
 		spoolStream.writeRawData(array.data(), array.size());
@@ -420,7 +420,7 @@
 
 void PSLib::PutStream(const char* array, int length, bool hexEnc)
 {
-	if(hexEnc)
+	if (hexEnc)
 		WriteASCII85Bytes((const unsigned char*) array, length);
 	else
 		spoolStream.writeRawData(array, length);
@@ -572,7 +572,6 @@
 	}
 	else
 	{
-		
 		BBox = "%%BoundingBox: " + IToStr(qRound(x)) + " " + IToStr(qRound(y)) + " " + IToStr(qRound(height)) + " " + IToStr(qRound(width)) + "\n";
 		BBoxH = "%%HiResBoundingBox: " + ToStr(x) + " " + ToStr(y) + " " + ToStr(height) + " " + ToStr(width) + "\n";
 	}

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Fri Oct  5 20:35:20 2018
@@ -117,9 +117,9 @@
 */
 void SCFonts::AddPath(QString p)
 {
-	if(p.right(1) != "/")
-	  p += "/";
-	if(!FontPath.contains(p))
+	if (p.right(1) != "/")
+		p += "/";
+	if (!FontPath.contains(p))
 		FontPath.insert(FontPath.count(),p);
 }
 
@@ -242,47 +242,47 @@
 	type = ScFace::UNKNOWN_TYPE;
 	if (ftIOFunc(fts, 0L, reinterpret_cast<FT_Byte *>(buf), 128) == FONT_NO_ERROR) 
 	{
-		if(strncmp(buf,T42_HEAD,strlen(T42_HEAD)) == 0) 
+		if (strncmp(buf,T42_HEAD,strlen(T42_HEAD)) == 0) 
 		{
 			fmt = ScFace::TYPE42;
 			type = ScFace::TTF;
 		}
-		else if(strncmp(buf,T1_HEAD,strlen(T1_HEAD)) == 0 ||
-			    strncmp(buf,T1_ADOBE_HEAD,strlen(T1_ADOBE_HEAD)) == 0) 
+		else if (strncmp(buf,T1_HEAD,strlen(T1_HEAD)) == 0 ||
+			     strncmp(buf,T1_ADOBE_HEAD,strlen(T1_ADOBE_HEAD)) == 0) 
 		{
 			fmt = ScFace::PFA;
 			type = ScFace::TYPE1;
 		}
-		else if(strncmp(buf,PSFONT_ADOBE2_HEAD,strlen(PSFONT_ADOBE2_HEAD)) == 0 ||
-			    strncmp(buf,PSFONT_ADOBE21_HEAD,strlen(PSFONT_ADOBE21_HEAD)) == 0 ||
-			    strncmp(buf,PSFONT_ADOBE3_HEAD,strlen(PSFONT_ADOBE3_HEAD)) ==0) 
+		else if (strncmp(buf,PSFONT_ADOBE2_HEAD,strlen(PSFONT_ADOBE2_HEAD)) == 0 ||
+			     strncmp(buf,PSFONT_ADOBE21_HEAD,strlen(PSFONT_ADOBE21_HEAD)) == 0 ||
+			     strncmp(buf,PSFONT_ADOBE3_HEAD,strlen(PSFONT_ADOBE3_HEAD)) ==0) 
 		{
 			// Type2(CFF), Type0(Composite/CID), Type 3, Type 14 etc would end here
 			fmt = ScFace::PFA;
 			type = ScFace::UNKNOWN_TYPE;
 		}
-		else if(buf[0] == '\200' && buf[1] == '\1')
+		else if (buf[0] == '\200' && buf[1] == '\1')
 		{
 			fmt = ScFace::PFB;
 			type = ScFace::TYPE1;
 		}
-		else if(buf[0] == '\0' && buf[1] == '\1' 
+		else if (buf[0] == '\0' && buf[1] == '\1' 
 				&& buf[2] == '\0' && buf[3] == '\0')
 		{
 			fmt = ScFace::SFNT;
 			type = ScFace::TTF;
 		}
-		else if(strncmp(buf,"true",4) == 0)
+		else if (strncmp(buf,"true",4) == 0)
 		{
 			fmt = ScFace::SFNT;
 			type = ScFace::TTF;
 		}
-		else if(strncmp(buf,"ttcf",4) == 0)
+		else if (strncmp(buf,"ttcf",4) == 0)
 		{
 			fmt = ScFace::TTCF;
 			type = ScFace::OTF;
 		}
-		else if(strncmp(buf,"OTTO",4) == 0)
+		else if (strncmp(buf,"OTTO",4) == 0)
 		{
 			fmt = ScFace::SFNT;
 			type = ScFace::OTF;
@@ -1045,13 +1045,13 @@
 void SCFonts::AddXFontServerPath()
 {
 	QFile fs("/etc/X11/fs/config");
-	if(!(fs.exists()))
+	if (!(fs.exists()))
 	{
 		fs.setName("/usr/X11R6/lib/X11/fs/config");
-		if(!(fs.exists()))
+		if (!(fs.exists()))
 		{
 			fs.setName("/usr/X11/lib/X11/fs/config");
-			if(!(fs.exists()))
+			if (!(fs.exists()))
 				return;
 		}
 	}
@@ -1072,7 +1072,7 @@
 			pos = paths.find("\n",pos+1);
 		} while (pos > -1 && paths.mid(pos-1, 1) == ",");
 
-		if(pos<0) pos=paths.length();
+		if (pos<0) pos=paths.length();
 		paths = paths.left(pos);
 		paths = paths.simplified();
 		paths.replace(QRegExp(" "), "");
@@ -1116,14 +1116,14 @@
 	struct testCache foCache;
 	QDomDocument docu("fontcacherc");
 	QFile f(pf + "/checkfonts150.xml");
-	if(!f.open(QIODevice::ReadOnly))
+	if (!f.open(QIODevice::ReadOnly))
 		return;
 	ScCore->setSplashStatus( QObject::tr("Reading Font Cache") );
 	QTextStream ts(&f);
 	ts.setCodec("UTF-8");
 	QString errorMsg;
 	int errorLine = 0, errorColumn = 0;
-	if( !docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn) )
+	if ( !docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn) )
 	{
 		f.close();
 		return;

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp	(original)
+++ trunk/Scribus/scribus/scimage.cpp	Fri Oct  5 20:35:20 2018
@@ -372,7 +372,7 @@
 void ScImage::liberateMemory(void **memory)
 {
 	assert(memory != (void **)nullptr);
-	if(*memory == (void *)nullptr)
+	if (*memory == (void *)nullptr)
 		return;
 	free(*memory);
 	*memory=(void *) nullptr;
@@ -660,16 +660,16 @@
 	long i;
 	int mcx, mcy;
 	widthk = order;
-	if((widthk % 2) == 0)
+	if ((widthk % 2) == 0)
 		return(false);
 	normal_kernel = (double *)malloc(widthk*widthk*sizeof(double));
-	if(!normal_kernel)
+	if (!normal_kernel)
 		return(false);
 	*dest = QImage(width(), height(), QImage::Format_ARGB32);
 	normalize=0.0;
 	for(i=0; i < (widthk*widthk); i++)
 		normalize += kernel[i];
-	if(fabs(normalize) <= 1.0e-12)
+	if (fabs(normalize) <= 1.0e-12)
 		normalize=1.0;
 	normalize=1.0/normalize;
 	for(i=0; i < (widthk*widthk); i++)
@@ -718,7 +718,7 @@
 	long width;
 	long u;
 	assert(sigma != 0.0);
-	if(radius > 0.0)
+	if (radius > 0.0)
 		return((int)(2.0*ceil(radius)+1.0));
 	for(width=5; ;)
 	{
@@ -727,7 +727,7 @@
 			normalize+=exp(-((double) u*u)/(2.0*sigma*sigma))/(2.50662827463100024161235523934010416269302368164062*sigma);
 		u=width/2;
 		value=exp(-((double) u*u)/(2.0*sigma*sigma))/(2.50662827463100024161235523934010416269302368164062*sigma)/normalize;
-		if((long)(65535*value) <= 0)
+		if ((long)(65535*value) <= 0)
 			break;
 		width+=2;
 	}
@@ -740,13 +740,13 @@
 	int widthk;
 	long i, u, v;
 	QImage dest;
-	if(sigma == 0.0)
+	if (sigma == 0.0)
 		return;
 	widthk = getOptimalKernelWidth(radius, sigma);
-	if(width() < widthk)
+	if (width() < widthk)
 		return;
 	kernel = (double *)malloc(widthk*widthk*sizeof(double));
-	if(!kernel)
+	if (!kernel)
 		return;
 	i = 0;
 	normalize=0.0;
@@ -2100,7 +2100,7 @@
 					for( int xi=0; xi < w2; ++xi )
 					{
 						u = *(s+xi);
-						if(PDF) u = ~u;
+						if (PDF) u = ~u;
 						alpha[i++] = u;
 					}
 				}
@@ -2322,7 +2322,7 @@
 		if (imgInfo.colorspace == ColorSpaceCMYK)
 		{
 			isCMYK = true;
-			if(realCMYK)
+			if (realCMYK)
 				*realCMYK = true;
 		}
 		else if (imgInfo.colorspace == ColorSpaceGray)

Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp	(original)
+++ trunk/Scribus/scribus/sclayer.cpp	Fri Oct  5 20:35:20 2018
@@ -148,7 +148,7 @@
 	ScLayers::Iterator itend = end();
 	for (ScLayers::Iterator it = nullptr; it != itend; ++it)
 	{
-		if( it->Level == level)
+		if (it->Level == level)
 			return &(*it);
 	}
 	return nullptr;
@@ -159,7 +159,7 @@
 	ScLayers::Iterator itend = end();
 	for (ScLayers::Iterator it = nullptr; it != itend; ++it)
 	{
-		if( it->ID == nr)
+		if (it->ID == nr)
 			return &(*it);
 	}
 	return nullptr;
@@ -239,7 +239,7 @@
 	for (int i = 0; i < this->count(); ++i)
 	{
 		layer = &this->at(i);
-		if( layer->Level == level)
+		if (layer->Level == level)
 			return layer;
 	}
 	return nullptr;
@@ -251,7 +251,7 @@
 	for (int i = 0; i < this->count(); ++i)
 	{
 		layer = &this->at(i);
-		if( layer->ID == nr)
+		if (layer->ID == nr)
 			return layer;
 	}
 	return nullptr;
@@ -263,7 +263,7 @@
 	for (int i = 0; i < this->count(); ++i)
 	{
 		layer = &this->at(i);
-		if( layer->Name == name)
+		if (layer->Name == name)
 			return layer;
 	}
 	return nullptr;

Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp	(original)
+++ trunk/Scribus/scribus/scpainter.cpp	Fri Oct  5 20:35:20 2018
@@ -160,7 +160,7 @@
 		cairo_pop_group_to_source (m_cr);
 		if (!la.groupClip.empty())
 		{
-			if( m_fillRule )
+			if( m_fillRule)
 				cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_EVEN_ODD);
 			else
 				cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_WINDING);
@@ -450,7 +450,7 @@
 
 void ScPainter::strokePath()
 {
-//	if( LineWidth == 0 )
+//	if (LineWidth == 0)
 //		return;
 	if (m_strokeMode != 0)
 		strokePathHelper();
@@ -724,7 +724,7 @@
 {
 	cairo_save( m_cr );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	if( m_fillRule )
+	if (m_fillRule)
 		cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_EVEN_ODD);
 	else
 		cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_WINDING);
@@ -1290,26 +1290,26 @@
 {
 	cairo_save( m_cr );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	if( m_LineWidth == 0 )
+	if (m_LineWidth == 0)
 		cairo_set_line_width( m_cr, 1.0 / m_zoomFactor );
 	else
 		cairo_set_line_width( m_cr, m_LineWidth );
-	if( m_array.count() > 0 )
+	if (m_array.count() > 0)
 		cairo_set_dash( m_cr, m_array.data(), m_array.count(), m_offset);
 	else
 		cairo_set_dash( m_cr, nullptr, 0, 0 );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	if( PLineEnd == Qt::RoundCap )
+	if (PLineEnd == Qt::RoundCap)
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_ROUND);
-	else if( PLineEnd == Qt::SquareCap )
+	else if (PLineEnd == Qt::SquareCap)
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_SQUARE);
-	else if( PLineEnd == Qt::FlatCap )
+	else if (PLineEnd == Qt::FlatCap )
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_BUTT);
-	if( PLineJoin == Qt::RoundJoin )
+	if (PLineJoin == Qt::RoundJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_ROUND );
-	else if( PLineJoin == Qt::BevelJoin )
+	else if (PLineJoin == Qt::BevelJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_BEVEL );
-	else if( PLineJoin == Qt::MiterJoin )
+	else if (PLineJoin == Qt::MiterJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_MITER );
 	if (m_strokeMode == 3)
 	{

Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp	Fri Oct  5 20:35:20 2018
@@ -451,7 +451,7 @@
 {
 	cairo_save( m_cr );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	if( m_fillRule )
+	if (m_fillRule)
 		cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_EVEN_ODD);
 	else
 		cairo_set_fill_rule (m_cr, CAIRO_FILL_RULE_WINDING);
@@ -495,22 +495,22 @@
 	cairo_save( m_cr );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
 	cairo_set_line_width( m_cr, m_lineWidth );
-	if( m_array.count() > 0 )
+	if (m_array.count() > 0)
 		cairo_set_dash( m_cr, m_array.data(), m_array.count(), m_offset);
 	else
 		cairo_set_dash( m_cr, nullptr, 0, 0 );
 	cairo_set_operator(m_cr, CAIRO_OPERATOR_OVER);
-	if( m_lineEnd == Qt::RoundCap )
+	if (m_lineEnd == Qt::RoundCap)
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_ROUND);
-	else if( m_lineEnd == Qt::SquareCap )
+	else if (m_lineEnd == Qt::SquareCap)
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_SQUARE);
-	else if( m_lineEnd == Qt::FlatCap )
+	else if (m_lineEnd == Qt::FlatCap)
 		cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_BUTT);
-	if( m_lineJoin == Qt::RoundJoin )
+	if (m_lineJoin == Qt::RoundJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_ROUND );
-	else if( m_lineJoin == Qt::BevelJoin )
+	else if (m_lineJoin == Qt::BevelJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_BEVEL );
-	else if( m_lineJoin == Qt::MiterJoin )
+	else if (m_lineJoin == Qt::MiterJoin)
 		cairo_set_line_join( m_cr, CAIRO_LINE_JOIN_MITER );
 	if (m_strokeMode == 3)
 	{

Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp	Fri Oct  5 20:35:20 2018
@@ -282,18 +282,18 @@
 
 void ScPainterEx_Ps2::fillPath()
 {
-	if(!m_pathIsClosed)
+	if (!m_pathIsClosed)
 		closePath();
-	if( m_fillMode != 0)
+	if (m_fillMode != 0)
 		drawVPath( 0 );
 }
 
 void ScPainterEx_Ps2::strokePath()
 {
-	if( m_lineWidth == 0 )
+	if (m_lineWidth == 0)
 		return;
 	save();
-	if(!m_pathIsClosed)
+	if (!m_pathIsClosed)
 		closePath();
 	drawVPath( 1 );
 	restore();
@@ -421,20 +421,20 @@
 		m_stream << "]";
 		m_stream << " 0 setdash\n";
 
-		if( m_lineEnd == Qt::RoundCap )
+		if (m_lineEnd == Qt::RoundCap)
 			m_stream << "1 setlinecap\n";
-		else if( m_lineEnd == Qt::SquareCap )
+		else if (m_lineEnd == Qt::SquareCap)
 			m_stream << "2 setlinecap\n";
-		else if( m_lineEnd == Qt::FlatCap )
+		else if (m_lineEnd == Qt::FlatCap)
 			m_stream << "0 setlinecap\n";
 		else
 			m_stream << "0 setlinecap\n";
 
-		if( m_lineJoin == Qt::RoundJoin )
+		if (m_lineJoin == Qt::RoundJoin)
 			m_stream << "1 setlinejoin\n";
-		else if( m_lineJoin == Qt::BevelJoin )
+		else if (m_lineJoin == Qt::BevelJoin)
 			m_stream << "2 setlinejoin\n";
-		else if( m_lineJoin == Qt::MiterJoin )
+		else if (m_lineJoin == Qt::MiterJoin)
 			m_stream << "0 setlinejoin\n";
 		else
 			m_stream << "0 setlinejoin\n";
@@ -475,7 +475,7 @@
 		unsigned long colorIn[4];
 		unsigned long colorOut[4];
 		ScColorTransform cmsTranform = nullptr;
-		if( colorShade.color.getColorModel() == colorModelRGB )
+		if (colorShade.color.getColorModel() == colorModelRGB)
 		{
 			RGBColorF rgb;
 			ScColorEngine::getShadeColorRGB(colorShade.color, m_options.document, rgb, colorShade.shade);
@@ -701,7 +701,7 @@
 		QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
 		for( int x = 0; x < width; ++x )
 		{
-			if( qAlpha(*imageBits) != 255 )
+			if (qAlpha(*imageBits) != 255)
 			{
 				hasAlpha = true;
 				break;
@@ -1379,13 +1379,13 @@
 	for (int i = 0; i < points->size(); i++ )
 	{
 		point = points->point(i);
-		if( points->isMarker(i) )
+		if (points->isMarker(i))
 			continue;
 		transformPoint(point, point);
-		if( point.x() < left ) left = point.x();
-		if( point.x() > right ) right = point.x();
-		if( point.y() < bottom ) bottom = point.y();
-		if( point.y() > top ) top = point.y();
+		if (point.x() < left) left = point.x();
+		if (point.x() > right) right = point.x();
+		if (point.y() < bottom) bottom = point.y();
+		if (point.y() > top) top = point.y();
 	}
 	r.setCoords( qRound(left), qRound(bottom), qRound(right), qRound(top) );
 }

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Fri Oct  5 20:35:20 2018
@@ -3063,7 +3063,7 @@
 		if ((testResult != -1) && (testResult >= FORMATID_FIRSTUSER))
 		{
 			const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-			if( fmt )
+			if (fmt)
 			{
 				fmt->loadFile(data, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);
 			}
@@ -3092,7 +3092,7 @@
 	else
 	{
 		UndoTransaction pasteAction;
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 			pasteAction = m_undoManager->beginTransaction(Um::SelectionGroup, Um::IGroup, Um::Create,"",Um::ICreate);
 		view->Deselect(true);
 		int docItemCount = doc->Items->count();
@@ -3403,7 +3403,7 @@
 		}
 		doc->setLoading(true);
 		int oldItemsCount = doc->Items->count();
-		if(!fl->loadPage(doc, Nr, Mpa, renamedPageName))
+		if (!fl->loadPage(doc, Nr, Mpa, renamedPageName))
 		{
 			delete fl;
 			doc->setLoading(false);
@@ -3791,7 +3791,7 @@
 		for (auto iti = doc->Items->begin(); iti != doc->Items->end(); ++iti)
 		{
 			PageItem* ite = *iti;
-			if((ite->nextInChain() == nullptr) && !ite->isNoteFrame())  //do not layout notes frames
+			if ((ite->nextInChain() == nullptr) && !ite->isNoteFrame())  //do not layout notes frames
 				ite->layout();
 		}
 		if (!doc->marksList().isEmpty())
@@ -3804,7 +3804,7 @@
 		{
 			PageItem *ite = itf.value();
 //			qDebug() << QString("load F: %1 %2 %3").arg(azz).arg((uint)ite).arg(ite->itemType());
-			if(ite->nextInChain() == nullptr)
+			if (ite->nextInChain() == nullptr)
 				ite->layout();
 		}
 		/*qDebug("Time elapsed: %d ms", t.elapsed());*/
@@ -5538,7 +5538,7 @@
 
 	if (zoomFactor == -200.0)
 		view->rememberOldZoomLocation(qRound(doc->currentPage()->xOffset() + doc->currentPage()->width() / 2.0), h / 2 + y);
-	else if(zoomFactor == -100.0)
+	else if (zoomFactor == -100.0)
 		view->rememberOldZoomLocation(w / 2 + x, qRound(doc->currentPage()->yOffset() + doc->currentPage()->height() / 2.0));
 	else
 		view->rememberOldZoomLocation(w / 2 + x, h / 2 + y);
@@ -5892,7 +5892,7 @@
 
 void ScribusMainWindow::SetSnapElements(bool b)
 {
-	if(doc && doc->SnapElement != b)
+	if (doc && doc->SnapElement != b)
 		toggleSnapElements();
 }
 
@@ -5909,7 +5909,7 @@
 
 void ScribusMainWindow::enablePalettes(bool b)
 {
-	if(doc->appMode == modeEdit) //Keep Palettes enabled when editing text
+	if (doc->appMode == modeEdit) //Keep Palettes enabled when editing text
 		return;
 	layerPalette->setEnabled(b);
 	outlinePalette->setEnabled(b);
@@ -7469,7 +7469,7 @@
 		view->requestMode(submodeEndNodeEdit);
 
 	ScriXmlDoc ss;
-	if(ss.readElem(xml, m_prefsManager->appPrefs.fontPrefs.AvailFonts, docc, x, y, art, loca, m_prefsManager->appPrefs.fontPrefs.GFontSub))
+	if (ss.readElem(xml, m_prefsManager->appPrefs.fontPrefs.AvailFonts, docc, x, y, art, loca, m_prefsManager->appPrefs.fontPrefs.GFontSub))
 	{
 		vie->DrawNew();
 		if (doc == docc)
@@ -8188,7 +8188,7 @@
 	while(!DOC.isNull())
 	{
 		QDomElement pg = DOC.toElement();
-		if(pg.tagName() == "ITEM")
+		if (pg.tagName() == "ITEM")
 		{
 			if (first)
 				pg.setAttribute("ANNAME", doc->m_Selection->itemAt(0)->itemName());
@@ -8695,7 +8695,7 @@
 {
 	if (!HaveDoc)
 		return;
-	if(!doc->masterPageMode())
+	if (!doc->masterPageMode())
 		return;
 	editMasterPagesEnd();
 	qApp->processEvents();

Modified: trunk/Scribus/scribus/styles/styleset.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/styles/styleset.h
==============================================================================
--- trunk/Scribus/scribus/styles/styleset.h	(original)
+++ trunk/Scribus/scribus/styles/styleset.h	Fri Oct  5 20:35:20 2018
@@ -56,7 +56,7 @@
 	
 	void makeDefault(STYLE* def) { 
 		m_default = def; 
-		if(def) 
+		if (def) 
 			def->setContext(this);
 		invalidate();
 	}

Modified: trunk/Scribus/scribus/text/specialchars.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/text/specialchars.cpp
==============================================================================
--- trunk/Scribus/scribus/text/specialchars.cpp	(original)
+++ trunk/Scribus/scribus/text/specialchars.cpp	Fri Oct  5 20:35:20 2018
@@ -161,22 +161,22 @@
 		CJK_FENCE_END
 	};
 	ushort code = c.unicode();
-	if(code >= 0x3100 && code < 0xa000){
+	if (code >= 0x3100 && code < 0xa000){
 		return CJK_KANJI;
 	}
 
 	int attr = 0;
-	if(code >= 0x3000 && code < 0x3100){
+	if (code >= 0x3000 && code < 0x3100){
 		attr = attr_3000[code - 0x3000];
-	} else if( code >= 0xff00 && code <= 0xff60 ){
+	} else if ( code >= 0xff00 && code <= 0xff60 ){
 		attr = attr_ff00[code - 0xff00];
 	}
-	if( attr != 0 ){
-		if(attr == CJK_COMMA || attr == CJK_PERIOD || attr == CJK_NOTOP || attr == CJK_FENCE_END )
+	if ( attr != 0 ){
+		if (attr == CJK_COMMA || attr == CJK_PERIOD || attr == CJK_NOTOP || attr == CJK_FENCE_END )
 			attr |= CJK_NOBREAK_BEFORE;
-		else if(attr == CJK_FENCE_BEGIN )
+		else if (attr == CJK_FENCE_BEGIN )
 			attr |= CJK_NOBREAK_AFTER;
-		else if(attr == CJK_MIDPOINT || attr == CJK_HYPHEN || attr == CJK_DELMITER )
+		else if (attr == CJK_MIDPOINT || attr == CJK_HYPHEN || attr == CJK_DELMITER )
 			attr |= CJK_NOBREAK_BEFORE;
 	}
 	return attr;

Modified: trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	(original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp	Fri Oct  5 20:35:20 2018
@@ -685,7 +685,7 @@
 				if (testResult != -1)
 				{
 					const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-					if( fmt )
+					if (fmt)
 					{
 						fmt->setupTargets(m_Doc, 0, 0, 0, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 						fmt->loadFile(fileName, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted);

Modified: trunk/Scribus/scribus/ui/arrowchooser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/arrowchooser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/arrowchooser.cpp	(original)
+++ trunk/Scribus/scribus/ui/arrowchooser.cpp	Fri Oct  5 20:35:20 2018
@@ -69,7 +69,7 @@
 			QRgb *s = (QRgb*)(image.scanLine( yi ));
 			for(int xi=0; xi < wi; ++xi )
 			{
-				if((*s) == 0xffffffff)
+				if ((*s) == 0xffffffff)
 					(*s) &= 0x00ffffff;
 				s++;
 			}

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Fri Oct  5 20:35:20 2018
@@ -346,7 +346,7 @@
 			duplicateButton->setEnabled(curCol != "Registration");
 			deleteButton->setEnabled(enableDel);
 			editButton->setEnabled(enableEdit);
-			if(enableEdit)
+			if (enableEdit)
 				editColorItem();
 		}
 	}
@@ -1335,7 +1335,7 @@
 		if ((testResult != -1) && (testResult >= FORMATID_FIRSTUSER))
 		{
 			const FileFormat * fmt = LoadSavePlugin::getFormatById(testResult);
-			if( fmt )
+			if (fmt)
 			{
 				fmt->setupTargets(m_doc, nullptr, mainWin, nullptr, &(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts));
 				fmt->loadFile(data, LoadSavePlugin::lfUseCurrentPage|LoadSavePlugin::lfInteractive|LoadSavePlugin::lfScripted|LoadSavePlugin::lfKeepPatterns|LoadSavePlugin::lfLoadAsPattern);
@@ -1760,14 +1760,14 @@
 void ColorsAndFillsDialog::loadScribusFormat(const QString& fileName)
 {
 	QFile f(fileName);
-	if(!f.open(QIODevice::ReadOnly))
+	if (!f.open(QIODevice::ReadOnly))
 		return;
 	QDomDocument docu("scridoc");
 	QTextStream ts(&f);
 	ts.setCodec("UTF-8");
 	QString errorMsg;
 	int errorLine = 0, errorColumn = 0;
-	if( !docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn) )
+	if (!docu.setContent(ts.readAll(), &errorMsg, &errorLine, &errorColumn) )
 	{
 		f.close();
 		return;

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp	Fri Oct  5 20:35:20 2018
@@ -97,8 +97,6 @@
 	QMenu *menuLocking = new QMenu(this);
 	QMenu *menuSendTo = new QMenu(this);
 	QMenu *menuScrapbook = new QMenu(this);
-	QMenu *menuEdit = new QMenu(this);
-	QMenu *menuImage = new QMenu(this);
 //	QMenu *menuWeld = new QMenu(this);
 
 	//<-- Add Info
@@ -146,57 +144,19 @@
 //			currItem->createContextMenu(menuInfo, 5);
 			QAction *act = addMenu(menuInfo);
 			act->setText( tr("In&fo"));
-		}
-		else
-		{
+		} else	{
 			delete infoGroupLayout;
 			delete infoGroup;
 		}
 	}
 	//-->
 
-	//<-- Add Contents Actions
-	//This part only for text frames
-	if (m_actionList.contains("fileImportText"))
-	{
-		addSeparator();
-		menuEditContent->addAction(m_ScMW->scrActions["fileImportText"]);
-		menuEditContent->addAction(m_ScMW->scrActions["fileImportAppendText"]);
-		menuEditContent->addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
-		menuEditContent->addAction(m_ScMW->scrActions["insertSampleText"]);
-		menuEditContent->addSeparator();
-	}
-	else //enable this for, eg, text on a path
-		if (m_actionList.contains("toolsEditWithStoryEditor"))
-		{
-			addSeparator();
-			menuEditContent->addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
-		}
-	if (m_actionList.contains("fileImportImage"))
-		menuEditContent->addAction(m_ScMW->scrActions["fileImportImage"]);
-	if (selectedItemCount==1 && currItem->asImageFrame())
-	{
-		if (QApplication::clipboard()->mimeData()->hasImage())
-			menuEditContent->addAction(m_ScMW->scrActions["editPasteImageFromClipboard"]);
-	}
-	if (itemsAreSameType)
-	{
-		if (m_actionList.contains("editCopyContents"))
-			menuEditContent->addAction(m_ScMW->scrActions["editCopyContents"]);
-		if (m_actionList.contains("editPasteContents"))
-			menuEditContent->addAction(m_ScMW->scrActions["editPasteContents"]);
-		if (currItem->asImageFrame() && m_actionList.contains("editPasteContentsAbs"))
-			menuEditContent->addAction(m_ScMW->scrActions["editPasteContentsAbs"]);
-	}
-	if (m_actionList.contains("editClearContents"))
-		menuEditContent->addAction(m_ScMW->scrActions["editClearContents"]);
-	if (m_actionList.contains("editTruncateContents"))
-		menuEditContent->addAction(m_ScMW->scrActions["editTruncateContents"]);
-	if (menuEditContent->actions().count()>0)
-	{
-		QAction *act = addMenu(menuEditContent);
-		act->setText( tr("Content"));
-	}
+	//<-- Add undo
+	UndoManager * const undoManager(UndoManager::instance());
+	if (undoManager->hasUndoActions())
+		addAction(m_ScMW->scrActions["editUndoAction"]);
+	if (undoManager->hasRedoActions())
+		addAction(m_ScMW->scrActions["editRedoAction"]);
 	//-->
 
 	//<-- Item specific actions
@@ -246,14 +206,32 @@
 			addSeparator();
 			addAction(m_ScMW->scrActions["itemUpdateMarks"]);
 		}
-
-
-
-
-
+		if (m_actionList.contains("fileImportText"))
+		{
+			addSeparator();
+			addAction(m_ScMW->scrActions["fileImportText"]);
+			addAction(m_ScMW->scrActions["fileImportAppendText"]);
+			addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
+			addAction(m_ScMW->scrActions["insertSampleText"]);
+		}
+		else //enable this for, eg, text on a path
+			if (m_actionList.contains("toolsEditWithStoryEditor"))
+			{
+				addSeparator();
+				addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
+			}
 		addSeparator();
-
-
+		if (m_actionList.contains("fileImportImage"))
+			addAction(m_ScMW->scrActions["fileImportImage"]);
+		if (selectedItemCount==1 && currItem->asImageFrame())
+		{
+			if (QApplication::clipboard()->mimeData()->hasImage())
+				addAction(m_ScMW->scrActions["editPasteImageFromClipboard"]);
+		}
+		if (m_actionList.contains("itemAdjustFrameToImage"))
+			addAction(m_ScMW->scrActions["itemAdjustFrameToImage"]);
+		if (m_actionList.contains("itemAdjustImageToFrame"))
+			addAction(m_ScMW->scrActions["itemAdjustImageToFrame"]);
 
 		if (m_actionList.contains("tableInsertRows"))
 			addAction(m_ScMW->scrActions["tableInsertRows"]);
@@ -281,7 +259,17 @@
 			addAction(m_ScMW->scrActions["tableAdjustTableToFrame"]);
 		if (m_actionList.contains("itemAdjustFrameHeightToText"))
 			addAction(m_ScMW->scrActions["itemAdjustFrameHeightToText"]);
-
+		if (m_actionList.contains("itemExtendedImageProperties"))
+			addAction(m_ScMW->scrActions["itemExtendedImageProperties"]);
+		if (m_actionList.contains("itemAdjustFrameToImage"))
+		{
+			if (currItem->imageIsAvailable)
+				addAction(m_ScMW->scrActions["itemToggleInlineImage"]);
+		}
+		if (m_actionList.contains("itemImageInfo"))
+			addAction(m_ScMW->scrActions["itemImageInfo"]);
+		if (m_actionList.contains("itemUpdateImage"))
+			addAction(m_ScMW->scrActions["itemUpdateImage"]);
 		
 		if (m_actionList.contains("itemPreviewLow"))
 		{
@@ -302,28 +290,13 @@
 		}
 		
 		if (m_actionList.contains("styleImageEffects"))
-			menuImage->addAction(m_ScMW->scrActions["styleImageEffects"]);
+			addAction(m_ScMW->scrActions["styleImageEffects"]);
 		if (m_actionList.contains("editEditWithImageEditor"))
-			menuImage->addAction(m_ScMW->scrActions["editEditWithImageEditor"]);
+			addAction(m_ScMW->scrActions["editEditWithImageEditor"]);
 		if (selectedItemCount==1 && currItem->asImageFrame())
 		{
 			if (currItem->imageIsAvailable)
 			{
-				if (m_actionList.contains("itemExtendedImageProperties"))
-					menuImage->addAction(m_ScMW->scrActions["itemExtendedImageProperties"]);
-				if (m_actionList.contains("itemAdjustFrameToImage"))
-				{
-					if (currItem->imageIsAvailable)
-						menuImage->addAction(m_ScMW->scrActions["itemToggleInlineImage"]);
-				}
-				if (m_actionList.contains("itemImageInfo"))
-					menuImage->addAction(m_ScMW->scrActions["itemImageInfo"]);
-				if (m_actionList.contains("itemUpdateImage"))
-					menuImage->addAction(m_ScMW->scrActions["itemUpdateImage"]);
-				if (m_actionList.contains("itemAdjustFrameToImage"))
-					menuImage->addAction(m_ScMW->scrActions["itemAdjustFrameToImage"]);
-				if (m_actionList.contains("itemAdjustImageToFrame"))
-					menuImage->addAction(m_ScMW->scrActions["itemAdjustImageToFrame"]);
 				m_ScMW->scrActions["itemAdjustFrameToImage"]->setEnabled(true);
 				m_ScMW->scrActions["itemAdjustImageToFrame"]->setEnabled(true);
 				if (currItem->pixm.imgInfo.valid)
@@ -336,13 +309,6 @@
 					m_ScMW->scrActions["styleImageEffects"]->setEnabled(true);
 					m_ScMW->scrActions["editEditWithImageEditor"]->setEnabled(true);
 				}
-
-
-				if (menuImage->actions().count()>0)
-				{
-					QAction *act = addMenu(menuImage);
-					act->setText( tr("Image"));
-				}
 			}
 		}
 		
@@ -354,22 +320,44 @@
 	}
 	//-->
 
-
-
-
+	//<-- Item Attributes
+	if (selectedItemCount == 1)
+	{
+		addSeparator();
+		addAction(m_ScMW->scrActions["itemAttributes"]);
+	}
+	//-->
+
+	//<-- Item PDF Options
+	if (currItem->itemType() == PageItem::TextFrame)
+	{
+		QAction *act = addMenu(menuPDF);
+		act->setText( tr("&PDF Options"));
+		menuPDF->addAction(m_ScMW->scrActions["itemPDFIsAnnotation"]);
+		if (!m_doc->masterPageMode())
+			menuPDF->addAction(m_ScMW->scrActions["itemPDFIsBookmark"]);
+		if (selectedItemCount == 1)
+		{
+			menuPDF->addSeparator();
+			if (m_actionList.contains("itemPDFAnnotationProps"))
+				menuPDF->addAction(m_ScMW->scrActions["itemPDFAnnotationProps"]);
+			if (m_actionList.contains("itemPDFFieldProps"))
+				menuPDF->addAction(m_ScMW->scrActions["itemPDFFieldProps"]);
+		}
+	}
+	//-->
+
+	//<-- Item Locking
 	addSeparator();
-
+	//-->
 	
 	if (selectedItemCount>0)
 	{
-		//<-- Item Locking
 		menuLocking->addAction(m_ScMW->scrActions["itemLock"]);
 		menuLocking->addAction(m_ScMW->scrActions["itemLockSize"]);
 		QAction *actL = addMenu(menuLocking);
 		actL->setText( tr("Locking"));
-		//-->
-
-		//<-- Send To
+
 		QAction *actST = addMenu(menuSendTo);
 		actST->setText( tr("Send to"));
 		QAction *actScr = menuSendTo->addMenu(menuScrapbook);
@@ -408,8 +396,6 @@
 		}
 		//-->
 	}
-
-
 	//<-- Add Groups Items
 	if (selectedItemCount > 1)
 	{
@@ -426,7 +412,7 @@
 	}
 	//-->
 
-	//<-- Add Level Items
+	//<-- Add Level Item
 	if (!currItem->locked())
 	{
 		menuLevel->addAction(m_ScMW->scrActions["itemRaise"]);
@@ -463,43 +449,17 @@
 		}
 	}
 	//-->
-	//<-- Item Attributes
-	if (selectedItemCount == 1)
-	{
-		addSeparator();
-		addAction(m_ScMW->scrActions["itemAttributes"]);
-	}
-	//-->
-
-	//<-- Item PDF Options
-	if (currItem->itemType() == PageItem::TextFrame)
-	{
-		QAction *act = addMenu(menuPDF);
-		act->setText( tr("&PDF Options"));
-		menuPDF->addAction(m_ScMW->scrActions["itemPDFIsAnnotation"]);
-		if (!m_doc->masterPageMode())
-			menuPDF->addAction(m_ScMW->scrActions["itemPDFIsBookmark"]);
-		if (selectedItemCount == 1)
-		{
-			menuPDF->addSeparator();
-			if (m_actionList.contains("itemPDFAnnotationProps"))
-				menuPDF->addAction(m_ScMW->scrActions["itemPDFAnnotationProps"]);
-			if (m_actionList.contains("itemPDFFieldProps"))
-				menuPDF->addAction(m_ScMW->scrActions["itemPDFFieldProps"]);
-		}
-	}
-	//-->
-	//<<-- Edit Menu
+	
+	//<-- Add Copy/Paste Actions
 	addSeparator();
-	//<-- Add Copy/Paste Actions
 	if (!currItem->locked() && !(currItem->isSingleSel))
-		menuEdit->addAction(m_ScMW->scrActions["editCut"]);
+		addAction(m_ScMW->scrActions["editCut"]);
 	if (!(currItem->isSingleSel))
-		menuEdit->addAction(m_ScMW->scrActions["editCopy"]);
+		addAction(m_ScMW->scrActions["editCopy"]);
 	if (((m_doc->appMode == modeEdit && currItem->itemType() == PageItem::TextFrame) || (m_doc->appMode == modeEditTable && currItem->itemType() == PageItem::Table)) && (ScMimeData::clipboardHasScribusText()||ScMimeData::clipboardHasPlainText()) )
-		menuEdit->addAction(m_ScMW->scrActions["editPaste"]);
+		addAction(m_ScMW->scrActions["editPaste"]);
 	if (!currItem->locked() && (m_doc->appMode != modeEdit)  && (m_doc->appMode != modeEditTable) && (!(currItem->isSingleSel)))
-		menuEdit->addAction(m_ScMW->scrActions["itemDelete"]);
+		addAction(m_ScMW->scrActions["itemDelete"]);
 
 //<<#14678
 	if ((ScMimeData::clipboardHasScribusElem() || ScMimeData::clipboardHasScribusFragment()) &&
@@ -508,22 +468,33 @@
 		FPoint fp = m_doc->view()->m_canvas->globalToCanvas(QCursor::pos());
 		m_doc->view()->dragX = fp.x();
 		m_doc->view()->dragY = fp.y();
-		menuEdit->addAction( tr("&Paste Here") , m_doc->view(), SLOT(PasteToPage()));
+		addAction( tr("&Paste Here") , m_doc->view(), SLOT(PasteToPage()));
 	}
 //>>#14678
 
 
 
 	//-->
-	//<-- Add undo
-	UndoManager * const undoManager(UndoManager::instance());
-	if (undoManager->hasUndoActions())
-		menuEdit->addAction(m_ScMW->scrActions["editUndoAction"]);
-	if (undoManager->hasRedoActions())
-		menuEdit->addAction(m_ScMW->scrActions["editRedoAction"]);
-	QAction *actEdit = addMenu(menuEdit);
-	actEdit->setText( tr("Edit"));
-	//-->
+	
+	//<-- Add Contents Actions
+	if (itemsAreSameType)
+	{
+		if (m_actionList.contains("editCopyContents"))
+			menuEditContent->addAction(m_ScMW->scrActions["editCopyContents"]);
+		if (m_actionList.contains("editPasteContents"))
+			menuEditContent->addAction(m_ScMW->scrActions["editPasteContents"]);
+		if (currItem->asImageFrame() && m_actionList.contains("editPasteContentsAbs"))
+			menuEditContent->addAction(m_ScMW->scrActions["editPasteContentsAbs"]);
+	}
+	if (m_actionList.contains("editClearContents"))
+		menuEditContent->addAction(m_ScMW->scrActions["editClearContents"]);
+	if (m_actionList.contains("editTruncateContents"))
+		menuEditContent->addAction(m_ScMW->scrActions["editTruncateContents"]);
+	if (menuEditContent->actions().count()>0)
+	{
+		QAction *act = addMenu(menuEditContent);
+		act->setText( tr("Content"));
+	}
 	//-->
 	
 	//<-- Add Welding Menu
@@ -567,7 +538,6 @@
 	if (containsTextFrame)
 		addAction(m_ScMW->scrActions["toolsText"]);
 	//-->
-
 }
 
 void ContextMenu::createMenuItems_NoSelection(double mx, double my)

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp	Fri Oct  5 20:35:20 2018
@@ -317,9 +317,9 @@
 		setMeshPatchPoint();
 	else
 		setMeshPoint();
-	if(CGradDia && gradEditButton->isChecked())
-	{
-		if(tabFillStroke->currentIndex() == 0)
+	if (CGradDia && gradEditButton->isChecked())
+	{
+		if (tabFillStroke->currentIndex() == 0)
 			setGradientVectorValues();
 		else
 			setGradientVectorStrokeValues();
@@ -1374,7 +1374,7 @@
 		if ((grow == -1) || (gcol == 0))
 			return;
 		ScItemState<QPair<MeshPoint,MeshPoint> > *ss = nullptr;
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 		{
 			ss = new ScItemState<QPair<MeshPoint,MeshPoint> >(Um::GradPos);
 			ss->set("MOVE_MESH_PATCH");
@@ -1390,7 +1390,7 @@
 					tmp.controlBottom = tmp.gridPoint;
 				if (cont == 4)
 					tmp.controlRight  = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].TL,tmp));
 				currentItem->meshGradientPatches[grow].TL = tmp;
 				break;
@@ -1400,7 +1400,7 @@
 					tmp.controlBottom = tmp.gridPoint;
 				if (cont == 3)
 					tmp.controlLeft   = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].TR,tmp));
 				currentItem->meshGradientPatches[grow].TR = tmp;
 				break;
@@ -1410,7 +1410,7 @@
 					tmp.controlTop  = tmp.gridPoint;
 				if (cont == 3)
 					tmp.controlLeft = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].BR,tmp));
 				currentItem->meshGradientPatches[grow].BR = tmp;
 				break;
@@ -1420,12 +1420,12 @@
 					tmp.controlTop   = tmp.gridPoint;
 				if (cont == 4)
 					tmp.controlRight = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].BL,tmp));
 				currentItem->meshGradientPatches[grow].BL = tmp;
 				break;
 		}
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 			undoManager->action(currentItem,ss);
 	}
 	else
@@ -1443,7 +1443,7 @@
 		else if (cont == 4)
 			tmp.controlRight  = tmp.gridPoint;
 
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 		{
 			ScItemState<QPair<MeshPoint,MeshPoint> > *ss = new ScItemState<QPair<MeshPoint,MeshPoint> >(Um::GradPos);
 			ss->set("MOVE_MESH_PATCH");
@@ -1469,7 +1469,7 @@
 		if ((grow == -1) || (gcol == 0))
 			return;
 		ScItemState<QPair<MeshPoint,MeshPoint> > *ss = nullptr;
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 		{
 			ss = new ScItemState<QPair<MeshPoint,MeshPoint> >(Um::GradPos);
 			ss->set("MOVE_MESH_PATCH");
@@ -1485,7 +1485,7 @@
 				tmp.controlLeft   = tmp.gridPoint;
 				tmp.controlRight  = tmp.gridPoint;
 				tmp.controlBottom = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].TL,tmp));
 				currentItem->meshGradientPatches[grow].TL = tmp;
 		break;
@@ -1495,7 +1495,7 @@
 				tmp.controlLeft   = tmp.gridPoint;
 				tmp.controlRight  = tmp.gridPoint;
 				tmp.controlBottom = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].TR,tmp));
 				currentItem->meshGradientPatches[grow].TR = tmp;
 		break;
@@ -1505,7 +1505,7 @@
 				tmp.controlLeft   = tmp.gridPoint;
 				tmp.controlRight  = tmp.gridPoint;
 				tmp.controlBottom = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].BR,tmp));
 				currentItem->meshGradientPatches[grow].BR = tmp;
 		break;
@@ -1515,12 +1515,12 @@
 				tmp.controlLeft   = tmp.gridPoint;
 				tmp.controlRight  = tmp.gridPoint;
 				tmp.controlBottom = tmp.gridPoint;
-				if(UndoManager::undoEnabled())
+				if (UndoManager::undoEnabled())
 					ss->setItem(qMakePair(currentItem->meshGradientPatches[grow].BL,tmp));
 				currentItem->meshGradientPatches[grow].BL = tmp;
 		break;
 		}
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 			undoManager->action(currentItem,ss);
 	}
 	else
@@ -1532,7 +1532,7 @@
 		tmp.controlLeft   = tmp.gridPoint;
 		tmp.controlRight  = tmp.gridPoint;
 		tmp.controlBottom = tmp.gridPoint;
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 		{
 			ScItemState<QPair<MeshPoint,MeshPoint> > *ss = new ScItemState<QPair<MeshPoint,MeshPoint> >(Um::GradPos);
 			ss->set("MOVE_MESH_PATCH");
@@ -1697,7 +1697,7 @@
 {
 	if ((currentItem->selectedMeshPointX > -1) && (currentItem->meshGradientPatches.count() > 1))
 	{
-		if(UndoManager::undoEnabled())
+		if (UndoManager::undoEnabled())
 		{
 			ScItemState<meshGradientPatch> *ss = new ScItemState<meshGradientPatch>(Um::RemoveMeshPatch,"",Um::ILine);
 			ss->set("REMOVE_MESH_PATCH");

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp	Fri Oct  5 20:35:20 2018
@@ -91,7 +91,7 @@
 	for (int dh = 0; dh < m_points.size(); dh++)
 	{
 		FPoint p = m_points.point(dh);
-		if(p == m_grab_point)
+		if (p == m_grab_point)
 		{
 			p1.setPen(QPen(Qt::red, 3, Qt::SolidLine));
 			p1.drawEllipse( int(p.x() * wWidth) - 2, wHeight - 2 - int(p.y() * wHeight), 4, 4 );
@@ -107,7 +107,7 @@
 
 void KCurve::keyPressEvent(QKeyEvent *e)
 {
-	if(e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace)
+	if (e->key() == Qt::Key_Delete || e->key() == Qt::Key_Backspace)
 	{
 		if (m_points.size() > 2)
 		{
@@ -172,10 +172,10 @@
 	m_grabOffsetY = m_grab_point.y() - y;
 	m_grab_point = FPoint(x + m_grabOffsetX, y + m_grabOffsetY);
 	double curveVal = getCurveValue(x);
-	if(distance * width() > 5)
+	if (distance * width() > 5)
 	{
 		m_dragging = false;
-		if(fabs(y - curveVal) * width() > 5)
+		if (fabs(y - curveVal) * width() > 5)
 			return;
 		if (m_points.size() < 14)
 		{
@@ -198,7 +198,7 @@
 	}
 	else
 	{
-		if(fabs(y - closest_point.y()) * width() > 5)
+		if (fabs(y - closest_point.y()) * width() > 5)
 			return;
 		m_dragging = true;
 		setCursor(QCursor(Qt::CrossCursor));
@@ -212,9 +212,9 @@
 		p = m_points.point(cc);
 		if (p != m_grab_point)
 		{
-			if(p.x() > m_leftmost && p.x() < x)
+			if (p.x() > m_leftmost && p.x() < x)
 				m_leftmost = p.x();
-			if(p.x() < m_rightmost && p.x() > x)
+			if (p.x() < m_rightmost && p.x() > x)
 				m_rightmost = p.x();
 		}
 		cc++;
@@ -265,11 +265,11 @@
 		y += m_grabOffsetY;
 		if (x <= m_leftmost)
 			x = m_leftmost + 1E-4; // the addition so we can grab the dot later.
-		if(x >= m_rightmost)
+		if (x >= m_rightmost)
 			x = m_rightmost - 1E-4;
-		if(y > 1.0)
+		if (y > 1.0)
 			y = 1.0;
-		if(y < 0.0)
+		if (y < 0.0)
 			y = 0.0;
 		m_grab_point = FPoint(x, y);
 		m_points.setPoint( m_pos, m_grab_point);

Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp	Fri Oct  5 20:35:20 2018
@@ -152,7 +152,7 @@
 
 void FontComboH::languageChange()
 {
-	if(showLabels)
+	if (showLabels)
 	{
 		fontFaceLabel->setText( tr("Family:"));
 		fontStyleLabel->setText( tr("Style:"));

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp	Fri Oct  5 20:35:20 2018
@@ -748,7 +748,7 @@
 
 void SMPStyleWidget::showAlignment(QList<ParagraphStyle*> &pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showAlignment called with an empty list of styles";
 		return;
@@ -772,7 +772,7 @@
 
 void SMPStyleWidget::showDirection(QList<ParagraphStyle*> &pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showDirection called with an empty list of styles";
 		return;
@@ -796,7 +796,7 @@
 
 void SMPStyleWidget::showOpticalMargin(QList< ParagraphStyle * > & pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showOpticalMargin called with an empty list of styles";
 		return;
@@ -826,7 +826,7 @@
 
 void SMPStyleWidget::showMinSpace(QList< ParagraphStyle * > & pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showMinSpace called with an empty list of styles";
 		return;
@@ -846,7 +846,7 @@
 
 void SMPStyleWidget::showMinGlyphExt(QList< ParagraphStyle * > & pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showMinGlyphExt called with an empty list of styles";
 		return;
@@ -866,7 +866,7 @@
 
 void SMPStyleWidget::showMaxGlyphExt(QList< ParagraphStyle * > & pstyles)
 {
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showMaxGlyphExt called with an empty list of styles";
 		return;
@@ -887,7 +887,7 @@
 void SMPStyleWidget::showConsecutiveLines(QList<ParagraphStyle *> &pstyles)
 {
 
-	if(pstyles.isEmpty())
+	if (pstyles.isEmpty())
 	{
 		qDebug()<<"Warning showConsecutiveLines called with an empty list of styles";
 		return;
@@ -1023,11 +1023,11 @@
 
 	if (parent==nullptr)
 	{
-		if(om == ParagraphStyle::OM_Default)
+		if (om == ParagraphStyle::OM_Default)
 			optMarginRadioBoth->setChecked(true);
-		else if(om == ParagraphStyle::OM_LeftHangingPunct)
+		else if (om == ParagraphStyle::OM_LeftHangingPunct)
 			optMarginRadioLeft->setChecked(true);
-		else if(om == ParagraphStyle::OM_RightHangingPunct)
+		else if (om == ParagraphStyle::OM_RightHangingPunct)
 			optMarginRadioRight->setChecked(true);
 		else
 			optMarginRadioNone->setChecked(true);
@@ -1036,13 +1036,13 @@
 	{
 		optMarginParentButton->setVisible(!inhO);
 
-		if(om == ParagraphStyle::OM_Default)
+		if (om == ParagraphStyle::OM_Default)
 			optMarginRadioBoth->setChecked(true,
 				(parent->opticalMargins() == ParagraphStyle::OM_Default));
-		else if(om == ParagraphStyle::OM_LeftHangingPunct)
+		else if (om == ParagraphStyle::OM_LeftHangingPunct)
 			optMarginRadioLeft->setChecked(true,
 				(parent->opticalMargins() == ParagraphStyle::OM_LeftHangingPunct));
-		else if(om == ParagraphStyle::OM_RightHangingPunct)
+		else if (om == ParagraphStyle::OM_RightHangingPunct)
 			optMarginRadioRight->setChecked(true,
 				(parent->opticalMargins() == ParagraphStyle::OM_RightHangingPunct));
 		else

Modified: trunk/Scribus/scribus/ui/smsccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/smsccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.cpp	(original)
+++ trunk/Scribus/scribus/ui/smsccombobox.cpp	Fri Oct  5 20:35:20 2018
@@ -50,7 +50,7 @@
 	m_pItem = 0;
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toInt() == i)
+		if (itemData(idx).toInt() == i)
 			ScComboBox::setCurrentIndex(idx);
 	}
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -69,7 +69,7 @@
 
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toInt() == i)
+		if (itemData(idx).toInt() == i)
 		{
 			ScComboBox::setCurrentIndex(idx);
 			m_pItem = idx;
@@ -86,7 +86,7 @@
 	m_pItem = 0;
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toDouble() == d)
+		if (itemData(idx).toDouble() == d)
 			ScComboBox::setCurrentIndex(idx);
 	}
 	connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
@@ -105,7 +105,7 @@
 
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toDouble() == d)
+		if (itemData(idx).toDouble() == d)
 		{
 			ScComboBox::setCurrentIndex(idx);
 			m_pItem = idx;
@@ -118,7 +118,7 @@
 {
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toInt() == i)
+		if (itemData(idx).toInt() == i)
 		{
 			return idx;
 		}
@@ -130,7 +130,7 @@
 {
 	for(int idx(0); idx < count(); ++idx)
 	{
-		if(itemData(idx).toDouble() == d)
+		if (itemData(idx).toDouble() == d)
 		{
 			return idx;
 		}

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22721&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Fri Oct  5 20:35:20 2018
@@ -311,14 +311,14 @@
 	SuspendContentsChange = 1;	// prevent our handler from doing anything
 	bool changed = false;
 	int pos;
-	if(textCursor().hasSelection())
+	if (textCursor().hasSelection())
 	{
 		pos =  textCursor().selectionStart();
 		StyledText.removeChars(pos, textCursor().selectionEnd() - pos);
 		changed = true;
 	}
 	pos = -1;
-	if(!uc.isEmpty())
+	if (!uc.isEmpty())
 	{
 		pos = textCursor().hasSelection() ? textCursor().selectionStart() : textCursor().position();
 		pos = qMin(pos, StyledText.length());
@@ -326,12 +326,12 @@
 	}
 	QTextEdit::inputMethodEvent(event);
 	SuspendContentsChange = 0;
-	if(pos >= 0)
+	if (pos >= 0)
 	{
 		handleContentsChange(pos, 0, uc.length());
 		changed = true;
 	}
-	if(changed)
+	if (changed)
 	{
 		emit SideBarUp(true);
 		emit SideBarUpdate();
@@ -482,7 +482,7 @@
 {
 	// As of Qt 4.7.4, Cococa-QTextEdit output of input method is broken.
 	// We need a workaround to avoit the bug.
-	if(SuspendContentsChange != 0)
+	if (SuspendContentsChange != 0)
 		return;
 	if (blockContentsChangeHook <= 0)
 	{
@@ -2334,7 +2334,7 @@
 
 void StoryEditor::newTxFont(const QString &f)
 {
-	if(!m_doc->UsedFonts.contains(f)) {
+	if (!m_doc->UsedFonts.contains(f)) {
 		if (!m_doc->AddFont(f)) {
 //, prefsManager->appPrefs.AvailFonts[f]->Font)) {
 			FontTools->Fonts->RebuildList(m_doc);




More information about the scribus-commit mailing list