r19338 by jghali - a few cosmetic fixes

[scribus-commit]

Author: jghali
Date: Fri Jul 11 23:35:03 2014
New Revision: 19338

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19338
Log:
a few cosmetic fixes

Modified:
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19338&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Fri Jul 11 23:35:03 2014
@@ -321,7 +321,7 @@
 			if (createObjectMode != modeDrawLine)
 			{
 				if (modifiers == Qt::ControlModifier)
-					hSize=wSize;
+					hSize = wSize;
 				m_canvas->displaySizeHUD(m->globalPos(), wSize, hSize, false);
 			}
 			else

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19338&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Fri Jul 11 23:35:03 2014
@@ -1802,15 +1802,15 @@
 				if (a+1 < itemText.length())
 				{
 					uint glyph2 = font.char2CMap(itemText.text(a+1));
-					double kern= font.glyphKerning(glyphs->last()->glyph, glyph2, chs / 10.0) * glyphs->scaleH;
+					double kern = font.glyphKerning(glyphs->last()->glyph, glyph2, chs / 10.0) * glyphs->scaleH;
 					wide += kern;
 					glyphs->last()->xadvance += kern;
 					// change xadvance, xoffset according to JIS X4051
 					int nextStat = SpecialChars::getCJKAttr(itemText.text(a+1));
 					int prevStat;
-					if(curStat != 0)
+					if (curStat != 0)
 					{	// current char is CJK
-						if(nextStat == 0 && !SpecialChars::isBreakingSpace(itemText.text(a+1))){
+						if (nextStat == 0 && !SpecialChars::isBreakingSpace(itemText.text(a+1))){
 							switch(curStat & SpecialChars::CJK_CHAR_MASK){
 							case SpecialChars::CJK_KANJI:
 							case SpecialChars::CJK_KANA:
@@ -1868,7 +1868,7 @@
 
 						}
 					} else {	// current char is not CJK
-						if(nextStat != 0 && !SpecialChars::isBreakingSpace(currentCh)){
+						if (nextStat != 0 && !SpecialChars::isBreakingSpace(currentCh)){
 							switch(nextStat & SpecialChars::CJK_CHAR_MASK){
 							case SpecialChars::CJK_KANJI:
 							case SpecialChars::CJK_KANA:
@@ -1918,7 +1918,7 @@
 					glyphs->xoffset -= 0.5; //drop caps are always to far from column left edge
 				}
 				glyphs->xadvance = wide;
-				desc = realDesc =0;
+				desc = realDesc = 0;
 			}
 			else // !DropCMode
 			{