Updated/removed obsolete code

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

5 files changed, 15 insertions, 47 deletions

diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 8994e5dc3..ffe53b786 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -176,10 +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: $drawWinFocusRect(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>)
-		Draws a Windows focus rectangle with upper left corner at (x, y) and with width w and height h.[br]
-		This function draws nothing if the coordinate system has been rotated or sheared.
-		!fn: $drawRoundRect(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>,<xCor:integer>,<yCor:integer>)
+                !fn: $drawRoundRect(<x:integer>,<y:integer>,<w:unsigned integer>,<h:unsigned integer>,<xCor:integer>,<yCor: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>)
@@ -439,8 +436,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object")
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRect)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawLine)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRoundRect)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawWinFocusRect)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPoint)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPoint)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawArc)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawEllipse)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPie)
@@ -741,22 +737,7 @@ KVSO_CLASS_FUNCTION(painter,drawRect)
 	m_pPainter->drawRect(iX,iY,iW,iH);
 	return true;
 }
-//FIXME: REMOVE functiondrawWinFocusRect
-KVSO_CLASS_FUNCTION(painter,drawWinFocusRect)
-{
-	CHECK_INTERNAL_POINTER(m_pPainter)
-	KviKvsVariant * pXOrArray;
-	kvs_int_t iX,iY,iW,iH;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("x_or_array",KVS_PT_VARIANT,0,pXOrArray)
-		KVSO_PARAMETER("y",KVS_PT_INT,KVS_PF_OPTIONAL,iY)
-		KVSO_PARAMETER("w",KVS_PT_INT,KVS_PF_OPTIONAL,iW)
-		KVSO_PARAMETER("h",KVS_PT_INT,KVS_PF_OPTIONAL,iH)
-	KVSO_PARAMETERS_END(c)
-	QString function="$drawWinFocusRect";
-	KVSO_PARAMETERS_PAINTER(pXOrArray,iY,iW,iH)
-	return true;
-}
+
 
 KVSO_CLASS_FUNCTION(painter,drawEllipse)
 {
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 58380f397..3d454f654 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -33,15 +33,6 @@
 
  #include <QSqlDatabase>
 
-// FIXME: fix the doc (function QT4 renamed)
-// OLD:
-// itemRenamed signal
-// itemRenamed event
-// NEW:
-// itemActivated signal
-// itemActavatedEvent
-
-
 #include <QEvent>
 #include <QDragEnterEvent>
 #include <QDropEvent>
@@ -578,9 +569,6 @@ void KviKvsObject_treewidget::slotCustomContextMenuRequested(const QPoint &pnt)
 
 KVSO_CLASS_FUNCTION(treewidget,itemChangedEvent)
 {
-	//FIXME
-	emitSignal("itemRenamed",c,c->params());//<--remove me
-
 	emitSignal("itemChanged",c,c->params());
 	return true;
 }
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 168524764..9a5c4834f 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -396,6 +396,8 @@ const Qt::WindowType widgettypes_cod[] = {
 		If you call "[cmd]return[/cmd] $true" you will stop the internal processing
 		of this event.
 		The default implementation does nothing.
+                !fn: $setParent(<widget_object:parent>)
+                Sets the parent of the widget to parent
 		!fn: $setWindowIcon(<image_id>)
 		Sets the icon for this widget. This is meaningful only for toplevel widgets.
 		See the [doc:image_id]image identifier[/doc] documentation for the explaination
@@ -621,7 +623,7 @@ const Qt::WindowType widgettypes_cod[] = {
 
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,reparent)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setParent)
 	// apparence
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,show)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,hide)
@@ -1765,8 +1767,7 @@ KVSO_CLASS_FUNCTION(widget,addWidgetToWrappedLayout)
 	lay->addWidget(((QWidget *)(ob->object())));
 	return true;
 }
-//FIXME
-KVSO_CLASS_FUNCTION(widget,reparent)
+KVSO_CLASS_FUNCTION(widget,setParent)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *ob;
@@ -1778,7 +1779,7 @@ KVSO_CLASS_FUNCTION(widget,reparent)
 	if(!widget())    return true;
 	if(!ob)
 	{
-		setParent(0);
+                widget()->setParent(0);
    		return true;
 	}
 	else
@@ -1787,9 +1788,7 @@ KVSO_CLASS_FUNCTION(widget,reparent)
 		c->warning(__tr2qs_ctx("Parent must be a widget object","objects"));
 		return true;
 	}
-	setParent(((QWidget *)(ob->object())));
-
-//	widget()->reparent(((QWidget *)(ob->object())),QPoint(((QWidget *)(ob->object()))->x(),((QWidget *)(ob->object()))->y()));
+        widget()->setParent(((QWidget *)(ob->object())));
 	return true;
 }
 
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index d8eddf1cb..20aaaf23e 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -89,7 +89,7 @@ protected:
 	bool repaint(KviKvsObjectFunctionCall *c);
 	bool insertIntoStatusBar(KviKvsObjectFunctionCall *c);
 	bool removeFromStatusBar(KviKvsObjectFunctionCall *c);
-	bool reparent(KviKvsObjectFunctionCall *c);
+        bool setParent(KviKvsObjectFunctionCall *c);
 	bool resize(KviKvsObjectFunctionCall *c);
 	bool screenResolution(KviKvsObjectFunctionCall * c);
 	bool setAttribute(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index bd534bbe2..208ee9ed4 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -94,7 +94,7 @@ static bool objects_module_cleanup(KviModule *)
 	// Don't attempt to change the order of these calls.
 	// Derived classes must be unregistered before the base ones.
 
-            KviKvsObject_memorybuffer::unregisterSelf();
+        KviKvsObject_memorybuffer::unregisterSelf();
 	KviKvsObject_process::unregisterSelf();
 	KviKvsObject_ftp::unregisterSelf();
 	KviKvsObject_http::unregisterSelf();
@@ -134,11 +134,11 @@ static bool objects_module_cleanup(KviModule *)
 	KviKvsObject_textbrowser::unregisterSelf();
 	KviKvsObject_textedit::unregisterSelf();
 	KviKvsObject_button::unregisterSelf();
-            KviKvsObject_datetimeedit::unregisterSelf();
-            KviKvsObject_tablewidget::unregisterSelf();
-            KviKvsObject_widget::unregisterSelf();
+        KviKvsObject_datetimeedit::unregisterSelf();
+        KviKvsObject_tablewidget::unregisterSelf();
+        KviKvsObject_widget::unregisterSelf();
 	KviKvsObject_list::unregisterSelf();
-            KviKvsObject_sql::unregisterSelf();
+        KviKvsObject_sql::unregisterSelf();
 	KviKvsObject_buttongroup::unregisterSelf();
 
 	return true;