r22724 by jghali - code style fixes

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


Author: jghali
Date: Fri Oct  5 22:20:36 2018
New Revision: 22724

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

Modified:
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/fileloader.cpp
    trunk/Scribus/scribus/fonts/cff.cpp
    trunk/Scribus/scribus/fonts/sfnt.cpp
    trunk/Scribus/scribus/fpointarray.cpp
    trunk/Scribus/scribus/iconmanager.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdf_analyzer.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/pdfwriter.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
    trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
    trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
    trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/schelptreemodel.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scxmlstreamreader.cpp
    trunk/Scribus/scribus/styles/styleset.h
    trunk/Scribus/scribus/text/screenpainter.cpp
    trunk/Scribus/scribus/text/sctext_shared.cpp
    trunk/Scribus/scribus/text/storytext.cpp
    trunk/Scribus/scribus/text/textshaper.cpp
    trunk/Scribus/scribus/ui/aligndistribute.cpp
    trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/hruler.cpp
    trunk/Scribus/scribus/ui/insertaframe.cpp
    trunk/Scribus/scribus/ui/loremipsum.cpp
    trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
    trunk/Scribus/scribus/ui/prefs_spelling.cpp
    trunk/Scribus/scribus/ui/resourcemanager.cpp
    trunk/Scribus/scribus/ui/scrspinbox.cpp
    trunk/Scribus/scribus/ui/smreplacedia.cpp
    trunk/Scribus/scribus/undomanager.cpp
    trunk/Scribus/scribus/upgradechecker.cpp
    trunk/Scribus/scribus/util.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Fri Oct  5 22:20:36 2018
@@ -1695,7 +1695,7 @@
 			}
 		}
 	}
-	switch(kk)
+	switch (kk)
 	{
 		case Qt::Key_Left:
 		case Qt::Key_Right:

Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp	Fri Oct  5 22:20:36 2018
@@ -977,7 +977,7 @@
 		ss->set("X",m_currItem->selectedMeshPointX);
 		ss->set("Y",m_currItem->selectedMeshPointY);
 		ss->set("ARRAY",false);
-		switch(m_currItem->selectedMeshPointY){
+		switch (m_currItem->selectedMeshPointY){
 			case 1:
 				if ((*m_old_mesh) == m_currItem->meshGradientPatches[m_currItem->selectedMeshPointX].TL)
 				{

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp	Fri Oct  5 22:20:36 2018
@@ -50,7 +50,7 @@
 	m_imageList = l;
 	if (l.size()==1)
 	{
-		while(!(m_doc->m_Selection->itemAt(0)->isImageFrame()))
+		while (!(m_doc->m_Selection->itemAt(0)->isImageFrame()))
 			m_doc->m_Selection->removeFirst();
 		if (!m_doc->m_Selection->isEmpty())
 		{

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp	Fri Oct  5 22:20:36 2018
@@ -1050,7 +1050,7 @@
 			// hm, I will try to be more explicit :) - pm
 			int itemIndex = m_doc->Items->count();
 			PageItem* underItem( m_canvas->itemUnderItem(currItem, itemIndex) );
-			while(underItem)
+			while (underItem)
 			{
 				if (underItem->asTextFrame())
 					underItem->asTextFrame()->invalidateLayout(false);

Modified: trunk/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/fileloader.cpp
==============================================================================
--- trunk/Scribus/scribus/fileloader.cpp	(original)
+++ trunk/Scribus/scribus/fileloader.cpp	Fri Oct  5 22:20:36 2018
@@ -396,7 +396,7 @@
 	{
 		QList<ParagraphStyle::TabRecord> tbs;
 		QDomNode IT = pg.firstChild();
-		while(!IT.isNull())
+		while (!IT.isNull())
 		{
 			QDomElement it = IT.toElement();
 			if (it.tagName()=="Tabs")

Modified: trunk/Scribus/scribus/fonts/cff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/fonts/cff.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/cff.cpp	(original)
+++ trunk/Scribus/scribus/fonts/cff.cpp	Fri Oct  5 22:20:36 2018
@@ -950,7 +950,7 @@
 	QByteArray CFF::dump(const CFF_Variant& var) const
 	{
 		QByteArray result;
-		switch(var.type)
+		switch (var.type)
 		{
 			case cff_varnt_Error:
 				result += "ERROR";

Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp	(original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp	Fri Oct  5 22:20:36 2018
@@ -701,7 +701,7 @@
 			format = symbolFormat;
 		}
 		//qDebug() << "reading cmap format" << format;
-		switch(format)
+		switch (format)
 		{
 			case 4:
 			{

Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp	(original)
+++ trunk/Scribus/scribus/fpointarray.cpp	Fri Oct  5 22:20:36 2018
@@ -148,7 +148,7 @@
 	p += index;
 	ConstIterator q = from.begin();
 	q += fromIndex;
-	while( --nPoints >= 0 )
+	while (--nPoints >= 0)
 	{
 		*p++ = *q++;
     }
@@ -846,12 +846,12 @@
 	}
 	
 	// 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
 	{
 		ptr++;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 	
@@ -869,7 +869,7 @@
 		}
 		
 		exponent = 0;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		{
 			exponent *= 10;
 			exponent += *ptr - '0';

Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp	(original)
+++ trunk/Scribus/scribus/iconmanager.cpp	Fri Oct  5 22:20:36 2018
@@ -109,10 +109,10 @@
 			QDomElement docElem = xmlData.documentElement();
 			QDomNode n = docElem.firstChild();
 			ScIconSetData isd;
-			while( !n.isNull() )
+			while (!n.isNull())
 			{
 				QDomElement e = n.toElement();
-				if( !e.isNull() )
+				if (!e.isNull())
 				{
 					//qDebug()<<e.tagName()<<e.text();
 					if (e.tagName()=="path")

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -1705,7 +1705,7 @@
 	quint16 count = 0;
 	uchar c, c2;
 	quint16 len;
-	while( count < in.size() )
+	while (count < in.size())
 	{
 		c = *ptrIn++;
 		count++;
@@ -1715,7 +1715,7 @@
 			// Copy next len+1 bytes literally.
 			len++;
 			len *= multByte;
-			while( len != 0 )
+			while (len != 0)
 			{
 				*ptrOut++ = *ptrIn++;
 				len--;
@@ -1741,7 +1741,7 @@
 				count++;
 				c2 = *ptrIn++;
 				count++;
-				while( len != 0 )
+				while (len != 0)
 				{
 					*ptrOut++ = c;
 					*ptrOut++ = c2;
@@ -1753,7 +1753,7 @@
 			{
 				c = *ptrIn++;
 				count++;
-				while( len != 0 )
+				while (len != 0)
 				{
 					*ptrOut++ = c;
 					len--;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_psd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -718,7 +718,7 @@
 			ptr = tmpImg.scanLine(hh);
 			ptr2 = ptr+tmpImg.width() * tmpImg.channels();
 			ptr += component;
-			while( count < pixel_count )
+			while (count < pixel_count)
 			{
 				if (s.atEnd())
 					return false;
@@ -729,7 +729,7 @@
 					// Copy next len+1 bytes literally.
 					len++;
 					count += len;
-					while( len != 0 )
+					while (len != 0)
 					{
 						s >> cbyte;
 						if (ptr < ptr2)
@@ -779,7 +779,7 @@
 					s >> val;
 					if ((header.color_mode == CM_CMYK) && (component < 4))
 						val = 255 - val;
-					while( len != 0 )
+					while (len != 0)
 					{
 						if (ptr < ptr2)
 						{
@@ -862,7 +862,7 @@
 	uint components[40];
 	for (uint channel = 0; channel < channel_num; channel++)
 	{
-		switch(layerInfo[layer].channelType[channel])
+		switch (layerInfo[layer].channelType[channel])
 		{
 		case 0:
 			components[channel] = 0;
@@ -1364,7 +1364,7 @@
 		{
 			ptr = r_image.bits() + components[channel];
 			count = 0;
-			while( count < pixel_count )
+			while (count < pixel_count)
 			{
 				if (s.atEnd())
 					return false;
@@ -1424,7 +1424,7 @@
 					s >> val;
 					if ((header.color_mode == CM_CMYK) && (components[channel] < 4))
 						val = 255 - val;
-					while( len != 0 )
+					while (len != 0)
 					{
 						if ((header.color_mode == CM_GRAYSCALE) && (components[channel] != 3))
 						{

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_tiff.cpp	Fri Oct  5 22:20:36 2018
@@ -1095,7 +1095,7 @@
 			uchar *ptr = tmpImg.scanLine(hh);
 			uchar *ptr2 = ptr+tmpImg.width() * tmpImg.channels();
 			ptr += component;
-			while( count < pixel_count )
+			while (count < pixel_count)
 			{
 				uchar c;
 				if (s.atEnd())
@@ -1107,7 +1107,7 @@
 					// Copy next len+1 bytes literally.
 					len++;
 					count += len;
-					while( len != 0 )
+					while (len != 0)
 					{
 						s >> cbyte;
 						if (ptr < ptr2)
@@ -1140,7 +1140,7 @@
 					s >> val;
 					if ((header.color_mode == CM_CMYK) && (component < 4))
 						val = 255 - val;
-					while( len != 0 )
+					while (len != 0)
 					{
 						if (ptr < ptr2)
 						{
@@ -1353,7 +1353,7 @@
 	uint components[40];
 	for (uint channel = 0; channel < channel_num; channel++)
 	{
-		switch(layerInfo[layer].channelType[channel])
+		switch (layerInfo[layer].channelType[channel])
 		{
 		case 0:
 			components[channel] = 0;

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp	Fri Oct  5 22:20:36 2018
@@ -226,7 +226,7 @@
 	{
 		libwpg::WPGPathElement element = path.element(i);
 		libwpg::WPGPoint point = element.point;
-		switch(element.type)
+		switch (element.type)
 		{
 			case libwpg::WPGPathElement::MoveToElement:
 				Coords.moveTo(72 * point.x, 72 * point.y);

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Fri Oct  5 22:20:36 2018
@@ -2280,7 +2280,7 @@
 		embedded->invalid = true;
 		double pws = embedded->m_lineWidth;
 		embedded->DrawObj_Pre(p);
-		switch(embedded->itemType())
+		switch (embedded->itemType())
 		{
 			case ImageFrame:
 			case TextFrame:
@@ -2712,7 +2712,7 @@
 	{
 		if (!m_Doc->PageColors.contains(GrColorP1))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -2752,7 +2752,7 @@
 	{
 		if (!m_Doc->PageColors.contains(GrColorP2))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -2792,7 +2792,7 @@
 	{
 		if (!m_Doc->PageColors.contains(GrColorP3))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -2832,7 +2832,7 @@
 	{
 		if (!m_Doc->PageColors.contains(GrColorP4))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -2903,7 +2903,7 @@
 	{
 		if (!m_Doc->PageColors.contains(MColor))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -3122,7 +3122,7 @@
 	{
 		if (!m_Doc->PageColors.contains(fillColorVal))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -3680,7 +3680,7 @@
 	{
 		if (!m_Doc->PageColors.contains(newColor))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -3782,7 +3782,7 @@
 	{
 		if (!m_Doc->PageColors.contains(newColor))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case TextFrame:
 				case PathText:
@@ -3904,7 +3904,7 @@
 	{
 		if (!m_Doc->PageColors.contains(lineColorVal))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case TextFrame:
 				case PathText:
@@ -3945,7 +3945,7 @@
 	{
 		if (!m_Doc->PageColors.contains(fillColorVal))
 		{
-			switch(itemType())
+			switch (itemType())
 			{
 				case ImageFrame:
 				case LatexFrame:
@@ -6108,7 +6108,8 @@
 		if (is->getBool("ARRAY"))
 			meshGradientArray[x][y] = is->getItem().first;
 		else
-			switch(y){
+			switch (y)
+			{
 				case 1:
 					meshGradientPatches[x].TL = is->getItem().first;
 					break;
@@ -6128,7 +6129,8 @@
 		if (is->getBool("ARRAY"))
 			meshGradientArray[x][y] = is->getItem().second;
 		else
-			switch(y){
+			switch (y)
+			{
 				case 1:
 					meshGradientPatches[x].TL = is->getItem().second;
 					break;

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Fri Oct  5 22:20:36 2018
@@ -4962,10 +4962,10 @@
 	{
 		itemText.deselectAll();
 		PageItem *item = this;
-		while( item->prevInChain() )
-			item=item->prevInChain();
-
-		while ( item )
+		while (item->prevInChain())
+			item = item->prevInChain();
+
+		while (item)
 		{
 			item->HasSel = false;
 			item = item->nextInChain();
@@ -5037,7 +5037,7 @@
 		p->drawSharpLine(FPoint(m_textDistanceMargins.left() + lineCorr, m_textDistanceMargins.top() + lineCorr), FPoint(m_width - m_textDistanceMargins.right() - lineCorr, m_textDistanceMargins.top() + lineCorr));
 	if (m_textDistanceMargins.bottom() + lineCorr!=0.0)
 		p->drawSharpLine(FPoint(m_textDistanceMargins.left() + lineCorr, m_height - m_textDistanceMargins.bottom() - lineCorr), FPoint(m_width - m_textDistanceMargins.right() - lineCorr, m_height - m_textDistanceMargins.bottom() - lineCorr));
-	while(curCol < Cols)
+	while (curCol < Cols)
 	{
 		colLeft=(colWidth + ColGap) * curCol + m_textDistanceMargins.left() + lineCorr;
 		if (colLeft != 0.0)

Modified: trunk/Scribus/scribus/pdf_analyzer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/pdf_analyzer.cpp
==============================================================================
--- trunk/Scribus/scribus/pdf_analyzer.cpp	(original)
+++ trunk/Scribus/scribus/pdf_analyzer.cpp	Fri Oct  5 22:20:36 2018
@@ -238,7 +238,7 @@
 			else if (t == ePdfContentsType_Keyword)
 			{
 				QString kw(kwText);
-				switch(kwNameMap.value(kw, KW_Undefined))
+				switch (kwNameMap.value(kw, KW_Undefined))
 				{
 				case KW_q:
 					gsStack.push(currGS);

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Fri Oct  5 22:20:36 2018
@@ -10012,7 +10012,7 @@
 				{
 					nextObj = doc->GetObjects().GetObject(carray[ci].GetReference());
 
-					while(nextObj != nullptr)
+					while (nextObj != nullptr)
 					{
 
 						if (nextObj->IsReference())

Modified: trunk/Scribus/scribus/pdfwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/pdfwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.cpp	(original)
+++ trunk/Scribus/scribus/pdfwriter.cpp	Fri Oct  5 22:20:36 2018
@@ -47,7 +47,7 @@
 	{
 		uchar row = c.row();
 		uchar cell = c.cell();
-		switch(row)
+		switch (row)
 		{
 			case 0:
 				if (cell <= 23

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Fri Oct  5 22:20:36 2018
@@ -254,7 +254,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
@@ -1087,7 +1087,7 @@
 	ScXmlStreamAttributes attrs;
 
 	doc->clearPageSets();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		QStringRef tagName = reader.name();
@@ -1501,7 +1501,7 @@
 	ml = multiLine();
 	ScXmlStreamAttributes rattrs = reader.scAttributes();
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType == ScXmlStreamReader::EndElement && reader.name() == tagName)
@@ -1606,7 +1606,7 @@
 	doc->pdfOptions().openAction    = attrs.valueAsString("openAction", "");
 
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && (reader.name() == tagName))
@@ -1687,7 +1687,7 @@
 	doc->Print_Options.copies = 1;
 
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
 		QStringRef tName = reader.name();
@@ -1703,7 +1703,7 @@
 {
 	QStringRef tagName = reader.name();
 	doc->clearItemAttributes();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -1729,7 +1729,7 @@
 {
 	QStringRef tagName = reader.name();
 	m_Doc->clearTocSetups();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -1759,7 +1759,7 @@
 bool Scribus134Format::readSections(ScribusDoc* doc, ScXmlStreamReader& reader)
 {
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -1801,7 +1801,7 @@
 		doc->createHyphenator();
 
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -1956,7 +1956,7 @@
 	QList<ParagraphStyle::TabRecord> tabValues;
 
 	LastStyles * lastStyle = new LastStyles();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		ScXmlStreamReader::TokenType tType = reader.readNext();
 		if (reader.isEndElement() && tagName == reader.name())
@@ -2145,7 +2145,7 @@
 	m_Doc->SnapGuides = false;
 
 	QStringRef tagName = reader.name();
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -2487,7 +2487,7 @@
 {
 	QStringRef tagName = reader.name();
 	ObjAttrVector pageItemAttributes;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		reader.readNext();
 		if (reader.isEndElement() && reader.name() == tagName)
@@ -3557,7 +3557,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
@@ -3594,7 +3594,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
@@ -3632,7 +3632,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
@@ -3682,7 +3682,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)
@@ -3724,7 +3724,7 @@
 
 	ScXmlStreamReader reader(ioDevice.data());
 	ScXmlStreamAttributes attrs;
-	while(!reader.atEnd() && !reader.hasError())
+	while (!reader.atEnd() && !reader.hasError())
 	{
 		QXmlStreamReader::TokenType tType = reader.readNext();
 		if (tType != QXmlStreamReader::StartElement)

Modified: trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp	Fri Oct  5 22:20:36 2018
@@ -115,7 +115,7 @@
 		std::this_thread::sleep_for(std::chrono::milliseconds(5));
 	}
 
-	while(!proc->atEnd() || proc->state()==QProcess::Running)
+	while (!proc->atEnd() || proc->state() == QProcess::Running)
 	{
 		proc->setReadChannel(QProcess::StandardOutput);
 		if ( proc->canReadLine() )

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	Fri Oct  5 22:20:36 2018
@@ -262,7 +262,7 @@
 		// must be ignored, not exactly that, but better than nothing
 		if (elemJustStarted  || elemJustFinished)
 		{
-			while( !tmp.isEmpty() && (tmp[0] == '\r' || tmp[0] == '\n') )
+			while (!tmp.isEmpty() && (tmp[0] == '\r' || tmp[0] == '\n'))
 				tmp = tmp.right(tmp.length() - 1);
 			elemJustStarted = elemJustFinished = false;
 			if (tmp.isEmpty())

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -2821,12 +2821,12 @@
 	}
 
 	// 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
 	{
 		ptr++;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
@@ -2844,7 +2844,7 @@
 		}
 
 		exponent = 0;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		{
 			exponent *= 10;
 			exponent += *ptr - '0';

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -2103,7 +2103,7 @@
 			// Copy next len+1 bytes literally.
 			len++;
 			len *= multByte;
-			while( len != 0 )
+			while (len != 0)
 			{
 				*ptrOut++ = *ptrIn++;
 				len--;
@@ -2129,7 +2129,7 @@
 				count++;
 				c2 = *ptrIn++;
 				count++;
-				while( len != 0 )
+				while (len != 0)
 				{
 					*ptrOut++ = c;
 					*ptrOut++ = c2;
@@ -2141,7 +2141,7 @@
 			{
 				c = *ptrIn++;
 				count++;
-				while( len != 0 )
+				while (len != 0)
 				{
 					*ptrOut++ = c;
 					len--;

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -412,7 +412,7 @@
 //	int fillStyle = 1;
 	double strokewidth = 0.1;
 //	bool poly = false;
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		double x1, y1, x2, y2;
 		StrokeCol = defStrokeCol;
@@ -658,7 +658,7 @@
 
 void ShapePlug::parseGroupProperties(QDomNode &DOC, double &minXCoor, double &minYCoor, double &maxXCoor, double &maxYCoor, bool &firstCheck)
 {
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		double x1, y1, x2, y2;
 		FPointArray PoLine;
@@ -884,12 +884,12 @@
 	}
 
 	// 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
 	{
 		ptr++;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
@@ -907,7 +907,7 @@
 		}
 
 		exponent = 0;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		{
 			exponent *= 10;
 			exponent += *ptr - '0';
@@ -940,12 +940,12 @@
 		FirstM = true;
 		char command = *(ptr++), lastCommand = ' ';
 		subpathx = subpathy = curx = cury = contrlx = contrly = 0.0;
-		while( ptr < end )
+		while (ptr < end)
 		{
 			if (*ptr == ' ')
 				ptr++;
 			relative = false;
-			switch( command )
+			switch (command)
 			{
 			case 'm':
 				relative = true;

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -314,7 +314,7 @@
 		docu.setContent(&f);
 		QDomElement elem = docu.documentElement();
 		QDomNode node = elem.firstChild();
-		while(!node.isNull())
+		while (!node.isNull())
 		{
 			QDomElement pg = node.toElement();
 			if (pg.tagName() == "Dimensions")
@@ -361,7 +361,7 @@
 		if (elem.tagName() != "KivioShapeStencil")
 			return false;
 		QDomNode node = elem.firstChild();
-		while(!node.isNull())
+		while (!node.isNull())
 		{
 			QDomElement pg = node.toElement();
 			if (pg.tagName() == "KivioShape")
@@ -419,7 +419,7 @@
 	if (elem.hasChildNodes())
 	{
 		QDomNode node = elem.firstChild();
-		while(!node.isNull())
+		while (!node.isNull())
 		{
 			QDomElement pg = node.toElement();
 			if (pg.tagName() == "KivioLineStyle")

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&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 22:20:36 2018
@@ -2267,12 +2267,12 @@
 	}
 
 	// 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
 	{
 		ptr++;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 			decimal += (*(ptr++) - '0') * (frac *= 0.1);
 	}
 
@@ -2290,7 +2290,7 @@
 		}
 
 		exponent = 0;
-		while(*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
+		while (*ptr != '\0' && *ptr >= '0' && *ptr <= '9')
 		{
 			exponent *= 10;
 			exponent += *ptr - '0';

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp	Fri Oct  5 22:20:36 2018
@@ -412,7 +412,7 @@
 	};
 	a.setType(atypes[which]);
 
-	switch(which)
+	switch (which)
 	{
 		case PDFBUTTON:
 			a.setFlag(Annotation::Flag_PushButton);

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Fri Oct  5 22:20:36 2018
@@ -1979,7 +1979,7 @@
 	QDomNode DOC=elem.firstChild();
 	if (!DOC.namedItem("CheckProfile").isNull())
 		appPrefs.verifierPrefs.checkerPrefsList.clear();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		ScDomElement dc = DOC.toElement();
 
@@ -2302,7 +2302,7 @@
 			appPrefs.scrapbookPrefs.writePreviews = static_cast<bool>(dc.attribute("WritePreviews", "1").toInt());
 			appPrefs.scrapbookPrefs.numScrapbookCopies = dc.attribute("ScrapbookCopies", "10").toInt();
 			QDomNode scrp = dc.firstChild();
-			while(!scrp.isNull())
+			while (!scrp.isNull())
 			{
 				QDomElement scrpElem = scrp.toElement();
 				if (scrpElem.tagName() == "Recent")
@@ -2322,7 +2322,7 @@
 			if  (!PGS.namedItem("PageNames").isNull())
 			{
 				appPrefs.pageSets.clear();
-				while(!PGS.isNull())
+				while (!PGS.isNull())
 				{
 					QDomElement PgsAttr = PGS.toElement();
 					if(PgsAttr.tagName() == "Set")
@@ -2337,7 +2337,7 @@
 //						pageS.GapBelow = PgsAttr.attribute("GapBelow", "0").toDouble();
 						pageS.pageNames.clear();
 						QDomNode PGSN = PGS.firstChild();
-						while(!PGSN.isNull())
+						while (!PGSN.isNull())
 						{
 							QDomElement PgsAttrN = PGSN.toElement();
 							if(PgsAttrN.tagName() == "PageNames")
@@ -2492,7 +2492,7 @@
 			appPrefs.hyphPrefs.Automatic = static_cast<bool>(dc.attribute("Automatic", "1").toInt());
 			appPrefs.hyphPrefs.AutoCheck = static_cast<bool>(dc.attribute("AutomaticCheck", "1").toInt());
 			QDomNode hyelm = dc.firstChild();
-			while(!hyelm.isNull())
+			while (!hyelm.isNull())
 			{
 				QDomElement hyElem = hyelm.toElement();
 				if (hyElem.tagName()=="Exception")
@@ -2609,7 +2609,7 @@
 			appPrefs.pdfPrefs.openAction = dc.attribute("OpenAction", "");
 			QDomNode PFO = DOC.firstChild();
 			appPrefs.pdfPrefs.LPISettings.clear();
-			while(!PFO.isNull())
+			while (!PFO.isNull())
 			{
 				QDomElement pdfF = PFO.toElement();
 				if(pdfF.tagName() == "LPI")
@@ -2627,7 +2627,7 @@
 		{
 			QDomNode DIA = DOC.firstChild();
 			appPrefs.itemAttrPrefs.defaultItemAttributes.clear();
-			while(!DIA.isNull())
+			while (!DIA.isNull())
 			{
 				QDomElement itemAttr = DIA.toElement();
 				if(itemAttr.tagName() == "ItemAttribute")
@@ -2649,7 +2649,7 @@
 		{
 			QDomNode TOC = DOC.firstChild();
 			appPrefs.tocPrefs.defaultToCSetups.clear();
-			while(!TOC.isNull())
+			while (!TOC.isNull())
 			{
 				QDomElement tocElem = TOC.toElement();
 				if(tocElem.tagName() == "TableOfContents")

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Fri Oct  5 22:20:36 2018
@@ -1133,7 +1133,7 @@
 	if (elem.tagName() != "CachedFonts")
 		return;
 	QDomNode DOC = elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc = DOC.toElement();
 		if (dc.tagName()=="Font")

Modified: trunk/Scribus/scribus/schelptreemodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/schelptreemodel.cpp
==============================================================================
--- trunk/Scribus/scribus/schelptreemodel.cpp	(original)
+++ trunk/Scribus/scribus/schelptreemodel.cpp	Fri Oct  5 22:20:36 2018
@@ -86,10 +86,10 @@
 //	bool haveTutorials=false;
 	QList<QVariant> columnData;
 	int position=0;
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement(); // try to convert the node to an element.
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.hasAttribute( "text" ) && e.hasAttribute( "file" ))
 			{

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Fri Oct  5 22:20:36 2018
@@ -531,7 +531,7 @@
 		p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
 		double pws = embedded->m_lineWidth;
 		drawItem_Pre(embedded, p);
-		switch(embedded->itemType())
+		switch (embedded->itemType())
 		{
 			case PageItem::ImageFrame:
 			case PageItem::LatexFrame:
@@ -1080,7 +1080,7 @@
 		embedded->invalid = true;
 		m_scpage->drawItem_Pre(embedded, m_painter);
 
-		switch(embedded->itemType())
+		switch (embedded->itemType())
 		{
 		case PageItem::ImageFrame:
 		case PageItem::TextFrame:

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Fri Oct  5 22:20:36 2018
@@ -1865,7 +1865,7 @@
 			}
 		}
 	}
-	switch(kk)
+	switch (kk)
 	{
 		case Qt::Key_Left:
 		case Qt::Key_Right:
@@ -1889,7 +1889,7 @@
 	}
 	if (k->isAutoRepeat() || !m__arrowKeyDown)
 		return;
-	switch(k->key())
+	switch (k->key())
 	{
 		case Qt::Key_Left:
 		case Qt::Key_Right:
@@ -8186,7 +8186,7 @@
 	QDomNode DOC = elem.firstChild();
 	bool first = true;
 	DOC = elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement pg = DOC.toElement();
 		if (pg.tagName() == "ITEM")

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Fri Oct  5 22:20:36 2018
@@ -2701,9 +2701,9 @@
 	QMap<QString,int>::Iterator it = MasterNames.begin();
 	QListIterator<ScPage *> dpIt(DocPages);
 	ScPage* docPage=nullptr;
-	while(dpIt.hasNext())
-	{
-		docPage=dpIt.next();
+	while (dpIt.hasNext())
+	{
+		docPage = dpIt.next();
 		if (docPage->MPageNam == oldMasterPage)
 		{
 			PageLocation pageLoc = locationOfPage(pageIndex);
@@ -5323,7 +5323,7 @@
 PageItem* ScribusDoc::createPageItem(const PageItem::ItemType itemType, const PageItem::ItemFrameType frameType, double x, double y, double b, double h, double w, const QString& fill, const QString& outline)
 {
 	PageItem* newItem=nullptr;
-	switch( itemType )
+	switch (itemType)
 	{
 		//Q_ASSERTs here will warn on creation issues when a coder specifies the frameType incorrectly
 		//for items that do not have/need a frameType for creation.
@@ -8173,7 +8173,7 @@
 			{
 				if (!PageColors.contains(currItem->lineColor()))
 				{
-					switch(currItem->itemType())
+					switch (currItem->itemType())
 					{
 						case PageItem::TextFrame:
 						case PageItem::PathText:
@@ -8224,7 +8224,7 @@
 				{
 					if (!PageColors.contains(currItem->fillColor()))
 					{
-						switch(currItem->itemType())
+						switch (currItem->itemType())
 						{
 							case PageItem::ImageFrame:
 							case PageItem::LatexFrame:

Modified: trunk/Scribus/scribus/scxmlstreamreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/scxmlstreamreader.cpp
==============================================================================
--- trunk/Scribus/scribus/scxmlstreamreader.cpp	(original)
+++ trunk/Scribus/scribus/scxmlstreamreader.cpp	Fri Oct  5 22:20:36 2018
@@ -176,7 +176,7 @@
 		return;
 	int count = 1;
 	QStringRef tagName = name();
-	while(!atEnd() && !hasError())
+	while (!atEnd() && !hasError())
 	{
 		readNext();
 		if (isStartElement() && (name() == tagName))

Modified: trunk/Scribus/scribus/styles/styleset.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/styles/styleset.h
==============================================================================
--- trunk/Scribus/scribus/styles/styleset.h	(original)
+++ trunk/Scribus/scribus/styles/styleset.h	Fri Oct  5 22:20:36 2018
@@ -10,20 +10,24 @@
 
 
 template<class STYLE>
-class StyleSet : public StyleContext {
+class StyleSet : public StyleContext
+{
 public:
-	STYLE& operator[] (int index) { 
+	STYLE& operator[] (int index)
+	{ 
 		assert(index < styles.count()); 
 		return * styles[index]; 
 	}
 	
 	STYLE* getDefault(){ return m_default; }		
 	
-	const STYLE& get(const QString& name) const { 
+	const STYLE& get(const QString& name) const
+	{ 
 		return * dynamic_cast<const STYLE*>(resolve(name)); 
 	}
 	
-	const STYLE& operator[] (int index) const { 
+	const STYLE& operator[] (int index) const
+	{ 
 		assert(index < styles.count()); 
 		return * styles[index]; 
 	}
@@ -34,11 +38,13 @@
 
 	inline const BaseStyle* resolve(const QString& name) const;
 	
-	int count() const {
+	int count() const
+	{
 		return styles.count();
 	}
 	
-	STYLE* append(STYLE* style) { 
+	STYLE* append(STYLE* style)
+	{ 
 		styles.append(style); 
 		style->setContext(this); 
 		return style; 
@@ -50,18 +56,21 @@
 	
 	inline void rename(const QMap<QString,QString>& newNames);
 	
-	STYLE* create(const STYLE& proto) { 
+	STYLE* create(const STYLE& proto)
+	{ 
 		return append(new STYLE(proto)); 
 	}
 	
-	void makeDefault(STYLE* def) { 
+	void makeDefault(STYLE* def)
+	{ 
 		m_default = def; 
 		if (def) 
 			def->setContext(this);
 		invalidate();
 	}
 	
-	bool isDefault(const STYLE& style) const {
+	bool isDefault(const STYLE& style) const
+	{
 		return &style == m_default;
 	}
 	
@@ -77,8 +86,9 @@
 	 *
 	 * If @a invalid is <code>true</code>, this function also invalidates the style set.
 	 */
-	void clear(bool invalid = true) {
-		while(styles.count()>0) 
+	void clear(bool invalid = true)
+	{
+		while (styles.count() > 0) 
 		{ 
 			delete styles.front(); 
 			styles.pop_front(); 
@@ -87,14 +97,16 @@
 			invalidate();
 	}
 
-	void setContext(const StyleContext* context) {
+	void setContext(const StyleContext* context)
+	{
 		bool reallyNew = m_context != context;
 		m_context = context; 
 		if (reallyNew)
 			invalidate();
 	}
 	
-	const StyleContext* context() const { 
+	const StyleContext* context() const
+	{ 
 		return m_context; 
 	}
 	

Modified: trunk/Scribus/scribus/text/screenpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/text/screenpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/text/screenpainter.cpp	(original)
+++ trunk/Scribus/scribus/text/screenpainter.cpp	Fri Oct  5 22:20:36 2018
@@ -303,7 +303,7 @@
 	embedded->invalid = true;
 	embedded->DrawObj_Pre(m_painter);
 
-	switch(embedded->itemType())
+	switch (embedded->itemType())
 	{
 	case PageItem::ImageFrame:
 	case PageItem::TextFrame:

Modified: trunk/Scribus/scribus/text/sctext_shared.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/text/sctext_shared.cpp
==============================================================================
--- trunk/Scribus/scribus/text/sctext_shared.cpp	(original)
+++ trunk/Scribus/scribus/text/sctext_shared.cpp	Fri Oct  5 22:20:36 2018
@@ -55,7 +55,7 @@
 
 void ScText_Shared::clear()
 {
-	while(!this->isEmpty())
+	while (!this->isEmpty())
 		delete this->takeFirst(); 
 	QList<ScText*>::clear();
 	cursorPosition = 0;
@@ -101,7 +101,7 @@
 ScText_Shared::~ScText_Shared() 
 {
 //		qDebug() << QString("~ScText_Shared() %1").arg(reinterpret_cast<uint>(this));
-	while(!this->isEmpty())
+	while (!this->isEmpty())
 		delete this->takeFirst(); 
 }
 

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp	(original)
+++ trunk/Scribus/scribus/text/storytext.cpp	Fri Oct  5 22:20:36 2018
@@ -737,7 +737,7 @@
 int StoryText::replaceWord(int pos, QString newWord)
 {
 	int eoWord=pos;
-	while(eoWord < length())
+	while (eoWord < length())
 	{
 		if (text(eoWord).isLetterOrNumber() || SpecialChars::isIgnorableCodePoint(text(eoWord).unicode()))
 			++eoWord;

Modified: trunk/Scribus/scribus/text/textshaper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/text/textshaper.cpp
==============================================================================
--- trunk/Scribus/scribus/text/textshaper.cpp	(original)
+++ trunk/Scribus/scribus/text/textshaper.cpp	Fri Oct  5 22:20:36 2018
@@ -565,25 +565,29 @@
 				if (currStat != 0)
 				{
 					// current char is CJK
-					if (SpecialChars::isLetterRequiringSpaceAroundCJK(m_story.text(lastChar + 1).unicode())) {
-						switch(currStat & SpecialChars::CJK_CHAR_MASK) {
-						case SpecialChars::CJK_KANJI:
-						case SpecialChars::CJK_KANA:
-						case SpecialChars::CJK_NOTOP:
-							run.extraWidth += quarterEM;
+					if (SpecialChars::isLetterRequiringSpaceAroundCJK(m_story.text(lastChar + 1).unicode()))
+					{
+						switch (currStat & SpecialChars::CJK_CHAR_MASK)
+						{
+							case SpecialChars::CJK_KANJI:
+							case SpecialChars::CJK_KANA:
+							case SpecialChars::CJK_NOTOP:
+								run.extraWidth += quarterEM;
 						}
 					}
 				}
 				else
 				{
 					// current char is not CJK
-					if (SpecialChars::isLetterRequiringSpaceAroundCJK(m_story.text(lastChar).unicode())) {
-						switch(nextStat & SpecialChars::CJK_CHAR_MASK) {
-						case SpecialChars::CJK_KANJI:
-						case SpecialChars::CJK_KANA:
-						case SpecialChars::CJK_NOTOP:
-							// use the size of the current char instead of the next one
-							run.extraWidth += quarterEM;
+					if (SpecialChars::isLetterRequiringSpaceAroundCJK(m_story.text(lastChar).unicode()))
+					{
+						switch (nextStat & SpecialChars::CJK_CHAR_MASK)
+						{
+							case SpecialChars::CJK_KANJI:
+							case SpecialChars::CJK_KANA:
+							case SpecialChars::CJK_NOTOP:
+								// use the size of the current char instead of the next one
+								run.extraWidth += quarterEM;
 						}
 					}
 				}
@@ -591,43 +595,50 @@
 				// 2. remove spaces from glyphs with the following CJK attributes
 				if (currStat != 0)
 				{	// current char is CJK
-					switch(currStat & SpecialChars::CJK_CHAR_MASK) {
-					case SpecialChars::CJK_FENCE_END:
-						switch(nextStat & SpecialChars::CJK_CHAR_MASK) {
-						case SpecialChars::CJK_FENCE_BEGIN:
+					switch (currStat & SpecialChars::CJK_CHAR_MASK)
+					{
 						case SpecialChars::CJK_FENCE_END:
+							switch (nextStat & SpecialChars::CJK_CHAR_MASK)
+							{
+								case SpecialChars::CJK_FENCE_BEGIN:
+								case SpecialChars::CJK_FENCE_END:
+								case SpecialChars::CJK_COMMA:
+								case SpecialChars::CJK_PERIOD:
+								case SpecialChars::CJK_MIDPOINT:
+									run.extraWidth -= halfEM;
+							}
+							break;
+
 						case SpecialChars::CJK_COMMA:
 						case SpecialChars::CJK_PERIOD:
+							switch (nextStat & SpecialChars::CJK_CHAR_MASK)
+							{
+								case SpecialChars::CJK_FENCE_BEGIN:
+								case SpecialChars::CJK_FENCE_END:
+									run.extraWidth -= halfEM;
+							}
+							break;
+
 						case SpecialChars::CJK_MIDPOINT:
-							run.extraWidth -= halfEM;
-						}
-						break;
-					case SpecialChars::CJK_COMMA:
-					case SpecialChars::CJK_PERIOD:
-						switch(nextStat & SpecialChars::CJK_CHAR_MASK) {
+							switch (nextStat & SpecialChars::CJK_CHAR_MASK)
+							{
+								case SpecialChars::CJK_FENCE_BEGIN:
+									run.extraWidth -= halfEM;
+							}
+							break;
+
 						case SpecialChars::CJK_FENCE_BEGIN:
-						case SpecialChars::CJK_FENCE_END:
-							run.extraWidth -= halfEM;;
-						}
-						break;
-					case SpecialChars::CJK_MIDPOINT:
-						switch(nextStat & SpecialChars::CJK_CHAR_MASK) {
-						case SpecialChars::CJK_FENCE_BEGIN:
-							run.extraWidth -= halfEM;
-						}
-						break;
-					case SpecialChars::CJK_FENCE_BEGIN:
-						int prevStat = SpecialChars::getCJKAttr(m_story.text(lastChar - 1));
-						if ((prevStat & SpecialChars::CJK_CHAR_MASK) == SpecialChars::CJK_FENCE_BEGIN)
-						{
-							run.extraWidth -= halfEM;
-							run.xoffset -= halfEM;
-						}
-						else
-						{
-							run.setFlag(ScLayout_CJKFence);
-						}
-						break;
+							int prevStat = SpecialChars::getCJKAttr(m_story.text(lastChar - 1));
+							if ((prevStat & SpecialChars::CJK_CHAR_MASK) == SpecialChars::CJK_FENCE_BEGIN)
+							{
+								run.extraWidth -= halfEM;
+								run.xoffset -= halfEM;
+							}
+							else
+							{
+								run.setFlag(ScLayout_CJKFence);
+							}
+							break;
 					}
 				}
 			}

Modified: trunk/Scribus/scribus/ui/aligndistribute.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp	(original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp	Fri Oct  5 22:20:36 2018
@@ -502,7 +502,7 @@
 		precision=unitGetPrecisionFromIndex(currDoc->unitIndex());
 	}
 	bool setterH=true, setterV=true;
-	switch(guideDirection)
+	switch (guideDirection)
 	{
 		case -1:
 			guideInfoText = guideInfoTextNone;

Modified: trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/autoformbuttongroup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/autoformbuttongroup.cpp	(original)
+++ trunk/Scribus/scribus/ui/autoformbuttongroup.cpp	Fri Oct  5 22:20:36 2018
@@ -678,11 +678,11 @@
 {
 	if ((pixmapSize == 16) || (pixmapSize == 22))
 	{
-		if (nr<18)
+		if (nr < 18)
 		{
 			QString strSize=QString("%1").arg(pixmapSize);
 			IconManager* im=IconManager::instance();
-			switch(nr)
+			switch (nr)
 			{
 				case 0:
 					return im->loadPixmap(strSize+"/draw-rectangle.png");

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Fri Oct  5 22:20:36 2018
@@ -1777,7 +1777,7 @@
 	if (elem.tagName() != "SCRIBUSGRADIENT")
 		return;
 	QDomNode DOC = elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement dc = DOC.toElement();
 		if (dc.tagName()=="COLOR")
@@ -1839,7 +1839,7 @@
 			VGradient gra = VGradient(VGradient::linear);
 			gra.clearStops();
 			QDomNode grad = dc.firstChild();
-			while(!grad.isNull())
+			while (!grad.isNull())
 			{
 				QDomElement stop = grad.toElement();
 				QString name = stop.attribute("NAME");

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp	Fri Oct  5 22:20:36 2018
@@ -116,7 +116,7 @@
 			int pos = 0;
 			int cc = 0;
 			double distance = 1000; // just a big number
-			while(cc < m_points.size())
+			while (cc < m_points.size())
 			{
 				p = m_points.point(cc);
 				if (fabs (m_grab_point.x() - p.x()) < distance)
@@ -154,7 +154,7 @@
 	int insert_pos =0;
 	int pos = 0;
 	int cc = 0;
-	while(cc < m_points.size())
+	while (cc < m_points.size())
 	{
 		p = m_points.point(cc);
 		if (fabs (x - p.x()) < distance)
@@ -207,7 +207,7 @@
 	m_leftmost = 0;
 	m_rightmost = 1;
 	cc = 0;
-	while(cc < m_points.size())
+	while (cc < m_points.size())
 	{
 		p = m_points.point(cc);
 		if (p != m_grab_point)
@@ -243,7 +243,7 @@
 		double distance = 1000;
 		double ydistance = 1000;
 		int cc = 0;
-		while(cc < m_points.size())
+		while (cc < m_points.size())
 		{
 			FPoint p = m_points.point(cc);
 			if (fabs (x - p.x()) < distance)

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp	(original)
+++ trunk/Scribus/scribus/ui/hruler.cpp	Fri Oct  5 22:20:36 2018
@@ -464,7 +464,7 @@
 		if ((!Mpressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - 2*m_doc->guidesPrefs().grabRadius) && (m->x() < ColEnd + 2*m_doc->guidesPrefs().grabRadius))
 		{
 			setCursor(IconManager::instance()->loadCursor("tab.png", 3));
-			switch(findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius))
+			switch (findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius))
 			{
 				case rc_leftFrameDist:
 					setCursor(QCursor(Qt::SplitHCursor));

Modified: trunk/Scribus/scribus/ui/insertaframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/insertaframe.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertaframe.cpp	(original)
+++ trunk/Scribus/scribus/ui/insertaframe.cpp	Fri Oct  5 22:20:36 2018
@@ -180,7 +180,7 @@
 {
 	int type=typeButtonGroup->checkedId();
 	iafData.source="";
-	switch(type)
+	switch (type)
 	{
 		case 0:
 			iafData.frameType=PageItem::TextFrame;

Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp	(original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp	Fri Oct  5 22:20:36 2018
@@ -68,10 +68,10 @@
 	QDomElement docElement = doc.documentElement();
 
 	QDomNode node = docElement.firstChild();
-	while(!node.isNull())
+	while (!node.isNull())
 	{
 		QDomElement element = node.toElement();
-		if(!element.isNull())
+		if (!element.isNull())
 		{
 			if (element.tagName() == "name")
 				name = element.text();

Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp	Fri Oct  5 22:20:36 2018
@@ -174,10 +174,10 @@
 
 			//load in new set
 			QDomNode n = docElem.firstChild();
-			while( !n.isNull() )
+			while (!n.isNull())
 			{
 				QDomElement e = n.toElement(); // try to convert the node to an element.
-				if( !e.isNull() )
+				if (!e.isNull())
 				{
 					if (e.hasAttribute("name")  && e.hasAttribute( "shortcut" ))
 					{

Modified: trunk/Scribus/scribus/ui/prefs_spelling.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/prefs_spelling.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_spelling.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_spelling.cpp	Fri Oct  5 22:20:36 2018
@@ -259,9 +259,11 @@
 	dictList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() ) {
+	while (!n.isNull())
+	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() ) {
+		if (!e.isNull())
+		{
 			if (e.tagName()=="dictionary")
 			{
 				if (e.hasAttribute("type") && e.hasAttribute("filetype"))

Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp	Fri Oct  5 22:20:36 2018
@@ -133,10 +133,10 @@
 	availableList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.tagName()=="font")
 			{
@@ -192,10 +192,10 @@
 	availableList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.tagName()=="help")
 			{
@@ -251,10 +251,10 @@
 	availableList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.tagName()=="palette")
 			{
@@ -568,10 +568,10 @@
 	availableList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.tagName()=="dictionary")
 			{
@@ -669,10 +669,10 @@
 	availableList.clear();
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() )
+	while (!n.isNull())
 	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() )
+		if (!e.isNull())
 		{
 			if (e.tagName()=="dictionary")
 			{

Modified: trunk/Scribus/scribus/ui/scrspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/scrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrspinbox.cpp	(original)
+++ trunk/Scribus/scribus/ui/scrspinbox.cpp	Fri Oct  5 22:20:36 2018
@@ -245,7 +245,7 @@
 	{
 		QMap<QString, double>::ConstIterator itend = m_constants->constEnd();
 		QMap<QString, double>::ConstIterator it = m_constants->constBegin();
-		while(it != itend)
+		while (it != itend)
 		{
 			fp.AddConstant(it.key().toStdString(), it.value() * unitGetRatioFromIndex(m_unitIndex));
 			++it;

Modified: trunk/Scribus/scribus/ui/smreplacedia.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/ui/smreplacedia.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smreplacedia.cpp	(original)
+++ trunk/Scribus/scribus/ui/smreplacedia.cpp	Fri Oct  5 22:20:36 2018
@@ -91,7 +91,7 @@
 
 SMReplaceDia::~SMReplaceDia()
 {
-	while(!rowWidgets.isEmpty())
+	while (!rowWidgets.isEmpty())
 		delete rowWidgets.takeFirst();
 	delete optionsHeader;
 	delete deleteHeader;

Modified: trunk/Scribus/scribus/undomanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/undomanager.cpp
==============================================================================
--- trunk/Scribus/scribus/undomanager.cpp	(original)
+++ trunk/Scribus/scribus/undomanager.cpp	Fri Oct  5 22:20:36 2018
@@ -258,7 +258,7 @@
 void UndoManager::removeGui(UndoGui* gui)
 {
 	std::vector<UndoGui*>::iterator it = undoGuis_.begin();
-	while(it != undoGuis_.end())
+	while (it != undoGuis_.end())
 	{
 		if (*it == gui)
 			it = undoGuis_.erase(it);

Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/upgradechecker.cpp
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.cpp	(original)
+++ trunk/Scribus/scribus/upgradechecker.cpp	Fri Oct  5 22:20:36 2018
@@ -156,9 +156,11 @@
 	
 	QDomElement docElem = doc.documentElement();
 	QDomNode n = docElem.firstChild();
-	while( !n.isNull() ) {
+	while (!n.isNull())
+	{
 		QDomElement e = n.toElement();
-		if( !e.isNull() ) {
+		if (!e.isNull())
+		{
 			if (e.tagName()=="release")
 			{
 				if (e.hasAttribute("stability") && e.hasAttribute("platform") && e.hasAttribute("version"))

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22724&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp	(original)
+++ trunk/Scribus/scribus/util.cpp	Fri Oct  5 22:20:36 2018
@@ -533,7 +533,7 @@
 	const QString arabic("أبتثجحخدذرزسشصضطظعغفقكلÙ
نهوي");
 	const QString abjad("أبجدهوزحطيكلÙ
نسعفصقرشتثخذضظغ");
 
-	switch( type )
+	switch (type)
 	{
 		case Type_1_2_3:
 			retVal=QString::number(position);




More information about the scribus-commit mailing list