4 files changed, 25 insertions, 25 deletions

diff --git a/src/modules/objects/KvsObject_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index 4953bfba0..e1269ba24 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -287,30 +287,31 @@ KVSO_CLASS_FUNCTION(layout,setAlignment)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	CHECK_HOBJECT_IS_WIDGET(pObject)
 	int index=((QGridLayout *)widget())->indexOf(((QWidget *)(pObject->object())));
-	if(index ==-1)
+	if(index == -1)
 	{
 		c->warning(__tr2qs_ctx("The widget must be a child of this layout","objects"));
 		return true;
 	}
 
-	int align,sum=0;
-	for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it )
+	int align, sum = 0;
+	for(auto& it : alignment)
 	{
 		align = 0;
-		for(unsigned int j = 0; j < align_num; j++)
+		for(size_t j{}; j < align_num; j++)
 		{
-			if(KviQString::equalCI((*it), align_tbl[j]))
+			if(KviQString::equalCI(it, align_tbl[j]))
 			{
-				align=align_cod[j];
+				align = align_cod[j];
 				break;
 			}
 		}
 		if(align)
 			sum = sum | align;
 		else
-			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it));
-
+			c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&it);
 	}
-	if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
+
+	if(widget())
+		((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_layout.h b/src/modules/objects/KvsObject_layout.h
index 830ce3e3a..621ff3605 100644
--- a/src/modules/objects/KvsObject_layout.h
+++ b/src/modules/objects/KvsObject_layout.h
@@ -45,9 +45,6 @@ protected:
 	bool addColSpacing(KviKvsObjectFunctionCall *c);
 	bool setResizeMode(KviKvsObjectFunctionCall *c);
 	bool setAlignment(KviKvsObjectFunctionCall *c);
-
-
 };
 
-
 #endif //_CLASS_LAYOUT_H_
diff --git a/src/modules/objects/KvsObject_toolBar.h b/src/modules/objects/KvsObject_toolBar.h
index d4f0be8d7..21f733519 100644
--- a/src/modules/objects/KvsObject_toolBar.h
+++ b/src/modules/objects/KvsObject_toolBar.h
@@ -44,5 +44,4 @@ protected:
 	bool clear(KviKvsObjectFunctionCall *c);
 };
 
-
 #endif	//!_CLASS_TOOLBAR_H_
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 79aeb42c1..dca8b0c73 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -482,7 +482,7 @@ const char * const widgettypes_tbl[] = {
 		Translates widget coordinates into the global screen coordinate pos.
 		!fn: integer $globalCursorX()
 		Return the x coordinate of mouse pointer global position.
-	   	!fn: integer $globalCursorY()
+		!fn: integer $globalCursorY()
 		Return the y coordinate of the mo>use pointer global position.
 		!fn: <tip:string> $maybeTipEvent(<x_tip_pos:integer>,<y_tip_pos:integer>)
 		This event handler is called when an eventual tip is going to be show.
@@ -663,7 +663,7 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_widget,"widget","object")
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,addWidgetToWrappedLayout)
 
 	// colors and image
-        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setForegroundColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setForegroundColor)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setBackgroundColor)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setBackgroundImage)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,backgroundColor)
@@ -971,8 +971,8 @@ bool KvsObject_widget::eventFilter(QObject *o,QEvent *e)
 			//qDebug ("Propagation %i",ret);
 
 		return ret;
-	     }
-	   }
+		 }
+	}
 	/*
 	if(o->parent())
 	{
@@ -982,7 +982,7 @@ bool KvsObject_widget::eventFilter(QObject *o,QEvent *e)
 		qDebug("Propagation to object");
 	*/
 		return KviKvsObject::eventFilter(o,e);
-	//     }
+	//}
 }
 
 
@@ -1803,12 +1803,15 @@ KVSO_CLASS_FUNCTION(widget,setParent)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hObject)
 	KVSO_PARAMETERS_END(c)
-	ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-	if(!widget())    return true;
+	ob = KviKvsKernel::instance()->objectController()->lookupObject(hObject);
+
+	if(!widget())
+		return true;
+
 	if(!ob)
 	{
-                widget()->setParent(0);
-   		return true;
+		widget()->setParent(0);
+		return true;
 	}
 	else
 	if(!ob->object()->isWidgetType())
@@ -1816,7 +1819,7 @@ KVSO_CLASS_FUNCTION(widget,setParent)
 		c->warning(__tr2qs_ctx("Parent must be a widget object","objects"));
 		return true;
 	}
-        widget()->setParent(((QWidget *)(ob->object())));
+	widget()->setParent(((QWidget *)(ob->object())));
 	return true;
 }
 
@@ -1985,7 +1988,7 @@ KVSO_CLASS_FUNCTION(widget,insertIntoStatusBar)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	if (g_pMainWindow->mainStatusBar())
-                g_pMainWindow->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0);
+		g_pMainWindow->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0);
 	return true;
 }
 
@@ -2002,7 +2005,7 @@ KVSO_CLASS_FUNCTION(widget,grab)
 	KviKvsObject *ob;
 	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)
 	qDebug("Get widget");
 	ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);