1 files changed, 32 insertions, 30 deletions

diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp
index ada7f5fab..5e5e6b0d1 100644
--- a/src/kvilib/ext/KviStringConversion.cpp
+++ b/src/kvilib/ext/KviStringConversion.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-
-
 #define _KVI_STRINGCONVERSION_CPP_
 #include "KviStringConversion.h"
 
@@ -47,17 +45,17 @@ namespace KviStringConversion
 		{
 			if(!g_szLocalDir.isEmpty())
 			{
-				if(szBuffer.indexOf(g_szLocalDir,0,Qt::CaseSensitive) == 0)
+				if(szBuffer.indexOf(g_szLocalDir, 0, Qt::CaseSensitive) == 0)
 				{
-					szBuffer.remove(0,g_szLocalDir.length());
+					szBuffer.remove(0, g_szLocalDir.length());
 					szBuffer.prepend("local://");
 				}
 			}
 			if(!g_szGlobalDir.isEmpty())
 			{
-				if(szBuffer.indexOf(g_szGlobalDir,0,Qt::CaseSensitive) == 0)
+				if(szBuffer.indexOf(g_szGlobalDir, 0, Qt::CaseSensitive) == 0)
 				{
-					szBuffer.remove(0,g_szGlobalDir.length());
+					szBuffer.remove(0, g_szGlobalDir.length());
 					szBuffer.prepend("global://");
 				}
 			}
@@ -70,17 +68,17 @@ namespace KviStringConversion
 		{
 			if(!g_szLocalDir.isEmpty())
 			{
-				if(szBuffer.indexOf("local://",0,Qt::CaseSensitive) == 0)
+				if(szBuffer.indexOf("local://", 0, Qt::CaseSensitive) == 0)
 				{
-					szBuffer.remove(0,8);
+					szBuffer.remove(0, 8);
 					szBuffer.prepend(g_szLocalDir);
 				}
 			}
 			if(!g_szGlobalDir.isEmpty())
 			{
-				if(szBuffer.indexOf("global://",0,Qt::CaseSensitive) == 0)
+				if(szBuffer.indexOf("global://", 0, Qt::CaseSensitive) == 0)
 				{
-					szBuffer.remove(0,9);
+					szBuffer.remove(0, 9);
 					szBuffer.prepend(g_szGlobalDir);
 				}
 			}
@@ -108,7 +106,8 @@ namespace KviStringConversion
 	{
 		if(szValue.isEmpty())
 			bBuffer = false;
-		else bBuffer = !((KviQString::equalCS(szValue,"0")) || (KviQString::equalCI(szValue,"false")));
+		else
+			bBuffer = !((KviQString::equalCS(szValue, "0")) || (KviQString::equalCI(szValue, "false")));
 		return true;
 	}
 
@@ -129,7 +128,7 @@ namespace KviStringConversion
 		szBuffer.setNum(uValue);
 	}
 
-	bool fromString(const QString & szValue,unsigned int & uBuffer)
+	bool fromString(const QString & szValue, unsigned int & uBuffer)
 	{
 		bool bOk;
 		uBuffer = szValue.toUInt(&bOk);
@@ -138,7 +137,7 @@ namespace KviStringConversion
 
 	void toString(const QRect & rValue, QString & szBuffer)
 	{
-		szBuffer.sprintf("%d,%d,%d,%d",rValue.x(),rValue.y(),rValue.width(),rValue.height());
+		szBuffer.sprintf("%d,%d,%d,%d", rValue.x(), rValue.y(), rValue.width(), rValue.height());
 	}
 
 	bool fromString(const QString & szValue, QRect & buffer)
@@ -147,10 +146,10 @@ namespace KviStringConversion
 		const char * c = tmp.data();
 		if(!c)
 			return false;
-		int l,t,w,h;
-		if(sscanf(c,"%d,%d,%d,%d",&l,&t,&w,&h) != 4)
+		int l, t, w, h;
+		if(sscanf(c, "%d,%d,%d,%d", &l, &t, &w, &h) != 4)
 			return false;
-		buffer.setRect(l,t,w,h);
+		buffer.setRect(l, t, w, h);
 		return true;
 	}
 
@@ -179,27 +178,29 @@ namespace KviStringConversion
 		{
 			buffer.setNull();
 			return true;
-		} else {
+		}
+		else
+		{
 			return buffer.load(szPath);
 		}
 	}
 
 	void toString(const KviMessageTypeSettings & mValue, QString & szBuffer)
 	{
-		szBuffer.sprintf("%d,%u,%u,%d,%d",mValue.m_iPixId,mValue.m_cForeColor,mValue.m_cBackColor,mValue.m_bLogEnabled,mValue.m_iLevel);
+		szBuffer.sprintf("%d,%u,%u,%d,%d", mValue.m_iPixId, mValue.m_cForeColor, mValue.m_cBackColor, mValue.m_bLogEnabled, mValue.m_iLevel);
 	}
 
 	bool fromString(const QString & szValue, KviMessageTypeSettings & buffer)
 	{
-		int iId,iLog,iLevel;
-		unsigned int uFore,uBack;
+		int iId, iLog, iLevel;
+		unsigned int uFore, uBack;
 		QByteArray tmp = szValue.toUtf8();
 		char * cx = tmp.data();
 		if(!cx)
 			return false;
-		if(sscanf(cx,"%d,%u,%u,%d,%d",&iId,&uFore,&uBack,&iLog,&iLevel) != 5)
+		if(sscanf(cx, "%d,%u,%u,%d,%d", &iId, &uFore, &uBack, &iLog, &iLevel) != 5)
 			return false;
-		buffer = KviMessageTypeSettings(buffer.m_szType,iId,uFore,uBack,iLog,iLevel);
+		buffer = KviMessageTypeSettings(buffer.m_szType, iId, uFore, uBack, iLog, iLevel);
 		return true;
 	}
 
@@ -210,13 +211,14 @@ namespace KviStringConversion
 
 	bool fromString(const QString & szValue, QColor & buffer)
 	{
-		buffer.setNamedColor(szValue); return true;
+		buffer.setNamedColor(szValue);
+		return true;
 	}
 
 	void toString(const QFont & font, QString & szBuffer)
 	{
 		QString szFamily(font.family());
-		szBuffer.sprintf("%s,%d,%d,%d",szFamily.toUtf8().data(),font.pointSize(),font.styleHint(),font.weight());
+		szBuffer.sprintf("%s,%d,%d,%d", szFamily.toUtf8().data(), font.pointSize(), font.styleHint(), font.weight());
 		QString szOptions;
 		if(font.bold())
 			szOptions.append('b');
@@ -239,11 +241,11 @@ namespace KviStringConversion
 	bool fromString(const QString & szValue, QFont & buffer)
 	{
 		KviCString str = szValue;
-		KviCString family,pointSize,styleHint,weight,options;
-		str.getToken(family,',');
-		str.getToken(pointSize,',');
-		str.getToken(styleHint,',');
-		str.getToken(weight,',');
+		KviCString family, pointSize, styleHint, weight, options;
+		str.getToken(family, ',');
+		str.getToken(pointSize, ',');
+		str.getToken(styleHint, ',');
+		str.getToken(weight, ',');
 		if(!family.isEmpty())
 			buffer.setFamily(family.ptr());
 		int i;
@@ -266,7 +268,7 @@ namespace KviStringConversion
 		return true;
 	}
 
-	void toString(const QStringList & list,QString & szBuffer)
+	void toString(const QStringList & list, QString & szBuffer)
 	{
 		szBuffer = list.join(",");
 	}