Improvements in mdichild names + code cleaning

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3842 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 43 insertions, 49 deletions

diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index d1ce77c6a..63165335a 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -176,7 +176,7 @@ const char * const brushstyles_tbl[] = {
 		%aa->$show()[br]
 		!fn: $drawRect(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>)
 		Draws a rectangle with upper left corner at (x, y) and with width w and height h.
-                !fn: $drawRoundRect(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>,<xCor:integer>,<yCor:integer>)
+                !fn: $drawRoundRect(<start_angle:integer>,<angle_length:integer>,<width:unsigned integer>,<height:unsigned integer>,<xr:integer>,<y:integer>)
 		Draws a rectangle with rounded corners at (x, y), with width w and height h.[rb]
 		The xCor and yCor arguments specify how rounded the corners should be (range is 0->99).
 		!fn: $drawPie(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>,<angle:integer>,<alen:integer>)
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index b296af2ef..127669eca 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -90,14 +90,7 @@
 		This signal is emitted by the default implementation of [classfnc]$clickEvent[/classfnc]().[br]
 */
 
-// we should remove these functions?
-/*
-	!fn:$setPopupDelay (<int delay>)
-		Sets the time delay between pressing the button and the appearance of the associated popup menu in milliseconds to delay.[br]
-		A good value is 100.
-		!fn:<integer> $pupupDelay()
-		Returns the time delay between pressing the button and the appearance of the associated popup menu in milliseconds.
-*/
+
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbutton,"toolbutton","widget")
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setImage)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setUsesBigPixmap)
@@ -114,10 +107,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbutton,"toolbutton","widget")
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setToggleButton)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,toggle)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setOn)
-/*
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,"setPopupDelay", functionsetPopupDelay)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,"popupDelay", functionpopupDelay)
-	*/
+
 
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setTextPosition)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,textPosition)
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 546c5c23d..2de6e9b77 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -118,7 +118,6 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wrapper)
 bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	if( !pParams ) return false;
-
 	QWidget *pWidget = 0;
 	unsigned int i=0;
 	while(i!=pParams->count())
@@ -129,41 +128,47 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		pParams->at(i)->asString(s);
 		if (!s.isEmpty())
 		{
-		int idx = s.indexOf("::");
-		if( idx != -1 ) {
-			szClass = s.left(idx);
-			szName  = s.right(s.length() - idx - 2);
-		} else {
-			szClass = s;
-			szName  = "";
-		}
-
-		if(KviQString::equalCI(szClass,"WinId"))
-		{
-			if(pWidget)
-			{
-				pContext->warning(__tr2qs_ctx("The window identifier preceded by WinId must be the first object in the search path","objects"));
-				return false;
-			} else {
-				pWidget = g_pApp->findWindow(szName);
-			}
-		} 		else {
-		if(pWidget) {
-    pWidget = findWidgetToWrap(
-     !szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "", pWidget
-    );
-   } else {
-    pWidget = findTopLevelWidgetToWrap(!szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "");
-   }
-		}
-		if( !pWidget )
-		{
-			pContext->warning(__tr2qs_ctx("Failed to find one of the wrap path widgets ('%Q::%Q')","objects"),&szClass,&szName);
-			return false;
-		}
-	}
+                        int idx = s.indexOf("::");
+                        if( idx != -1 )
+                        {
+                            szClass = s.left(idx);
+                            szName  = s.right(s.length() - idx - 2);
+                        }
+                        else
+                        {
+                            szClass = s;
+                            szName  = "";
+                        }
+                        if(KviQString::equalCI(szClass,"WinId"))
+                        {
+                            if(pWidget)
+                            {
+                                pContext->warning(__tr2qs_ctx("The window identifier preceded by WinId must be the first object in the search path","objects"));
+                                return false;
+                            }
+                            else
+                            {
+                                pWidget = g_pApp->findWindow(szName);
+                            }
+                        }
+                        else
+                        {
+                            if(pWidget)
+                            {
+                                pWidget = findWidgetToWrap(!szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "", pWidget);
+                            }
+                            else
+                            {
+                                pWidget = findTopLevelWidgetToWrap(!szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "");
+                            }
+                        }
+                        if( !pWidget )
+                        {
+                            pContext->warning(__tr2qs_ctx("Failed to find one of the wrap path widgets ('%Q::%Q')","objects"),&szClass,&szName);
+                            return false;
+                        }
+                }
 		i++;
-
 	}
 	if( !pWidget )
 	{
@@ -171,7 +176,6 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		return false;
 	}
 	setObject(pWidget,false);
-
 	return true;
 }
 QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, const QString szName)