r20397 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Sep 18 23:29:49 2015
New Revision: 20397

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

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/text/storytext.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20397&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	Fri Sep 18 23:29:49 2015
@@ -219,7 +219,7 @@
 	docu.writeAttribute("PAGESIZE"    , m_Doc->pageSize());
 	docu.writeAttribute("FIRSTNUM"    , m_Doc->FirstPnum);
 	docu.writeAttribute("BOOK"        , m_Doc->pagePositioning());
-	if(m_Doc->usesAutomaticTextFrames())
+	if (m_Doc->usesAutomaticTextFrames())
 		docu.writeAttribute("AUTOTEXT", 1);
 	docu.writeAttribute("AUTOSPALTEN" ,m_Doc->PageSp);
 	docu.writeAttribute("ABSTSPALTEN" ,m_Doc->PageSpa);
@@ -1157,7 +1157,7 @@
 void Scribus150Format::writeDocItemAttributes(ScXmlStreamWriter & docu) 
 {
 	docu.writeStartElement("DocItemAttributes");
-	for(ObjAttrVector::Iterator objAttrIt = m_Doc->itemAttributes().begin() ; objAttrIt != m_Doc->itemAttributes().end(); ++objAttrIt )
+	for (ObjAttrVector::Iterator objAttrIt = m_Doc->itemAttributes().begin() ; objAttrIt != m_Doc->itemAttributes().end(); ++objAttrIt )
 	{
 		docu.writeEmptyElement("ItemAttribute");
 		docu.writeAttribute("Name", objAttrIt->name);
@@ -1175,7 +1175,7 @@
 void Scribus150Format::writeTOC(ScXmlStreamWriter & docu) 
 {
 	docu.writeStartElement("TablesOfContents");
-	for(ToCSetupVector::Iterator tocSetupIt = m_Doc->tocSetups().begin() ; tocSetupIt != m_Doc->tocSetups().end(); ++tocSetupIt )
+	for (ToCSetupVector::Iterator tocSetupIt = m_Doc->tocSetups().begin() ; tocSetupIt != m_Doc->tocSetups().end(); ++tocSetupIt )
 	{
 		docu.writeEmptyElement("TableOfContents");
 		docu.writeAttribute("Name", tocSetupIt->name);
@@ -1203,7 +1203,7 @@
 void Scribus150Format::writeSections(ScXmlStreamWriter & docu) 
 {
 	docu.writeStartElement("Sections");
-	for(DocumentSectionMap::Iterator it = m_Doc->sections().begin() ; it != m_Doc->sections().end(); ++it )
+	for (DocumentSectionMap::Iterator it = m_Doc->sections().begin() ; it != m_Doc->sections().end(); ++it )
 	{
 		docu.writeEmptyElement("Section");
 		docu.writeAttribute("Number", (*it).number);
@@ -1403,7 +1403,7 @@
 	docu.writeStartElement("PageSets");
 	QList<PageSet>::Iterator itpgset;
 	QList<PageSet> pageSet(m_Doc->pageSets());
-	for(itpgset = pageSet.begin(); itpgset != pageSet.end(); ++itpgset )
+	for (itpgset = pageSet.begin(); itpgset != pageSet.end(); ++itpgset )
 	{
 		docu.writeStartElement("Set");
 		docu.writeAttribute("Name", itpgset->Name);
@@ -1415,7 +1415,7 @@
 //		docu.writeAttribute("GapBelow", itpgset->GapBelow);
 		QStringList pNames = itpgset->pageNames;
 		QStringList::Iterator itpgsetN;
-		for(itpgsetN = pNames.begin(); itpgsetN != pNames.end(); ++itpgsetN )
+		for (itpgsetN = pNames.begin(); itpgsetN != pNames.end(); ++itpgsetN )
 		{
 			docu.writeEmptyElement("PageNames");
 			docu.writeAttribute("Name", (*itpgsetN));
@@ -1472,7 +1472,7 @@
 		pages = doc->MasterPages.count();
 	else
 		pages = doc->DocPages.count();
-	for(uint i = 0; i < pages; ++i)
+	for (uint i = 0; i < pages; ++i)
 	{
 		ObCount++;
 		if (dia2 != 0)
@@ -1566,7 +1566,7 @@
 	int iTLen = item->itemText.length();
 	if (item->isNoteFrame())
 		iTLen = 0;  //used for saving empty endnotes frames, as they will be filled automatically
-	for(int k = 0; k < iTLen; ++k)
+	for (int k = 0; k < iTLen; ++k)
 	{
 		const CharStyle& style1(item->itemText.charStyle(k));
 		const QChar ch = item->itemText.text(k);
@@ -1726,7 +1726,7 @@
 			assert(false);
 	}
 	objects = items->count();
-	for(uint j = 0; j < objects;++j)
+	for (uint j = 0; j < objects;++j)
 	{
 		ObCount++;
 		if (dia2 != 0)
@@ -2398,7 +2398,7 @@
 		if (attributes->count() > 0)
 		{
 			docu.writeStartElement("PageItemAttributes");
-			for(ObjAttrVector::Iterator objAttrIt = attributes->begin() ; objAttrIt != attributes->end(); ++objAttrIt )
+			for (ObjAttrVector::Iterator objAttrIt = attributes->begin() ; objAttrIt != attributes->end(); ++objAttrIt )
 			{
 				docu.writeEmptyElement("ItemAttribute");
 				docu.writeAttribute("Name", objAttrIt->name);

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20397&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp	(original)
+++ trunk/Scribus/scribus/text/storytext.cpp	Fri Sep 18 23:29:49 2015
@@ -361,7 +361,7 @@
 void StoryText::insertParSep(int pos)
 {
 	ScText* it = item(pos);
-	if(!it->parstyle) {
+	if (!it->parstyle) {
 		it->parstyle = new ParagraphStyle(paragraphStyle(pos+1));
 		it->parstyle->setContext( & d->pstyleContext);
 		// #7432 : when inserting a paragraph separator, apply/erase the trailing Style
@@ -634,7 +634,7 @@
 	for (int i=pos; i < pos+signed(len); ++i)
 	{
 //		dump += d->at(i)->ch;
-		if(hyphens && hyphens[i-pos] & 1) {
+		if (hyphens && hyphens[i-pos] & 1) {
 			d->at(i)->setEffects(d->at(i)->effects() | ScStyle_HyphenationPossible);
 //			dump += "-";
 		}
@@ -1422,7 +1422,7 @@
 
 	while (pos < len)
 	{
-		if(text(pos).isLetter())
+		if (text(pos).isLetter())
 			++pos;
 		else
 			break;
@@ -1443,7 +1443,7 @@
 	int len = length();
 	while (pos < len)
 	{
-		if(text(pos).isLetter())
+		if (text(pos).isLetter())
 			++pos;
 		else
 			break;