Apply clang-format

1 files changed, 308 insertions, 266 deletions

diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 52eeda284..8505b606f 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -84,97 +84,96 @@
 		This signal is emitted by the default implementation of [classfnc]$frameChangedEvent[/classfnc]().[br]
 */
 
-KVSO_BEGIN_REGISTERCLASS(KvsObject_pixmap,"pixmap","object")
-
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,fill)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,resize)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,scale)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,load)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,loadAnimation)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,save)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,startAnimation)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,stopAnimation)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,loadFromMemoryBuffer)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,height)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,width)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,rotate)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,mirrored)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,setPixel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,pixel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,grabWidget)
-	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,frameChangedEvent)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_pixmap, "pixmap", "object")
 
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, fill)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, resize)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, scale)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, load)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, loadAnimation)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, save)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, startAnimation)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, stopAnimation)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, loadFromMemoryBuffer)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, height)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, width)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, rotate)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, mirrored)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, setPixel)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, pixel)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, grabWidget)
+KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap, frameChangedEvent)
 
 KVSO_END_REGISTERCLASS(KvsObject_pixmap)
 
-
-KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap,KviKvsObject)
-	m_pAnimatedPixmap = 0;
-	m_currentType = Image;
-	m_pPixmap = 0;
-	m_pImage = 0;
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap, KviKvsObject)
+m_pAnimatedPixmap = 0;
+m_currentType = Image;
+m_pPixmap = 0;
+m_pImage = 0;
 KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
-
 KVSO_BEGIN_DESTRUCTOR(KvsObject_pixmap)
-	emit aboutToDie();
-	if (m_pPixmap)
-		delete m_pPixmap;
-	if (m_pAnimatedPixmap)
-		delete m_pAnimatedPixmap;
-	if (m_pImage)
-		delete m_pImage;
+emit aboutToDie();
+if(m_pPixmap)
+	delete m_pPixmap;
+if(m_pAnimatedPixmap)
+	delete m_pAnimatedPixmap;
+if(m_pImage)
+	delete m_pImage;
 KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
-
-KVSO_CLASS_FUNCTION(pixmap,fill)
+KVSO_CLASS_FUNCTION(pixmap, fill)
 {
-	kvs_int_t iCol1,iCol2,iCol3,iOpacity;
-	QString szColorMode,szColor;
-	KviKvsVariant *var1,*var2,*var3;
+	kvs_int_t iCol1, iCol2, iCol3, iOpacity;
+	QString szColorMode, szColor;
+	KviKvsVariant *var1, *var2, *var3;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("Color_1_Or_Colorname",KVS_PT_VARIANT,0,var1)
-		KVSO_PARAMETER("Color_2",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var2)
-		KVSO_PARAMETER("Colo3_3",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var3)
-		KVSO_PARAMETER("color_mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szColorMode)
-		KVSO_PARAMETER("opacity",KVS_PT_INT,KVS_PF_OPTIONAL,iOpacity)
+	KVSO_PARAMETER("Color_1_Or_Colorname", KVS_PT_VARIANT, 0, var1)
+	KVSO_PARAMETER("Color_2", KVS_PT_VARIANT, KVS_PF_OPTIONAL, var2)
+	KVSO_PARAMETER("Colo3_3", KVS_PT_VARIANT, KVS_PF_OPTIONAL, var3)
+	KVSO_PARAMETER("color_mode", KVS_PT_STRING, KVS_PF_OPTIONAL, szColorMode)
+	KVSO_PARAMETER("opacity", KVS_PT_INT, KVS_PF_OPTIONAL, iOpacity)
 	KVSO_PARAMETERS_END(c)
 
 	QColor col;
-	if (!var1->asInteger(iCol1))
+	if(!var1->asInteger(iCol1))
 	{
 		var1->asString(szColor);
-		if (c->paramCount()<2)
-			iOpacity=255;
-		else {
-			if (!var2->asInteger(iOpacity))
+		if(c->paramCount() < 2)
+			iOpacity = 255;
+		else
+		{
+			if(!var2->asInteger(iOpacity))
 			{
-				c->warning(__tr2qs_ctx("The opacity parameter didn't evaluate to integer","objects"));
+				c->warning(__tr2qs_ctx("The opacity parameter didn't evaluate to integer", "objects"));
 				return true;
 			}
 		}
 		col.setNamedColor(szColor);
 		col.setAlpha(iOpacity);
-	} else {
-		if(c->paramCount()<3)
+	}
+	else
+	{
+		if(c->paramCount() < 3)
 		{
-			c->error(__tr2qs_ctx("Color name or triplet RGB/HSV value required","objects"));
+			c->error(__tr2qs_ctx("Color name or triplet RGB/HSV value required", "objects"));
 			return true;
 		}
-		if (!var2->asInteger(iCol2)||!var3->asInteger(iCol3))
+		if(!var2->asInteger(iCol2) || !var3->asInteger(iCol3))
 		{
-			c->error(__tr2qs_ctx("One of the triplet parameters didn't evaluate to an integer","objects"));\
+			c->error(__tr2qs_ctx("One of the triplet parameters didn't evaluate to an integer", "objects"));
 			return true;
 		}
-		if (c->paramCount()<5)
-			iOpacity=255;
+		if(c->paramCount() < 5)
+			iOpacity = 255;
 
 		if(KviQString::equalCI(szColorMode, "HSV"))
-			col.setHsv(iCol1,iCol2,iCol3,iOpacity);
+			col.setHsv(iCol1, iCol2, iCol3, iOpacity);
 		else
-			col.setRgb(iCol1,iCol2,iCol3,iOpacity);
+			col.setRgb(iCol1, iCol2, iCol3, iOpacity);
 	}
-	if(m_currentType==Image)
+	if(m_currentType == Image)
 	{
 		if(m_pImage)
 		{
@@ -183,29 +182,33 @@ KVSO_CLASS_FUNCTION(pixmap,fill)
 			*m_pPixmap = QPixmap::fromImage(*m_pImage);
 			delete m_pImage;
 			m_pImage = 0;
-		} else {
+		}
+		else
+		{
 			m_pPixmap = 0;
 		}
-	} else if(m_currentType==AnimatedPixmap) {
-	      delete m_pAnimatedPixmap;
-	      m_pAnimatedPixmap=0;
+	}
+	else if(m_currentType == AnimatedPixmap)
+	{
+		delete m_pAnimatedPixmap;
+		m_pAnimatedPixmap = 0;
 	}
 	m_currentType = Pixmap;
 	if(!m_pPixmap)
-		m_pPixmap=new QPixmap();
+		m_pPixmap = new QPixmap();
 	m_pPixmap->fill(col);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,resize)
+KVSO_CLASS_FUNCTION(pixmap, resize)
 {
-	kvs_int_t iWidth,iHeight;
+	kvs_int_t iWidth, iHeight;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("width",KVS_PT_INTEGER,0,iWidth)
-		KVSO_PARAMETER("height",KVS_PT_INTEGER,0,iHeight)
+	KVSO_PARAMETER("width", KVS_PT_INTEGER, 0, iWidth)
+	KVSO_PARAMETER("height", KVS_PT_INTEGER, 0, iHeight)
 	KVSO_PARAMETERS_END(c)
 
-	if(m_currentType==Image)
+	if(m_currentType == Image)
 	{
 		if(m_pImage)
 		{
@@ -213,110 +216,125 @@ KVSO_CLASS_FUNCTION(pixmap,resize)
 			m_pImage = 0;
 		}
 	}
-	else if(m_currentType==AnimatedPixmap) {
+	else if(m_currentType == AnimatedPixmap)
+	{
 		if(m_pAnimatedPixmap)
 		{
 			delete m_pAnimatedPixmap;
-			m_pAnimatedPixmap=0;
+			m_pAnimatedPixmap = 0;
 		}
-	} else if(m_pPixmap) {
+	}
+	else if(m_pPixmap)
+	{
 		delete m_pPixmap;
 	}
 	m_currentType = Image;
-	m_pImage=new QImage(iWidth,iHeight,QImage::Format_ARGB32_Premultiplied);
+	m_pImage = new QImage(iWidth, iHeight, QImage::Format_ARGB32_Premultiplied);
 	m_pImage->fill(Qt::transparent);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,setPixel)
+KVSO_CLASS_FUNCTION(pixmap, setPixel)
 {
-	kvs_int_t iCol1,iCol2,iCol3,iOpacity,iX,iY;
-	QString szColorMode,szColor;
-	KviKvsVariant *var1,*var2,*var3;
+	kvs_int_t iCol1, iCol2, iCol3, iOpacity, iX, iY;
+	QString szColorMode, szColor;
+	KviKvsVariant *var1, *var2, *var3;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("x",KVS_PT_INTEGER,0,iX)
-		KVSO_PARAMETER("y",KVS_PT_INTEGER,0,iY)
-		KVSO_PARAMETER("Color_1_Or_Colorname",KVS_PT_VARIANT,0,var1)
-		KVSO_PARAMETER("Color_2",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var2)
-		KVSO_PARAMETER("Colo3_3",KVS_PT_VARIANT,KVS_PF_OPTIONAL,var3)
-		KVSO_PARAMETER("color_mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szColorMode)
-		KVSO_PARAMETER("opacity",KVS_PT_INT,KVS_PF_OPTIONAL,iOpacity)
+	KVSO_PARAMETER("x", KVS_PT_INTEGER, 0, iX)
+	KVSO_PARAMETER("y", KVS_PT_INTEGER, 0, iY)
+	KVSO_PARAMETER("Color_1_Or_Colorname", KVS_PT_VARIANT, 0, var1)
+	KVSO_PARAMETER("Color_2", KVS_PT_VARIANT, KVS_PF_OPTIONAL, var2)
+	KVSO_PARAMETER("Colo3_3", KVS_PT_VARIANT, KVS_PF_OPTIONAL, var3)
+	KVSO_PARAMETER("color_mode", KVS_PT_STRING, KVS_PF_OPTIONAL, szColorMode)
+	KVSO_PARAMETER("opacity", KVS_PT_INT, KVS_PF_OPTIONAL, iOpacity)
 	KVSO_PARAMETERS_END(c)
 
 	QColor col;
-	if (!var1->asInteger(iCol1))
+	if(!var1->asInteger(iCol1))
 	{
 		var1->asString(szColor);
-		if (c->paramCount()<4)
+		if(c->paramCount() < 4)
+		{
+			iOpacity = 255;
+		}
+		else
 		{
-			iOpacity=255;
-		} else {
-			if (!var2->asInteger(iOpacity))
+			if(!var2->asInteger(iOpacity))
 			{
-				c->warning(__tr2qs_ctx("The opacity parameter didn't evaluate to integer","objects"));
+				c->warning(__tr2qs_ctx("The opacity parameter didn't evaluate to integer", "objects"));
 				return true;
 			}
 		}
 		col.setNamedColor(szColor);
 		col.setAlpha(iOpacity);
-	} else {
-		if(c->paramCount()<5)
+	}
+	else
+	{
+		if(c->paramCount() < 5)
 		{
-			c->error(__tr2qs_ctx("Color name or triplet RGB/HSV value required","objects"));
+			c->error(__tr2qs_ctx("Color name or triplet RGB/HSV value required", "objects"));
 			return true;
 		}
-		if (!var2->asInteger(iCol2)||!var3->asInteger(iCol3))
+		if(!var2->asInteger(iCol2) || !var3->asInteger(iCol3))
 		{
-			c->error(__tr2qs_ctx("One of the triplet parameters didn't evaluate to an integer","objects"));\
+			c->error(__tr2qs_ctx("One of the triplet parameters didn't evaluate to an integer", "objects"));
 			return true;
 		}
-		if (c->paramCount()<7)
-			iOpacity=255;
+		if(c->paramCount() < 7)
+			iOpacity = 255;
 
 		if(KviQString::equalCI(szColorMode, "HSV"))
-			col.setHsv(iCol1,iCol2,iCol3,iOpacity);
+			col.setHsv(iCol1, iCol2, iCol3, iOpacity);
 		else
-			col.setRgb(iCol1,iCol2,iCol3,iOpacity);
+			col.setRgb(iCol1, iCol2, iCol3, iOpacity);
 	}
 
-	if(m_currentType==AnimatedPixmap)
+	if(m_currentType == AnimatedPixmap)
 	{
-		c->warning(__tr2qs_ctx("AnimatedPixmap not supported","objects"));
+		c->warning(__tr2qs_ctx("AnimatedPixmap not supported", "objects"));
 		return true;
-	} else if((m_currentType==Image && !m_pImage) || (m_currentType==Pixmap && !m_pPixmap)) {
-		c->error(__tr2qs_ctx("The pixmap is null","objects"));
+	}
+	else if((m_currentType == Image && !m_pImage) || (m_currentType == Pixmap && !m_pPixmap))
+	{
+		c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 		return false;
-	} else if(m_currentType==Pixmap) {
+	}
+	else if(m_currentType == Pixmap)
+	{
 		delete m_pImage;
 		m_pImage = new QImage();
 		*m_pImage = m_pPixmap->toImage();
 		delete m_pPixmap;
 	}
 	m_currentType = Image;
-	m_pImage->setPixel(iX,iY,col.rgba());
+	m_pImage->setPixel(iX, iY, col.rgba());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,pixel)
+KVSO_CLASS_FUNCTION(pixmap, pixel)
 {
-	kvs_int_t iX,iY;
+	kvs_int_t iX, iY;
 	QString szFlags;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("x",KVS_PT_INTEGER,0,iX)
-		KVSO_PARAMETER("y",KVS_PT_INTEGER,0,iY)
-		KVSO_PARAMETER("b",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
+	KVSO_PARAMETER("x", KVS_PT_INTEGER, 0, iX)
+	KVSO_PARAMETER("y", KVS_PT_INTEGER, 0, iY)
+	KVSO_PARAMETER("b", KVS_PT_STRING, KVS_PF_OPTIONAL, szFlags)
 	KVSO_PARAMETERS_END(c)
 
-	if(m_currentType==AnimatedPixmap)
+	if(m_currentType == AnimatedPixmap)
 	{
-		c->warning(__tr2qs_ctx("AnimatedPixmap not supported","objects"));
+		c->warning(__tr2qs_ctx("AnimatedPixmap not supported", "objects"));
 		return true;
-	} else if((m_currentType==Image && !m_pImage) || (m_currentType==Pixmap && !m_pPixmap)) {
-		c->error(__tr2qs_ctx("The pixmap is null","objects"));
+	}
+	else if((m_currentType == Image && !m_pImage) || (m_currentType == Pixmap && !m_pPixmap))
+	{
+		c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 		return false;
-	} else if(m_currentType==Pixmap) {
-// 		qDebug("mpimage %i",m_pImage);
-// 		qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height());
+	}
+	else if(m_currentType == Pixmap)
+	{
+		// 		qDebug("mpimage %i",m_pImage);
+		// 		qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height());
 		delete m_pImage;
 		m_pImage = new QImage();
 		*m_pImage = m_pPixmap->toImage();
@@ -324,215 +342,231 @@ KVSO_CLASS_FUNCTION(pixmap,pixel)
 		m_pPixmap = 0;
 	}
 	m_currentType = Image;
-	QRgb rgb= m_pImage->pixel(iX,iY);
+	QRgb rgb = m_pImage->pixel(iX, iY);
 	QColor col(rgb);
-	if(szFlags.isEmpty()){
+	if(szFlags.isEmpty())
+	{
 		c->returnValue()->setString(col.name());
 		return true;
 	}
-	KviKvsVariant *pRed = new KviKvsVariant((kvs_int_t)col.red());
-	KviKvsVariant *pGreen = new KviKvsVariant((kvs_int_t)col.green());
-	KviKvsVariant *pBlue = new KviKvsVariant((kvs_int_t)col.blue());
-	if (szFlags.indexOf('a',0,Qt::CaseInsensitive) != -1){
-		KviKvsArray *pArray = new KviKvsArray();
-		pArray->set(0,pRed);
-		pArray->set(1,pGreen);
-		pArray->set(2,pBlue);
+	KviKvsVariant * pRed = new KviKvsVariant((kvs_int_t)col.red());
+	KviKvsVariant * pGreen = new KviKvsVariant((kvs_int_t)col.green());
+	KviKvsVariant * pBlue = new KviKvsVariant((kvs_int_t)col.blue());
+	if(szFlags.indexOf('a', 0, Qt::CaseInsensitive) != -1)
+	{
+		KviKvsArray * pArray = new KviKvsArray();
+		pArray->set(0, pRed);
+		pArray->set(1, pGreen);
+		pArray->set(2, pBlue);
 		c->returnValue()->setArray(pArray);
-	} else if (szFlags.indexOf('h',0,Qt::CaseInsensitive) != -1){
-		KviKvsHash *pHash = new KviKvsHash();
-		pHash->set("red",pRed);
-		pHash->set("green",pGreen);
-		pHash->set("blue",pBlue);
+	}
+	else if(szFlags.indexOf('h', 0, Qt::CaseInsensitive) != -1)
+	{
+		KviKvsHash * pHash = new KviKvsHash();
+		pHash->set("red", pRed);
+		pHash->set("green", pGreen);
+		pHash->set("blue", pBlue);
 	}
 	return true;
 }
-KVSO_CLASS_FUNCTION(pixmap,rotate)
+KVSO_CLASS_FUNCTION(pixmap, rotate)
 {
 	kvs_real_t dAngle;
 	QString szAxis;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("angle",KVS_PT_DOUBLE,0,dAngle)
-		KVSO_PARAMETER("axis",KVS_PT_STRING,KVS_PF_OPTIONAL,szAxis)
+	KVSO_PARAMETER("angle", KVS_PT_DOUBLE, 0, dAngle)
+	KVSO_PARAMETER("axis", KVS_PT_STRING, KVS_PF_OPTIONAL, szAxis)
 	KVSO_PARAMETERS_END(c)
 
 	Qt::Axis axis = Qt::ZAxis;
 	if(!szAxis.isEmpty())
 	{
-		if (KviQString::equalCI(szAxis,"XAxis"))
-			axis=Qt::XAxis;
-		else if (KviQString::equalCI(szAxis,"YAxis"))
-			axis=Qt::YAxis;
-		else if (KviQString::equalCI(szAxis,"ZAxis"))
-			axis=Qt::ZAxis;
+		if(KviQString::equalCI(szAxis, "XAxis"))
+			axis = Qt::XAxis;
+		else if(KviQString::equalCI(szAxis, "YAxis"))
+			axis = Qt::YAxis;
+		else if(KviQString::equalCI(szAxis, "ZAxis"))
+			axis = Qt::ZAxis;
 		else
-			c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis","objects"),&szAxis);
+			c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis", "objects"), &szAxis);
 	}
 
-	if(m_currentType==Pixmap)
+	if(m_currentType == Pixmap)
 	{
 		if(m_pPixmap)
 		{
 			if(!m_pImage)
 				m_pImage = new QImage();
 			*m_pImage = m_pPixmap->toImage();
-		} else {
-			c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		}
+		else
+		{
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 			return false;
 		}
-	} else if(m_currentType==AnimatedPixmap) {
-		c->warning(__tr2qs_ctx("AnimatedPixmap not supported","objects"));
+	}
+	else if(m_currentType == AnimatedPixmap)
+	{
+		c->warning(__tr2qs_ctx("AnimatedPixmap not supported", "objects"));
 		return true;
 	}
 
 	if(!m_pImage)
 	{
-		c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 		return false;
 	}
 	m_currentType = Image;
 	QTransform transform;
-	transform.rotate(dAngle,axis);
-	*m_pImage=m_pImage->transformed(transform);
+	transform.rotate(dAngle, axis);
+	*m_pImage = m_pImage->transformed(transform);
 	return true;
 }
 
-
-KVSO_CLASS_FUNCTION(pixmap,mirrored)
+KVSO_CLASS_FUNCTION(pixmap, mirrored)
 {
-        bool bHorizontal,bVertical;
+	bool bHorizontal, bVertical;
 
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("bHorizontal",KVS_PT_BOOLEAN,0,bHorizontal)
-	        KVSO_PARAMETER("bVertical",KVS_PT_BOOLEAN,0,bVertical)
+	KVSO_PARAMETER("bHorizontal", KVS_PT_BOOLEAN, 0, bHorizontal)
+	KVSO_PARAMETER("bVertical", KVS_PT_BOOLEAN, 0, bVertical)
 	KVSO_PARAMETERS_END(c)
-	if(m_currentType==Pixmap)
+	if(m_currentType == Pixmap)
 	{
 		if(m_pPixmap)
 		{
-			if(!m_pImage) m_pImage = new QImage();
+			if(!m_pImage)
+				m_pImage = new QImage();
 			*m_pImage = m_pPixmap->toImage();
-		} else {
-			c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		}
+		else
+		{
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 			return false;
 		}
-	} else if(m_currentType==AnimatedPixmap) {
-		c->warning(__tr2qs_ctx("AnimatedPixmap not supported","objects"));
+	}
+	else if(m_currentType == AnimatedPixmap)
+	{
+		c->warning(__tr2qs_ctx("AnimatedPixmap not supported", "objects"));
 		return true;
 	}
 
 	if(!m_pImage)
 	{
-		c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 		return false;
 	}
 	m_currentType = Image;
-	*m_pImage=m_pImage->mirrored(bHorizontal,bVertical);
+	*m_pImage = m_pImage->mirrored(bHorizontal, bVertical);
 	return true;
 }
 
-
-
-KVSO_CLASS_FUNCTION(pixmap,scale)
+KVSO_CLASS_FUNCTION(pixmap, scale)
 {
-        kvs_int_t iWidth,iHeight;
-        QString szAspectRatio;
-        KVSO_PARAMETERS_BEGIN(c)
-            KVSO_PARAMETER("width",KVS_PT_INTEGER,0,iWidth)
-            KVSO_PARAMETER("height",KVS_PT_INTEGER,0,iHeight)
-            KVSO_PARAMETER("aspect_ratio",KVS_PT_STRING,KVS_PF_OPTIONAL,szAspectRatio)
-        KVSO_PARAMETERS_END(c)
-        Qt::AspectRatioMode ratio=Qt::KeepAspectRatio;
-        if(!szAspectRatio.isEmpty())
-        {
-            if(KviQString::equalCI(szAspectRatio,"IgnoreAspectRatio")) ratio=Qt::IgnoreAspectRatio;
-            else if (KviQString::equalCI(szAspectRatio,"KeepAspectRatio")) ratio=Qt::KeepAspectRatio;
-            else if (KviQString::equalCI(szAspectRatio,"KeepAspectRatioByExpanding")) ratio=Qt::KeepAspectRatioByExpanding;
-            else  c->warning(__tr2qs_ctx("Unknown aspect ratio %Q - Switching to KeepAspectRatio ratio","objects"),&szAspectRatio);
-        }
-        if(m_currentType==Pixmap)
-        {
-	        if(m_pPixmap)
-		*m_pPixmap=m_pPixmap->scaled(iWidth,iHeight,ratio,Qt::SmoothTransformation);
-	        else{
-		    c->error(__tr2qs_ctx("The pixmap is null","objects"));
-		    return false;
-	        }
-        }
-        else if (m_currentType==AnimatedPixmap)
-	        m_pAnimatedPixmap->resize(QSize(iWidth,iHeight),ratio);
-        else if(m_currentType==Image)
-        {
+	kvs_int_t iWidth, iHeight;
+	QString szAspectRatio;
+	KVSO_PARAMETERS_BEGIN(c)
+	KVSO_PARAMETER("width", KVS_PT_INTEGER, 0, iWidth)
+	KVSO_PARAMETER("height", KVS_PT_INTEGER, 0, iHeight)
+	KVSO_PARAMETER("aspect_ratio", KVS_PT_STRING, KVS_PF_OPTIONAL, szAspectRatio)
+	KVSO_PARAMETERS_END(c)
+	Qt::AspectRatioMode ratio = Qt::KeepAspectRatio;
+	if(!szAspectRatio.isEmpty())
+	{
+		if(KviQString::equalCI(szAspectRatio, "IgnoreAspectRatio"))
+			ratio = Qt::IgnoreAspectRatio;
+		else if(KviQString::equalCI(szAspectRatio, "KeepAspectRatio"))
+			ratio = Qt::KeepAspectRatio;
+		else if(KviQString::equalCI(szAspectRatio, "KeepAspectRatioByExpanding"))
+			ratio = Qt::KeepAspectRatioByExpanding;
+		else
+			c->warning(__tr2qs_ctx("Unknown aspect ratio %Q - Switching to KeepAspectRatio ratio", "objects"), &szAspectRatio);
+	}
+	if(m_currentType == Pixmap)
+	{
+		if(m_pPixmap)
+			*m_pPixmap = m_pPixmap->scaled(iWidth, iHeight, ratio, Qt::SmoothTransformation);
+		else
+		{
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
+			return false;
+		}
+	}
+	else if(m_currentType == AnimatedPixmap)
+		m_pAnimatedPixmap->resize(QSize(iWidth, iHeight), ratio);
+	else if(m_currentType == Image)
+	{
 		if(!m_pImage)
 		{
-			c->error(__tr2qs_ctx("The pixmap is null","objects"));
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 			return false;
 		}
-		*m_pImage=m_pImage->scaled(iWidth,iHeight,ratio,Qt::SmoothTransformation);
-        }
-        return true;
+		*m_pImage = m_pImage->scaled(iWidth, iHeight, ratio, Qt::SmoothTransformation);
+	}
+	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,loadAnimation)
+KVSO_CLASS_FUNCTION(pixmap, loadAnimation)
 {
 	QString szFile;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("file",KVS_PT_STRING,0,szFile)
+	KVSO_PARAMETER("file", KVS_PT_STRING, 0, szFile)
 	KVSO_PARAMETERS_END(c)
 
 	if(!QFile::exists(szFile))
 	{
-		c->warning(__tr2qs_ctx("I can't find the specified file '%Q'.","objects"),&szFile);
+		c->warning(__tr2qs_ctx("I can't find the specified file '%Q'.", "objects"), &szFile);
 		return true;
 	}
-	if (m_pAnimatedPixmap) {
+	if(m_pAnimatedPixmap)
+	{
 		delete m_pAnimatedPixmap;
 		m_pAnimatedPixmap = 0;
 	}
-	if (m_pPixmap)
+	if(m_pPixmap)
 	{
 		delete m_pPixmap;
-		m_pPixmap=0;
+		m_pPixmap = 0;
 	}
-	m_pAnimatedPixmap= new KviAnimatedPixmap(szFile);
-	connect(m_pAnimatedPixmap,SIGNAL(frameChanged()),this,SLOT(frameChanged()));
+	m_pAnimatedPixmap = new KviAnimatedPixmap(szFile);
+	connect(m_pAnimatedPixmap, SIGNAL(frameChanged()), this, SLOT(frameChanged()));
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,startAnimation)
+KVSO_CLASS_FUNCTION(pixmap, startAnimation)
 {
 	Q_UNUSED(c);
-	if (m_pAnimatedPixmap)
+	if(m_pAnimatedPixmap)
 		m_pAnimatedPixmap->start();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,stopAnimation)
+KVSO_CLASS_FUNCTION(pixmap, stopAnimation)
 {
 	Q_UNUSED(c);
-	if (m_pAnimatedPixmap)
+	if(m_pAnimatedPixmap)
 		m_pAnimatedPixmap->stop();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,load)
+KVSO_CLASS_FUNCTION(pixmap, load)
 {
 	QString szFile;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("file",KVS_PT_STRING,0,szFile)
+	KVSO_PARAMETER("file", KVS_PT_STRING, 0, szFile)
 	KVSO_PARAMETERS_END(c)
 
 	if(!QFile::exists(szFile))
 	{
-		c->warning(__tr2qs_ctx("I can't find the specified file '%Q'.","objects"),&szFile);
+		c->warning(__tr2qs_ctx("I can't find the specified file '%Q'.", "objects"), &szFile);
 		return true;
 	}
 	if(!m_pImage)
-		m_pImage=new QImage();
+		m_pImage = new QImage();
 	m_currentType = Image;
 	m_pImage->load(szFile);
 	return true;
-/*
+	/*
  *	FIXME UNUSED CODE
 	if (m_currentType==Image && m_pImage)
 		delete m_pImage;
@@ -546,106 +580,114 @@ KVSO_CLASS_FUNCTION(pixmap,load)
 */
 }
 
-KVSO_CLASS_FUNCTION(pixmap,save)
+KVSO_CLASS_FUNCTION(pixmap, save)
 {
 	QString szFile;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("file",KVS_PT_STRING,0,szFile)
+	KVSO_PARAMETER("file", KVS_PT_STRING, 0, szFile)
 	KVSO_PARAMETERS_END(c)
 
-	if(m_currentType==Pixmap)
+	if(m_currentType == Pixmap)
 	{
 		if(m_pPixmap)
 		{
 			m_pPixmap->save(szFile);
-		} else {
-			c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		}
+		else
+		{
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 			return false;
 		}
-	} else if(m_currentType==Image) {
+	}
+	else if(m_currentType == Image)
+	{
 		if(m_pImage)
 		{
 			m_pImage->save(szFile);
-		} else {
-			c->error(__tr2qs_ctx("The pixmap is null","objects"));
+		}
+		else
+		{
+			c->error(__tr2qs_ctx("The pixmap is null", "objects"));
 			return false;
 		}
-	} else {
+	}
+	else
+	{
 		m_pAnimatedPixmap->pixmap()->save(szFile);
 	}
 	return true;
 }
 
-void KvsObject_pixmap::setInternalPixmap(QPixmap *pPixmap)
+void KvsObject_pixmap::setInternalPixmap(QPixmap * pPixmap)
 {
-	if(m_currentType==Image && m_pImage)
+	if(m_currentType == Image && m_pImage)
 		delete m_pImage;
-	else if(m_currentType==Pixmap && m_pPixmap)
+	else if(m_currentType == Pixmap && m_pPixmap)
 		delete m_pPixmap;
-	m_currentType=Pixmap;
-	m_pPixmap=pPixmap;
+	m_currentType = Pixmap;
+	m_pPixmap = pPixmap;
 }
-void KvsObject_pixmap::setInternalImage(QImage *pImage)
+void KvsObject_pixmap::setInternalImage(QImage * pImage)
 {
-	if(m_currentType==Image && m_pImage)
+	if(m_currentType == Image && m_pImage)
 		delete m_pImage;
-	else if(m_currentType==Pixmap && m_pPixmap)
+	else if(m_currentType == Pixmap && m_pPixmap)
 		delete m_pPixmap;
-	m_currentType=Image;
-	m_pImage=pImage;
+	m_currentType = Image;
+	m_pImage = pImage;
 }
-KVSO_CLASS_FUNCTION(pixmap,loadFromMemoryBuffer)
+KVSO_CLASS_FUNCTION(pixmap, loadFromMemoryBuffer)
 {
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("hobject",KVS_PT_HOBJECT,0,hObject)
+	KVSO_PARAMETER("hobject", KVS_PT_HOBJECT, 0, hObject)
 	KVSO_PARAMETERS_END(c)
 
-	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-	if (!pObject)
+	pObject = KviKvsKernel::instance()->objectController()->lookupObject(hObject);
+	if(!pObject)
 	{
-		c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects"));
+		c->warning(__tr2qs_ctx("Buffer parameter is not an object", "objects"));
 		return true;
 	}
-	if (!pObject->inheritsClass("memorybuffer"))
+	if(!pObject->inheritsClass("memorybuffer"))
 	{
-		c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects"));
+		c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object", "objects"));
 		return true;
 	}
-	if (m_pAnimatedPixmap)
+	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap=0;
+		m_pAnimatedPixmap = 0;
 	}
-	if (!m_pPixmap)
-		m_pPixmap=new QPixmap();
+	if(!m_pPixmap)
+		m_pPixmap = new QPixmap();
 	m_pPixmap->loadFromData(((KvsObject_memoryBuffer *)pObject)->dataBuffer());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,grabWidget)
+KVSO_CLASS_FUNCTION(pixmap, grabWidget)
 {
 	CHECK_INTERNAL_POINTER(m_pPixmap)
 	KviKvsObject * pObject;
 	kvs_hobject_t hObject;
 	KVSO_PARAMETERS_BEGIN(c)
-	       KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
+	KVSO_PARAMETER("widget", KVS_PT_HOBJECT, 0, hObject)
 	KVSO_PARAMETERS_END(c)
 
-	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
+	pObject = KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	CHECK_HOBJECT_IS_WIDGET(pObject)
-	if (m_pAnimatedPixmap)
+	if(m_pAnimatedPixmap)
 	{
 		delete m_pAnimatedPixmap;
-		m_pAnimatedPixmap=0;
+		m_pAnimatedPixmap = 0;
 	}
-	if (!m_pPixmap)
-		m_pPixmap=new QPixmap();
-	*m_pPixmap=QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
+	if(!m_pPixmap)
+		m_pPixmap = new QPixmap();
+	*m_pPixmap = QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
 	return true;
 
-/*	FIXME UNUSED CODE
+	/*	FIXME UNUSED CODE
 	QString szFileName;
 	KVSO_PARAMETERS_BEGIN(c)
 			KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
@@ -661,11 +703,11 @@ KVSO_CLASS_FUNCTION(pixmap,grabWidget)
 */
 }
 
-KVSO_CLASS_FUNCTION(pixmap,height)
+KVSO_CLASS_FUNCTION(pixmap, height)
 {
-	if (m_currentType==Image && m_pImage)
-		 c->returnValue()->setInteger(m_pImage->height());
-	else if(m_currentType==Pixmap && m_pPixmap)
+	if(m_currentType == Image && m_pImage)
+		c->returnValue()->setInteger(m_pImage->height());
+	else if(m_currentType == Pixmap && m_pPixmap)
 		c->returnValue()->setInteger(m_pPixmap->height());
 	else
 		c->returnValue()->setInteger(0);
@@ -674,17 +716,17 @@ KVSO_CLASS_FUNCTION(pixmap,height)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(pixmap,width)
+KVSO_CLASS_FUNCTION(pixmap, width)
 {
-	if (m_currentType==Image && m_pImage)
+	if(m_currentType == Image && m_pImage)
 		c->returnValue()->setInteger(m_pImage->width());
-	else if(m_currentType==Pixmap && m_pPixmap)
+	else if(m_currentType == Pixmap && m_pPixmap)
 		c->returnValue()->setInteger(m_pPixmap->width());
 	else
 		c->returnValue()->setInteger(0);
 	//else if(m_pAnimatedPixmap) c->returnValue()->setInteger(m_pAnimatedPixmap->size().height());
 	//else c->returnValue()->setInteger(m_pPixmap->height());
-	 return true;
+	return true;
 }
 
 /*QPixmap * KvsObject_pixmap::getPixmap()
@@ -693,15 +735,15 @@ KVSO_CLASS_FUNCTION(pixmap,width)
 	else if(m_pAnimatedPixmap) return m_pAnimatedPixmap->pixmap();
 	else return m_pPixmap;
 }*/
-KVSO_CLASS_FUNCTION(pixmap,frameChangedEvent)
+KVSO_CLASS_FUNCTION(pixmap, frameChangedEvent)
 {
-	emitSignal("frameChanged",c);
+	emitSignal("frameChanged", c);
 	return true;
 }
 
 // slots
 void KvsObject_pixmap::frameChanged()
 {
-	KviKvsVariantList *params=0;
-	callFunction(this,"frameChangedEvent",params);
+	KviKvsVariantList * params = 0;
+	callFunction(this, "frameChangedEvent", params);
 }