Rename a number of old tq methods that are no longer tq specific

30 files changed, 188 insertions, 188 deletions

diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 9f6e26ae..96ecc40c 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -48,8 +48,8 @@
 	@description:
 		This widget organizes buttons in a group.
 		It will be usually a parent for other child controls.
-		You can either use a child tqlayout to manage the tqchildren geometries
-		or use $setColumnLayout function to manage the tqlayout automatically.
+		You can either use a child layout to manage the children geometries
+		or use $setColumnLayout function to manage the layout automatically.
 		The class ineriths groupbox.
 
 	@functions:
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 40fc473b..3dae8c3c 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -34,7 +34,7 @@
 	#include <tqdockwindow.h>
 	#define TQT_DOCK_WINDOW TQDockWindow
 #endif
-#include <tqlayout.h>
+#include <layout.h>
 
 /*
 	@doc: dockwindow
@@ -49,11 +49,11 @@
 		[class]widget[/class]
 	@description:
 		A window dockable to the KVIrc main frame borders (like a toolbar).
-		The window has an implicit tqlayout that will automatically manage
-		the tqchildren depending on the dock window's orientation.
+		The window has an implicit layout that will automatically manage
+		the children depending on the dock window's orientation.
 	@functions:
 		!fn: $addWidget(<widget:hobject>)
-			Adds <widget> to the internal tqlayout of this dock window.[br]
+			Adds <widget> to the internal layout of this dock window.[br]
 			The widget must be a child of this dock window (otherwise strange things may happen).
 		!fn: <string> $orientation()
 			Returns the string "vertical" or "horizontal" depending on the orientation of this dock window.
diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h
index aa99bb69..21a4c814 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/class_file.h
@@ -25,7 +25,7 @@
 
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include "kvi_string.h"
 
 
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 07f73bea..7c011403 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -29,7 +29,7 @@
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
-// Tables used in $tqsetAlignment , $tqalignment and in $setOrientation & $orientation
+// Tables used in $setAlignment , $alignment and in $setOrientation & $orientation
 
 const char * const align_tbl[] = {
 			"Left",
@@ -60,8 +60,8 @@ const int align_cod[] = {
 	@description:
 		This widget can be used to display a groupbox.
 		It will be usually a parent for other child controls.
-		You can either use a child tqlayout to manage the tqchildren geometries
-		or use $setColumnLayout to manage the tqlayout automatically.
+		You can either use a child layout to manage the children geometries
+		or use $setColumnLayout to manage the layout automatically.
 	@functions:
 		!fn: $setTitle(<text:String>)
 		Sets the group box title to <text>.
@@ -89,14 +89,14 @@ const int align_cod[] = {
 		Returns the number of columns or rows in the groupbox.
 		!fn: $addSpace()
 		Adds an empty cell at the next free position.
-		!fn: <string> $tqalignment()
-		Returns the tqalignment of the group box title.
-		!fn: $tqsetAlignment(<tqalignment:string>)
-		Set the tqalignment of the groupbox;  Valid values are Left,Right,HCenter.
+		!fn: <string> $alignment()
+		Returns the alignment of the group box title.
+		!fn: $setAlignment(<alignment:string>)
+		Set the alignment of the groupbox;  Valid values are Left,Right,HCenter.
 		!fn: $setOrientation<orientation:string>
 		Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical.
 		!fn: $setColumnLayout(<columns:integer>,<orientation:string>)
-		Enables the automatic tqlayout management. The tqchildren are arranged in n columns with the specified orientation.[br]
+		Enables the automatic layout management. The children are arranged in n columns with the specified orientation.[br]
 		Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical.
 	@examples:
 		[example]
@@ -108,7 +108,7 @@ const int align_cod[] = {
 		#then the groupbox [br]
 		%gb=$new(groupbox,%widget)[br]
 		%gb->$setTitle(Login)[br]
-		%gb->$tqsetAlignment("Left")[br]
+		%gb->$setAlignment("Left")[br]
 		[br]
 		#now we create the labels and lineedits.[br]
 		%labeluser=$new(label,%gb)[br]
@@ -120,16 +120,16 @@ const int align_cod[] = {
 		%inputpass->$setechomode("password")[br]
 		[br]
 		#now lets' layouting the groupbox's element's.[br]
-		%layoutgb=$new(tqlayout,%gb)[br]
+		%layoutgb=$new(layout,%gb)[br]
 		%layoutgb->$setmargin(20)[br]
 		%layoutgb->$addwidget(%labeluser,0,0)[br]
 		%layoutgb->$addwidget(%labelpass,1,0)[br]
 		%layoutgb->$addwidget(%inputuser,0,1)[br]
 		%layoutgb->$addwidget(%inputpass,1,1)[br]
 		[br]
-		# now we create a fake widget and managing the two buttons tqlayout.[br]
+		# now we create a fake widget and managing the two buttons layout.[br]
 		%fakewidget=$new(widget,%widget)[br]
-		%layoutbtn=$new(tqlayout,%fakewidget)[br]
+		%layoutbtn=$new(layout,%fakewidget)[br]
 		%btnok=$new(button,%fakewidget)[br]
 		%btnok->$settext("OK")[br]
 		%btncancel=$new(button,%fakewidget)[br]
@@ -137,13 +137,13 @@ const int align_cod[] = {
 		%layoutbtn->$addwidget(%btnok,0,0)[br]
 		%layoutbtn->$addwidget(%btncancel,0,1)[br]
 		[br]
-		#And finally we create a main tqlayout with the groupbox (and its "tqchildren")[br]
-		#and fakewiget (with its buttons tqchildren).
-		%maintqlayout=$new(tqlayout,%widget)[br]
-		%maintqlayout->$setspacing(10)[br]
-		%maintqlayout->$setmargin(10)[br]
-		%maintqlayout->$addwidget(%gb,0,0)[br]
-		%maintqlayout->$addwidget(%fakewidget,1,0)[br]
+		#And finally we create a main layout with the groupbox (and its "children")[br]
+		#and fakewiget (with its buttons children).
+		%mainlayout=$new(layout,%widget)[br]
+		%mainlayout->$setspacing(10)[br]
+		%mainlayout->$setmargin(10)[br]
+		%mainlayout->$addwidget(%gb,0,0)[br]
+		%mainlayout->$addwidget(%fakewidget,1,0)[br]
 		[br]
 		#Let's show our nice login request =D ! [br]
 		%widget->$show()[br]
@@ -165,8 +165,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setColumns", functionSetColumns)
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"columns", functionColumns)
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"addSpace", functionAddSpace)
-	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqalignment", functionAlignment)
-	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"tqsetAlignment", functionSetAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"alignment", functionAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setAlignment", functionSetAlignment)
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setOrientation", functionSetOrientation)
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"isChecked", functionIsChecked)
 	KVSO_REGISTER_HANDLER(KviKvsObject_groupbox,"setChecked", functionSetChecked)
@@ -310,23 +310,23 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
 {
 	TQString szAlign;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlign)
+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlign)
 	KVSO_PARAMETERS_END(c)
 	if (!widget()) return true;
 	for(unsigned int i = 0; i < align_num; i++)
 	{
 		if(KviTQString::equalCI(szAlign, align_tbl[i]))
 		{
-			((KviTalGroupBox *)widget())->tqsetAlignment(align_cod[i]);
+			((KviTalGroupBox *)widget())->setAlignment(align_cod[i]);
 			return true;
 		}
 	}
-	c->warning(__tr2qs("Unknown tqalignment"));
+	c->warning(__tr2qs("Unknown alignment"));
 	return true;
 }
 bool KviKvsObject_groupbox::functionAlignment(KviKvsObjectFunctionCall *c)
 {
-	int mode = ((KviTalGroupBox *)widget())->tqalignment();
+	int mode = ((KviTalGroupBox *)widget())->alignment();
 	TQString szAlignment="";
 	for(unsigned int i = 0; i < align_num; i++)
 	{
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 58c518cc..21167be1 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -35,16 +35,16 @@
 	@type:
 		class
 	@short:
-		Manages child widget horizontal tqgeometry
+		Manages child widget horizontal geometry
 	@inherits:
 		[class]object[/class]
 	@description:
-		The hbox class widget provides horizontal tqgeometry management for its child widgets.
+		The hbox class widget provides horizontal geometry management for its child widgets.
 	@functions:
 		!fn: $setSpacing(<spacing:uint>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:uint>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
 		Sets the stretch factor of widget to stretch.
 */
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index ce2c5365..f0e93e21 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -34,7 +34,7 @@
 
 
 
-// Tables used in $tqsetAlignment & $tqalignment
+// Tables used in $setAlignment & $alignment
 const char * const align_tbl[] = {
 			"Left", 
 			"Right",
@@ -120,7 +120,7 @@ const int frame_cod[] = {
 		[class]widget[/class]
 	@description:
 		This widget can be used to display a text or an image. It can
-		have different frame styles and text/image tqalignment.
+		have different frame styles and text/image alignment.
 	@functions:
 		!fn: $setText(<text:string>)
 		Sets the text to be displayed by the label.
@@ -144,15 +144,15 @@ const int frame_cod[] = {
 		automagically resize itself accordingly to the 'size' of the
 		text it contains. 
 		See also [classfnc]$autoResize[/classfnc]().
-		!fn: <string> $tqalignment()
-		Returns a string containing tqalignment flags that are set for 
+		!fn: <string> $alignment()
+		Returns a string containing alignment flags that are set for 
 		this label. The flags are separated by commas. An example output
 		could look like this:[br]
 		[pre]Bottom, Right[/pre][br]
-		See [classfnc]$tqsetAlignment[/classfnc]() for explanation of all
-		tqalignment flags.
-		!fn: $tqsetAlignment(<flag1:string>, <flag2:string>, ...)
-		This function sets tqalignment flags, given as parameters, for 
+		See [classfnc]$setAlignment[/classfnc]() for explanation of all
+		alignment flags.
+		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
+		This function sets alignment flags, given as parameters, for 
 		this label. Valid flags are:
 		[pre]
 		Right     - Text is aligned to right border[br]
@@ -179,8 +179,8 @@ const int frame_cod[] = {
 		frame-style flags and their explenation.
 		!fn: $setFrameStyle(<flag1>, <flag2>, ...)
 		Sets the frame-style flags to the ones passed as arguments.
-		The flags can either decide of the tqshape or shadow of the
-		label's frame. Valid tqshape flags are:[br]
+		The flags can either decide of the shape or shadow of the
+		label's frame. Valid shape flags are:[br]
 		[pre]
 		NoFrame     - draw no frame. You shouldn't specify a shadow when
 		using this.[br]
@@ -216,8 +216,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setMargin", functionSetMargin)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
-	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqalignment", functionAlignment)
-	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqsetAlignment", functionSetAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"alignment", functionAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setFrameStyle", functionSetFrameStyle)
@@ -297,13 +297,13 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c)
 //
 bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
 {
-	TQStringList tqalignment;
+	TQStringList alignment;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqalignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,tqalignment)
+		KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment)
 	KVSO_PARAMETERS_END(c)
 	if (!widget()) return true;
 	int align,sum=0;
-	for ( TQStringList::Iterator it = tqalignment.begin(); it != tqalignment.end(); ++it )
+	for ( TQStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it )
 		{
 		
 			align = 0;
@@ -318,15 +318,15 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
 			if(align)
 				sum = sum | align;
 			else
-				c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it));
+				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
 			
 		}
-	((TQLabel *)widget())->tqsetAlignment(sum);
+	((TQLabel *)widget())->setAlignment(sum);
 	return true;
 }
 bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c)
 {
-	int mode = ((TQLabel *)widget())->tqalignment();
+	int mode = ((TQLabel *)widget())->alignment();
 	TQString szAlignment="";
 	for(unsigned int i = 0; i < align_num; i++)
 	{
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index b2842a8c..7b2d252d 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -40,37 +40,37 @@
 
 
 /*
-	@doc: tqlayout
+	@doc: layout
 	@keyterms:
-		tqlayout object class, child widgets
+		layout object class, child widgets
 	@title:
-		tqlayout class
+		layout class
 	@type:
 		class
 	@short:
-		Manages child widget tqgeometry
+		Manages child widget geometry
 	@inherits:
 		[class]object[/class]
 	@description:
-		The tqlayout is a tqgeometry management tool for child widgets.
-		You create a tqlayout , give it some widgets to manage and it will tqlayout them
+		The layout is a geometry management tool for child widgets.
+		You create a layout , give it some widgets to manage and it will layout them
 		automatically.[br]
-		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
-		A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
-		Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
+		The parent of the layout must be the widget for which child widget geometries have to be managed.
+		A layout is a grid of NxM cells in which you insert child widgets with [classfnc:layout]$addWidget[/classfnc]().[br]
+		Widgets that must span multiple cells can be added to the layout with [classfnc:layout]$addMultiCellWidget[/classfnc]().[br]
 	@functions:
 		!fn: $addWidget(<widget:object widget>,<row:uint>,<column:uint>)
-		Adds a widget to this tqlayout placing it at position <row>,<column> in the grid
+		Adds a widget to this layout placing it at position <row>,<column> in the grid
 		!fn: $addMultiCellWidget(<widget:object widget>,<start_row:uint>,<end_row:uint>,<start_col:uint>,<end_col:uint>)
-		Adds a widget to this tqlayout spanning multiple grid cells
+		Adds a widget to this layout spanning multiple grid cells
 		!fn: $setRowStretch(<row:uint>,<stretch:uint>)
-		Sets the stretch value for a particular row of this tqlayout. The <stretch_value>
+		Sets the stretch value for a particular row of this layout. The <stretch_value>
 		must be a positive integer. The rows with bigger stretch values will take more space
-		in the tqlayout.
+		in the layout.
 		!fn: $setColStretch(<column:uint>,<stretch:uint>)
-		Sets the stretch value for a particular column in this tqlayout. The <stretch_value>
+		Sets the stretch value for a particular column in this layout. The <stretch_value>
 		must be a positive integer. The rows with bigger stretch values will take more space
-		in the tqlayout.
+		in the layout.
 		!fn: $addRowSpacing(<row:uint>,<spacing:uint>)
 		Sets the minimum height of the specified <row> to <spacing> which must be a positive integer
 		!fn: $addColSpacing(<column:uint>,<spacing:uint>)
@@ -78,18 +78,18 @@
 		!fn: $setSpacing(<spacing:uint>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:uint>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setResizeMode(<resize_mode:string>)
-		Sets the resize mode of the parent widget in relation to this tqlayout.
+		Sets the resize mode of the parent widget in relation to this layout.
 		<mode> can be one of:[br]
 		-Auto: this is the default[br]
-		-Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
-		-Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
+		-Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
+		-Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller[br]
+		-FreeResize: the parent widget of this layout is not constrained at all[br]
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"tqlayout","object")
+KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addWidget", functionAddWidget)
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addMultiCellWidget", functionAddMultiCellWidget)
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setRowStretch", functionSetRowStretch)
@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 	if(!w)
 	{
-		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
+		pContext->warning(__tr2qs("The parent of a layout must be a widget!"));
 		return false;
 	}
 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/class_layout.h
index 596c7ae8..0970d591 100644
--- a/src/modules/objects/class_layout.h
+++ b/src/modules/objects/class_layout.h
@@ -23,7 +23,7 @@
 //
 #include "kvi_string.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include "object_macros.h"
 
 class KviKvsObject_layout : public KviKvsObject
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index 241c3855..c85a4c02 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -100,7 +100,7 @@
 		This function is called by KVIrc when the current item changes.
 		!fn: <index:integer> $onItemEvent()
 		This function is called by KVIrc when the current item pointed by the mouse changes and gives in $0 the item index.
-		!fn: <array:x,y,width,height> $tqitemRect(<item:index>)
+		!fn: <array:x,y,width,height> $itemRect(<item:index>)
 		Returns the rectangle on the screen that item occupies, or an invalid rectangle if item is 0 or is not currently visible. 
 
 		@signals:
@@ -122,7 +122,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listbox,"listbox","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"currentItem", functioncurrentItem)
 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"textAt", functiontextAt);
 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemAt", functionitemAt);
-	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"tqitemRect", functiontqitemRect);
+	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"itemRect", functionitemRect);
 	KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"setCurrentItem", functionsetCurrentItem);
 
 
@@ -367,7 +367,7 @@ void KviKvsObject_listbox::onItem(KviTalListBoxItem *item)
 }
 
 
-bool KviKvsObject_listbox::functiontqitemRect(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_listbox::functionitemRect(KviKvsObjectFunctionCall *c)
 {
 kvs_uint_t uIndex;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -375,7 +375,7 @@ kvs_uint_t uIndex;
 	KVSO_PARAMETERS_END(c)
 	if(widget())
 	{
-		TQRect rect=((KviTalListBox *)widget())->tqitemRect(((KviTalListBox *)widget())->item(uIndex));
+		TQRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(uIndex));
 		KviKvsArray * a = new KviKvsArray();
 		a->set(0,new KviKvsVariant((kvs_int_t)rect.left()));
 		a->set(1,new KviKvsVariant((kvs_int_t)rect.top()));
diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h
index b7d00cb4..911f7842 100644
--- a/src/modules/objects/class_listbox.h
+++ b/src/modules/objects/class_listbox.h
@@ -60,7 +60,7 @@ protected:
 	bool functiononItemEvent(KviKvsObjectFunctionCall *c);
 
 	bool functionitemAt(KviKvsObjectFunctionCall *c);
-	bool functiontqitemRect(KviKvsObjectFunctionCall *c);
+	bool functionitemRect(KviKvsObjectFunctionCall *c);
 protected slots:
 	void selectionChanged();
 	void currentItemChanged(KviTalListBoxItem *);
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 1bfe95a7..f21417c1 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -55,7 +55,7 @@
 		[class]widget[/class]
 	@description:
 		It can display and control a hierarchy of multi-column items, and provides the ability to add new items at any time.
-		The items are added by creating tqchildren [class]listviewitem[/class] objects: simply allocating them with $new
+		The items are added by creating children [class]listviewitem[/class] objects: simply allocating them with $new
 		will add the items to the listview and simply deleting them will remove them.
 		Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating
 		a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either
@@ -132,11 +132,11 @@
 		The default implementation emits the [classfnc]$onItem[/classfnc]() signal.
 
 		!fn: $itemExpandedEvent(<item:object>)
-		This event is called when an item has been expanded, i.e. when the tqchildren of item are shown.
+		This event is called when an item has been expanded, i.e. when the children of item are shown.
 		The default implementation emits the [classfnc]$expanded[/classfnc]() signal.
 
 		!fn: $itemCollapsedEvent(<item:object>)
-		This event is called when an item has been collapsed, i.e. when the tqchildren of item are hidden.
+		This event is called when an item has been collapsed, i.e. when the children of item are hidden.
 		The default implementation emits the [classfnc]$collapsed[/classfnc]() signal.
 
 		!fn: $itemRenamedEvent(<item:object>,<col:integer>,<text:string>)
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index 49c448e3..605fceed 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -71,7 +71,7 @@
 		Returns $true if this item is enabled and $false otherwise
 
 		!fn: $setOpen(<bOpen:boolean>)
-		Opens or closes the item to show its tqchildren items
+		Opens or closes the item to show its children items
 
 		!fn: $isOpen()
 		Returns the open state of this item
@@ -80,7 +80,7 @@
 		Makes this item checkable or not. This function should be called immediately
 		after the item creation: changing this property later at runtime may have
 		strange results (like the item being moved inside the list, text disappearing,
-		hidden tqchildren etc... don't do it :D ).
+		hidden children etc... don't do it :D ).
 
 		!fn: $isCheckable()
 		Returns $true if this item is checkable and $false otherwise
@@ -94,7 +94,7 @@
 		have been previously called.
 
 		!fn: <listviewitem> $firstChild()
-		Returns the first child item of this listviewitem or $null if this item has no tqchildren.
+		Returns the first child item of this listviewitem or $null if this item has no children.
 
 		!fn: <listviewitem> $nextSibling()
 		Returns the next sibling item of this listviewitem or $null if there are no sibling items.
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index a4beed49..7d04ecba 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -40,7 +40,7 @@
 #define TQTEXTEDIT_AUTO_BULLET_LIST Q3TextEdit::AutoBulletList
 
 #else
-	#include <tqtextstream.h>
+	#include <textstream.h>
 
 	#include <tqmultilineedit.h>
 	#define KviTalMultiLineEdit TQMultiLineEdit
@@ -226,15 +226,15 @@ static int mod_cod[] =	{
 		Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE).
 		!fn: <boolean> $isRedoAvailable ()
 		Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE).
-		!fn: $tqsetAlignment(<tqalignment:string>)
-		Sets the tqalignment of the current paragraph to <tqalignment>. Valid values are:[br]
+		!fn: $setAlignment(<alignment:string>)
+		Sets the alignment of the current paragraph to <alignment>. Valid values are:[br]
 		- AlignAuto - Aligns according to the language.[br]
 		- TQt::AlignLeft - Aligns with the left edge.[br]
 		- TQt::AlignRight - Aligns with the right edge.[br]
 		- TQt::AlignCenter - Centers in both dimensions.
-		!fn: $setVerticalAlignment(<vertical_tqalignment:string>)
-		Sets the vertical tqalignment of the current format to <Valignemnt>. Valid Values are:[br]
-		- AlignNormal - Normal tqalignment.[br]
+		!fn: $setVerticalAlignment(<vertical_alignment:string>)
+		Sets the vertical alignment of the current format to <Valignemnt>. Valid Values are:[br]
+		- AlignNormal - Normal alignment.[br]
 		- AlignSuperScript - Superscript.[br]
 		- AlignSubScript - Subscript.
 		!fn: $setAutoFormatting(<afvalue:string>)
@@ -323,7 +323,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_mledit,"multilineedit","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setParagraphBackgroundColor", functionsetParagraphBackgroundColor)
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"clearParagraphBackgroundColor", functionsetParagraphBackgroundColor)
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"loadFile" , functionloadFile); // let's fantasy
-	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"tqsetAlignment" , functiontqsetAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAlignment" , functionsetAlignment)
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setAutoFormatting" , functionsetAutoFormatting)
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setVerticalAlignment" , functionsetVerticalAlignment)
 	KVSO_REGISTER_HANDLER(KviKvsObject_mledit,"setWrapPolicy" , functionsetWrapPolicy)
@@ -1090,23 +1090,23 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_mledit::functiontqsetAlignment(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c)
 
 {
 	TQString szAlignment;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szAlignment)
+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szAlignment)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
 	if(KviTQString::equalCI(szAlignment,"Left"))
-		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignLeft);
+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignLeft);
 	else if(KviTQString::equalCI(szAlignment,"Right"))
-		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignRight);
+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignRight);
 	else if(KviTQString::equalCI(szAlignment,"Center"))
-		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignCenter);
+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignCenter);
 	else if(KviTQString::equalCI(szAlignment,"Justify"))
-		((KviTalMultiLineEdit *)widget())->tqsetAlignment(TQt::AlignJustify);
-	else c->warning(__tr2qs("Unknown tqalignment '%Q'"),&szAlignment);
+		((KviTalMultiLineEdit *)widget())->setAlignment(TQt::AlignJustify);
+	else c->warning(__tr2qs("Unknown alignment '%Q'"),&szAlignment);
 	return true;
 }
 
@@ -1131,18 +1131,18 @@ bool KviKvsObject_mledit::functionsetAutoFormatting(KviKvsObjectFunctionCall *c)
 bool KviKvsObject_mledit::functionsetVerticalAlignment(KviKvsObjectFunctionCall *c)
 
 {
-	TQString szVtqalignment;
+	TQString szValignment;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqalignment",KVS_PT_STRING,0,szVtqalignment)
+		KVSO_PARAMETER("alignment",KVS_PT_STRING,0,szValignment)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
-	if(KviTQString::equalCI(szVtqalignment,"Normal"))
+	if(KviTQString::equalCI(szValignment,"Normal"))
 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignNormal);
-	else if(KviTQString::equalCI(szVtqalignment,"SuperScript"))
+	else if(KviTQString::equalCI(szValignment,"SuperScript"))
 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSuperScript);
-	else if(KviTQString::equalCI(szVtqalignment,"SubScript"))
+	else if(KviTQString::equalCI(szValignment,"SubScript"))
 		((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSubScript);
-	else c->warning(__tr2qs("Unknown vertical tqalignment '%Q'"),&szVtqalignment);
+	else c->warning(__tr2qs("Unknown vertical alignment '%Q'"),&szValignment);
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h
index 5f531ed8..a1b1c8e5 100644
--- a/src/modules/objects/class_multilineedit.h
+++ b/src/modules/objects/class_multilineedit.h
@@ -95,7 +95,7 @@ protected:
 	bool functionsetParagraphBackgroundColor(KviKvsObjectFunctionCall *c);
 	bool functionclearParagraphBackground(KviKvsObjectFunctionCall *c);
 	bool functionloadFile(KviKvsObjectFunctionCall *c);
-	bool functiontqsetAlignment(KviKvsObjectFunctionCall *c);
+	bool functionsetAlignment(KviKvsObjectFunctionCall *c);
 	bool functionsetAutoFormatting(KviKvsObjectFunctionCall *c);
 	bool functionsetVerticalAlignment(KviKvsObjectFunctionCall *c);
 	bool functionsetWrapPolicy(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 826d119f..09499455 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -41,12 +41,12 @@
 	@type:
 		class
 	@short:
-		This class provide a painter to paint line and tqshapes.
+		This class provide a painter to paint line and shapes.
 	@inherits:
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		With this class you can draw many graphics objects from simple lines to complex tqshapes like pies and chords.[br]
+		With this class you can draw many graphics objects from simple lines to complex shapes like pies and chords.[br]
 		It can also draw aligned text and pixmaps. Normally, it draws in a "natural" coordinate system, but it can also do view and world transformation.[br]
 		The class need to be implemented into a [classfnc]$paintEvent[/classfnc]();
 		@functions:
@@ -196,8 +196,8 @@
 			timerevent()[br] 
 			{[br]
 				$$->%b = $(($$->%b + 1) & 15);[br] 
-				if ($$->%nextanim == 1)  $$->$tqrepaint(1);[br] 
-				$$->$tqrepaint(0);[br] 
+				if ($$->%nextanim == 1)  $$->$repaint(1);[br] 
+				$$->$repaint(0);[br] 
 			}[br] 
 			drawAnim()[br] 
 			{[br] 
@@ -323,7 +323,7 @@
 			}[br]
 		}[br] 
 		[br]
-		%lay=$new(tqlayout,%Hello)[br] 
+		%lay=$new(layout,%Hello)[br] 
 		%lay->$addwidget(%Btn,4,0)[br] 
 		%Hello->$setBackgroundColor("000000");[br] 
 		%Hello->$setmaximumwidth(800)[br] 
@@ -414,12 +414,12 @@ if(__pXOrArray->isArray())\
 		KviKvsVariant * pH = __pXOrArray->array()->at(3);\
 		if(!(pX && pY && pW && pH))\
 		{\
-			c->error(__tr2qs("One of the tqgeometry array parameters is empty"));\
+			c->error(__tr2qs("One of the geometry array parameters is empty"));\
 			return false;\
 		}\
 		if(!(pX->asInteger(iX) && pY->asInteger(__iY) && pW->asInteger(__iW) && pH->asInteger(__iH)))\
 		{\
-			c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer"));\
+			c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer"));\
 			return false;\
 		}\
 	} else {\
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 394c39a6..cb9c3bba 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -89,7 +89,7 @@
 			{[br]
 				#Geometry of the widget and setting-up of popupmenu [br]
 				$$->$setGeometry(%X,%Y,100,100)[br]
-			    $$->%lay=$new(tqlayout,$$)[br]
+			    $$->%lay=$new(layout,$$)[br]
 				#Here we generate a cicle to create our labels inside the widget.[br]
 				%i=0[br]
 				while (%i<10)[br]
@@ -110,7 +110,7 @@
 				#we create the label widget wich will be used as popup's title[br]
 				$$->%Popuptitle=$new(label)[br]
 				$$->%Popuptitle->$settext(<B><U>"Windows Options"</B></U>)[br]
-				$$->%Popuptitle->$tqsetAlignment(Center)[br]
+				$$->%Popuptitle->$setAlignment(Center)[br]
 				#and we add it.[br]
 				%A=$$->%Popuptitle[br]
 				$$->%Popupmenu->$insertwidget(%A)[br]
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 9ec6cc5a..1c45ed43 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -82,7 +82,7 @@
 		%tt=$new(test)[br]
 		%A=$new(widget)[br]
 		%A->$setGeometry(100,100,400,300)[br]
-		%layoutA=$new(tqlayout,%A)[br]
+		%layoutA=$new(layout,%A)[br]
 		%Ainput=$new(lineedit,%A)[br]
 		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
 		%Aoutput=$new(label,%A)[br]
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 5b9103b3..5b52ad4c 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -57,7 +57,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip
 {
 	m_uConnectionId = 0;
 	m_sock = KVI_INVALID_SOCKET;
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
 	m_uRemotePort = 0;
 	m_uSecondaryPort = 0;
 	m_pSn = 0;
@@ -128,7 +128,7 @@ void KviScriptSocketObject::reset()
 	m_pOutBuffer = new KviDataBuffer();
 	m_uInBufferLen = 0;
 	m_uInDataLen = 0;
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
 	m_uRemotePort = 0;
 	m_szRemoteIp.clear();
 	m_uLocalPort = 0;
@@ -366,7 +366,7 @@ void KviScriptSocketObject::reset()
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object")
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functiontqStatus)
+	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"status",functionStatus)
 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remotePort",functionRemotePort)
 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"remoteIp",functionRemoteIp)
 	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"localIp",functionLocalIp)
@@ -398,7 +398,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
 	m_bUdp = false;
 	m_uConnectionId = 0;
 	m_sock = KVI_INVALID_SOCKET;
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
 	m_uRemotePort = 0;
 	m_uSecondaryPort = 0;
 	m_pSn = 0;
@@ -430,15 +430,15 @@ KVSO_END_DESTRUCTOR(KviKvsObject_socket)
 //----------------------
 
 
-bool KviKvsObject_socket::functiontqStatus(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_socket::functionStatus(KviKvsObjectFunctionCall *c)
 {
-	c->returnValue()->setInteger(m_itqStatus);
+	c->returnValue()->setInteger(m_iStatus);
 	return true;
 }
 
 bool KviKvsObject_socket::functionClose(KviKvsObjectFunctionCall *c)
 {
-	if((m_pOutBuffer->size() != 0) && (m_itqStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED))
+	if((m_pOutBuffer->size() != 0) && (m_iStatus == KVI_SCRIPT_SOCKET_STATUS_CONNECTED))
 		tryFlush();
 
 	reset();
@@ -591,7 +591,7 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Value %d for port is out of range (values allowed are from 0 to 65535"),m_uRemotePort);
 		return true;
 	}
-	if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
+	if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
 	{
 		c->warning(__tr2qs("Another connection in progress"));
 		c->returnValue()->setBoolean(true);
@@ -608,11 +608,11 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
 		debug ("ok connecting");
 		debug ("connectinhg on ip %s ",m_szRemoteIp.latin1());
 		debug ("non so ip");
-		m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
+		m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
 		delayedConnect();
 	} else {
 		debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort);
-		m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
+		m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
 		delayedLookupRemoteIp();
 	}
 	c->returnValue()->setBoolean(true);
@@ -626,7 +626,7 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
 
 bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 {
-	if((m_sock != KVI_INVALID_SOCKET) || (m_itqStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
+	if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED))
 	{
 		c->warning(__tr2qs("Another connection in progress"));
 		c->returnValue()->setBoolean(false);
@@ -770,7 +770,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(incomingConnection(int)));
 	m_pSn->setEnabled(true);
 
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING;
 
 	c->returnValue()->setBoolean(true);
 	return true;
@@ -846,7 +846,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
 		sareal.getStringAddress(m_szLocalIp);
 	}
 
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
 
 	m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
 	TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int)));
@@ -1070,7 +1070,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
 		KviKvsVariantList *params=0;
 		callFunction(this,"connectEvent",params);
 		if(m_uConnectionId == uOldConnectionId)
-			m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
+			m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED;
 		// else the connection has been already changed!
 	}
 }
@@ -1256,7 +1256,7 @@ void KviKvsObject_socket::reset()
 	m_pOutBuffer = new KviDataBuffer();
 	m_uInBufferLen = 0;
 	m_uInDataLen = 0;
-	m_itqStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
+	m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED;
 	m_uRemotePort = 0;
 	m_szRemoteIp="";
 	m_uLocalPort = 0;
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 84771cae..f80d749a 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -47,7 +47,7 @@ public:
 	virtual ~KviScriptSocketObject();
 protected:
 	kvi_socket_t       m_sock;
-	int                m_itqStatus;
+	int                m_iStatus;
 	KviStr             m_szRemoteIp;
 	unsigned short int m_uRemotePort;
 	KviStr             m_szLocalIp;
@@ -69,7 +69,7 @@ protected:
 	unsigned short int m_uSecondaryPort;
 	KviStr             m_szSecondaryIp;
 protected:
-	bool functiontqStatus(KviCommand *c,KviParameterList * params,KviStr &buffer);
+	bool functionStatus(KviCommand *c,KviParameterList * params,KviStr &buffer);
 	bool functionRemotePort(KviCommand *c,KviParameterList * params,KviStr &buffer);
 	bool functionRemoteIp(KviCommand *c,KviParameterList * params,KviStr &buffer);
 	bool functionLocalPort(KviCommand *c,KviParameterList * params,KviStr &buffer);
@@ -122,7 +122,7 @@ public:
 protected:
 	bool               m_bUdp;  
 	kvi_socket_t       m_sock;
-	int                m_itqStatus;
+	int                m_iStatus;
 	TQString             m_szRemoteIp;
 //	unsigned short int m_uRemotePort;
 	TQString             m_szLocalIp;
@@ -144,7 +144,7 @@ protected:
 	kvi_u32_t          m_uSecondaryPort;
 	TQString             m_szSecondaryIp;
 protected:
-	bool functiontqStatus(KviKvsObjectFunctionCall *c);
+	bool functionStatus(KviKvsObjectFunctionCall *c);
 	bool functionRemotePort(KviKvsObjectFunctionCall *c);
 	bool functionRemoteIp(KviKvsObjectFunctionCall *c);
 	bool functionLocalPort(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index d30a6b67..3b768217 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -94,7 +94,7 @@
 			%secondtab=$new(widget,%Tabwidget)
 			
 			# Now we'll create the item to put in to tab's pages.
-			%layoutfirsttab=$new(tqlayout,%firsttab)
+			%layoutfirsttab=$new(layout,%firsttab)
 			%labelbt=$new(label,%firsttab)
 			%labelbt->$settext(Botton Tab)
 			%labeltt=$new(label,%firsttab)
@@ -104,7 +104,7 @@
 			%buttontt=$new(button,%firsttab)
 			%buttontt->$settext("To &Top")
 			
-			# Now we'll give a tqlayout to all items.
+			# Now we'll give a layout to all items.
 			# This also allows to use privateimpl without making buttons global variables
 			%layoutfirsttab->$addwidget(%labelbt,0,0)
 			%layoutfirsttab->$addwidget(%labeltt,0,1)
@@ -125,14 +125,14 @@
 			}
 			
 			# We do the same work  with the second tab's page.
-			%layoutsecondtab=$new(tqlayout,%secondtab)
+			%layoutsecondtab=$new(layout,%secondtab)
 			%labelwp=$new(label,%secondtab)
 			%labelwp->$settext("Enjoy the new Class provided by")
 			%layoutsecondtab->$addwidget(%labelwp,0,0)
-			%labelwp->$settqalignment("Center")
+			%labelwp->$setalignment("Center")
 			%labelgen=$new(label,%secondtab)
 			%labelgen->$settext(Grifisx \& Noldor)
-			%labelgen->$settqalignment("Center")
+			%labelgen->$setalignment("Center")
 			%layoutsecondtab->$addwidget(%labelgen,1,0)
 			%Tabwidget->$addTab(%secondtab,&About,50)
 			
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index 7f4de6ca..74b5c7b0 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include "class_tbrowser.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
diff --git a/src/modules/objects/class_tbrowser.h b/src/modules/objects/class_tbrowser.h
index f494a05e..b357d3f0 100644
--- a/src/modules/objects/class_tbrowser.h
+++ b/src/modules/objects/class_tbrowser.h
@@ -23,7 +23,7 @@
 //   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include "class_widget.h"
 #include <tqfile.h>
 #include "class_multilineedit.h"
diff --git a/src/modules/objects/class_urllabel.cpp b/src/modules/objects/class_urllabel.cpp
index 8b989236..2d0416b4 100644
--- a/src/modules/objects/class_urllabel.cpp
+++ b/src/modules/objects/class_urllabel.cpp
@@ -152,7 +152,7 @@ bool KviScriptUrlLabelObject::eventFilter(TQObject * o, TQEvent * e)
 		!fn: $setText(<text>)
 		Sets the label's text. Reimplemented from internal reasons.
 		!fn: $setCursorChange(<bEnabled:boolean>)
-		Tells the label wheather to change or not the tqshape of cursor,
+		Tells the label wheather to change or not the shape of cursor,
 		when it is above the widget. Default is false.
 		!fn: <boolean> $cursorChange()
 		Returns true if the cursor changes over the label, false if not.
@@ -287,7 +287,7 @@ bool KviKvsObject_urlabel::functionsetText(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
 	((TQLabel *)widget())->setText(szText);
-	((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->tqsizeHint());
+	((TQLabel *)widget())->setFixedSize(((TQLabel *)widget())->sizeHint());
 	return true;
 }
 bool KviKvsObject_urlabel::functionaction(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index d068156e..0019f000 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -35,16 +35,16 @@
 	@type:
 		class
 	@short:
-		Manages child widget vertical tqgeometry
+		Manages child widget vertical geometry
 	@inherits:
 		[class]object[/class]
 	@description:
-		The vbox class widget provides vertical tqgeometry management for its child widgets.
+		The vbox class widget provides vertical geometry management for its child widgets.
 	@functions:
 		!fn: $setSpacing(<spacing:int>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:int>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
 		Sets the stretch factor of widget to stretch.
 */
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 4ff98d6e..4461f366 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -36,7 +36,7 @@
 #include <tqcursor.h>
 #include <tqiconset.h>
 #include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbitmap.h>
 #include <tqmetaobject.h>
 #include "class_widget.h"
@@ -137,12 +137,12 @@ const int widgettypes_cod[] = {
 		All the other widget-type classes inherit from this one.
 	@functions:
 		!fn: $show()
-		Shows this widget and the tqchildren.
+		Shows this widget and the children.
 		See also [classfnc]$hide[/classfnc]() and [classfnc]$isVisible[/classfnc].
 		!fn: $hide()
-		Hides this widget (and conseguently all the tqchildren).
+		Hides this widget (and conseguently all the children).
 		See also [classfnc]$show[/classfnc]() and [classfnc]$isVisible[/classfnc].
-		!fn: $tqrepaint(<bool erase>)
+		!fn: $repaint(<bool erase>)
 		Repaints the widget directly by calling [classfnc]$paintEvent[/classfnc]() immediately.[br]
 		If erase is TRUE, erases the widget before the $paintEvent() call.
 		!fn: $x()
@@ -157,29 +157,29 @@ const int widgettypes_cod[] = {
 		Returns the width of this widget in pixels.
 		!fn: $height()
 		Returns the height of this widget in pixels.
-		!fn: $tqgeometry()
-		Returns the widget tqgeometry in this form:[br]
+		!fn: $geometry()
+		Returns the widget geometry in this form:[br]
 		x, y, width, height.
 		!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
-		Sets the tqgeometry of this widget. <x> and <y> are relative
+		Sets the geometry of this widget. <x> and <y> are relative
 		to the parent widget or to the desktop (if this widget is
 		a toplevel one). All the parameters are in pixels.
 		!fn: $setMinimumWidth(<value>)
 		Sets the minimum width of this widget to <value>.
 		The user will not be able to resize the widget to a smaller
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMinimumHeight(<value>)
 		Sets the minimum height of this widget to <value>.
 		The user will not be able to resize the widget to a smaller
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMaximumWidth(<value>)
 		Sets the maximum width of this widget to <value>.
 		The user will not be able to resize the widget to a bigger
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMaximumHeight(<value>)
 		Sets the maximum height of this widget to <value>.
 		The user will not be able to resize the widget to a bigger
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $move(<x_or_array>[,<y>])
 		Moves this widget to the coordinate <x> and <y> relative to its
 		parent widget (or the desktop if this widget is a toplevel one).
@@ -341,7 +341,7 @@ const int widgettypes_cod[] = {
 		If a tooltip has setted with [classfnc]$setTooltip[/classfnc] the dynamic tooltip will be ignored.
 		The default implementation does nothing.		
 		!fn: $paintEvent()
-		This event handler can be reimplemented to tqrepaint all or part of the widget.
+		This event handler can be reimplemented to repaint all or part of the widget.
 		It's needed by the Painter class.
 		It's very useful for drawing flicker free animations or low level special graphic effects.
 		If you call "[cmd]return[/cmd] $true" you will stop the internal processing
@@ -522,7 +522,7 @@ const int widgettypes_cod[] = {
 	// ... now that I think about it , it
 	// may happen that widget() will be zero here too:
 	// If the TQt "physical" widget gets destroyed
-	// by some external factor (for example when tqchildren
+	// by some external factor (for example when children
 	// of a wrapper widget destroyed by KVIrc).
 	//
 	// as a convention:
@@ -546,7 +546,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
 	// apparence
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"show",function_show)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"hide",function_hide)
-	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqrepaint",function_tqrepaint)
+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"repaint",function_repaint)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isTopLevel",function_isTopLevel)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"isVisible",function_isVisible)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"raise",function_raise)
@@ -567,10 +567,10 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsWidth",function_fontMetricsWidth)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"fontMetricsHeight",function_fontMetricsHeight)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFont",function_setFont)
-	// tqgeometry
+	// geometry
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"screenResolution",function_screenResolution)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"centerToScreen",function_centerToScreen)
-	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_tqgeometry)
+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"geometry",function_geometry)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setGeometry",function_setGeometry)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapToGlobal",function_mapToGlobal)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"mapFromGlobal",function_mapFromGlobal)
@@ -587,7 +587,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumWidth",function_setMaximumWidth)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setMaximumHeight",function_setMaximumHeight)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"move",function_move)
-	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"tqsizeHint",function_tqsizeHint)
+	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"sizeHint",function_sizeHint)
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"resize",function_resize)
 
 	KVSO_REGISTER_HANDLER(KviKvsObject_widget,"setFocusPolicy",function_setFocusPolicy)
@@ -916,14 +916,14 @@ bool KviKvsObject_widget::function_fontAscent(KviKvsObjectFunctionCall * c)
 
 }
 
-bool KviKvsObject_widget::function_tqrepaint(KviKvsObjectFunctionCall * c)
+bool KviKvsObject_widget::function_repaint(KviKvsObjectFunctionCall * c)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
-    widget()->tqrepaint(bEnabled);
+    widget()->repaint(bEnabled);
 	return true;
 }
 
@@ -955,9 +955,9 @@ bool KviKvsObject_widget::function_screenResolution(KviKvsObjectFunctionCall * c
 	return true;
 }
 
-bool KviKvsObject_widget::function_tqgeometry(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_widget::function_geometry(KviKvsObjectFunctionCall *c)
 {
-	TQRect r = widget() ? widget()->tqgeometry() : TQRect(0,0,0,0);
+	TQRect r = widget() ? widget()->geometry() : TQRect(0,0,0,0);
 	KviKvsArray * a = new KviKvsArray();
 	a->set(0,new KviKvsVariant((kvs_int_t)r.x()));
 	a->set(1,new KviKvsVariant((kvs_int_t)r.y()));
@@ -992,7 +992,7 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c)
 
 	if(pXOrArray->isArray())
 	{
-		// the user has passed a complete tqgeometry array as first parameter
+		// the user has passed a complete geometry array as first parameter
 		// make sure it has at least 4 elements
 		if(pXOrArray->array()->size() < 4)
 		{
@@ -1009,12 +1009,12 @@ bool KviKvsObject_widget::function_setGeometry(KviKvsObjectFunctionCall *c)
 		// no parameter was set in that place
 		if(!(pX && pY && pW && pH))
 		{
-			c->error(__tr2qs("One of the tqgeometry array parameters is empty"));
+			c->error(__tr2qs("One of the geometry array parameters is empty"));
 			return false;
 		}
 		if(!(pX->asInteger(iX) && pY->asInteger(iY) && pW->asInteger(iW) && pH->asInteger(iH)))
 		{
-			c->error(__tr2qs("One of the tqgeometry array parameters didn't evaluate to an integer"));
+			c->error(__tr2qs("One of the geometry array parameters didn't evaluate to an integer"));
 			return false;
 		}
 		// ok: the params are correct
@@ -1450,10 +1450,10 @@ bool KviKvsObject_widget::function_move(KviKvsObjectFunctionCall *c)
 	widget()->move(TQPoint(iX,iY));
 	return true;
 }
-bool KviKvsObject_widget::function_tqsizeHint(KviKvsObjectFunctionCall *c)
+bool KviKvsObject_widget::function_sizeHint(KviKvsObjectFunctionCall *c)
 {
 	if(!widget())return true;
-	TQSize sizehint = widget()->tqsizeHint();
+	TQSize sizehint = widget()->sizeHint();
 	KviKvsArray * a = new KviKvsArray();
 	a->set(0,new KviKvsVariant((kvs_int_t)sizehint.width()));
 	a->set(1,new KviKvsVariant((kvs_int_t)sizehint.height()));
@@ -1616,7 +1616,7 @@ bool KviKvsObject_widget::function_addWidgetToWrappedLayout(KviKvsObjectFunction
 		c->warning(__tr2qs("Widget parameter is not a valid object"));
 		return true;
 	}
-	TQLayout *lay=widget()->tqlayout();
+	TQLayout *lay=widget()->layout();
 	if (!lay)
 	{
 		c->warning(__tr2qs("No Layout associated to the widget "));
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index 807d50ab..47d13cdb 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -59,7 +59,7 @@ protected:
 	bool function_fontMetricsHeight(KviKvsObjectFunctionCall * c);
 	bool function_fontMetricsWidth(KviKvsObjectFunctionCall * c);
 	bool function_foregroundColor(KviKvsObjectFunctionCall *c);
-	bool function_tqgeometry(KviKvsObjectFunctionCall *c);
+	bool function_geometry(KviKvsObjectFunctionCall *c);
 	bool function_globalCursorX(KviKvsObjectFunctionCall *c);
 	bool function_globalCursorY(KviKvsObjectFunctionCall *c);
 	bool function_hasFocus(KviKvsObjectFunctionCall *c);
@@ -74,7 +74,7 @@ protected:
 	bool function_move(KviKvsObjectFunctionCall *c);
 	bool function_parentWidget(KviKvsObjectFunctionCall *c);
 	bool function_raise(KviKvsObjectFunctionCall *);
-	bool function_tqrepaint(KviKvsObjectFunctionCall *c);
+	bool function_repaint(KviKvsObjectFunctionCall *c);
 	bool function_reparent(KviKvsObjectFunctionCall *c);
 	bool function_resize(KviKvsObjectFunctionCall *c);
 	bool function_screenResolution(KviKvsObjectFunctionCall * c);
@@ -96,7 +96,7 @@ protected:
 	bool function_setGeometry(KviKvsObjectFunctionCall *c);
 	bool function_setWFlags(KviKvsObjectFunctionCall *c);
 	bool function_show(KviKvsObjectFunctionCall *c);
-	bool function_tqsizeHint(KviKvsObjectFunctionCall *c);
+	bool function_sizeHint(KviKvsObjectFunctionCall *c);
 	bool function_width(KviKvsObjectFunctionCall *);
 	bool function_x(KviKvsObjectFunctionCall *);
 	bool function_y(KviKvsObjectFunctionCall *);
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 393c296d..918f541d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -119,7 +119,7 @@ bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 	KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name());
 	setObject(TQT_TQOBJECT(w));
 	pContext->window()->frame()->addWindow(w,false);
-	w->minimize(); // must be minimized before tqchildren are added, otherwise the focus handling goes nuts...
+	w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts...
 
 	return true;
 }
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index 48092775..4f178024 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -110,7 +110,7 @@
 			constructor[br]
 			{[br]
 			       $$->$setGeometry(%X,%Y,100,100)[br]
-			       $$->%lay=$new(tqlayout,$$)[br]
+			       $$->%lay=$new(layout,$$)[br]
 			       %i=0[br]
 			       while (%i<10)[br]
 				{[br]
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index ca1333f9..38901ed1 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -72,7 +72,7 @@
                 The first entry in this example is a KVIrc server window, class "KviFrame" and name "kvirc_frame":
                 it is a toplevel widget.[br]
                 The "qt_top_dock", "qt_custom_toolbar" and the "qt_dockwidget_internal" are
-                direct tqchildren of that widget.[br]
+                direct children of that widget.[br]
                 To indicate a specific widget we will use the "class::name" form.[br]
                 So to indicate the main KVIrc frame you will use "KviFrame::kvirc_main_frame".
                 Look at this example:[br]
@@ -183,7 +183,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, const TQString szName)
 {
 #ifdef COMPILE_USE_QT4
-	TQWidgetList list = g_pApp->tqtopLevelWidgets();
+	TQWidgetList list = g_pApp->topLevelWidgets();
 	if( !list.count() ) return 0;
 	for(int idx=0;idx<list.count();idx++)
 	{
@@ -205,7 +205,7 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass,
 	return 0;
 #else
 	
-	TQWidgetList *list = g_pApp->tqtopLevelWidgets();
+	TQWidgetList *list = g_pApp->topLevelWidgets();
 	if( !list ) return 0;
 
 	TQWidgetListIt it(*list);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 977c8c9b..2a4dc9de 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -153,7 +153,7 @@ static bool objects_kvs_cmd_killClass(KviKvsModuleCommandCall * c)
 			Suppresses any warning message
 		@description:
 			Removes the definition of the class <class_name>.[br]
-			All the instances of the class are killed (thus tqchildren objects are killed too).[br]
+			All the instances of the class are killed (thus children objects are killed too).[br]
 			All the derived class definitions are removed as well.[br]
 			Builtin class definitions cannot be removed and this commands
 			kills only all the instances of that class (derived class definitions
@@ -827,7 +827,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	KVSO_PARAMETERS_END(cmd)
 	if (bFlag) cmd->window()->output(80, "Objects dump:");
 	#ifdef COMPILE_USE_QT4
-	TQWidgetList list = g_pApp->tqtopLevelWidgets();
+	TQWidgetList list = g_pApp->topLevelWidgets();
 	
 	KviStr spacing = ">";
 	TQString  szTemp;
@@ -865,7 +865,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	}
 
 #else
-	TQWidgetList *l = g_pApp->tqtopLevelWidgets();
+	TQWidgetList *l = g_pApp->topLevelWidgets();
 	l->setAutoDelete(false);
 	TQWidgetListIt it(*l);
 	KviStr spacing = ">";
@@ -913,7 +913,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
 {
 #ifdef COMPILE_USE_QT4
-	const TQObjectList list = parent->tqchildren();
+	const TQObjectList list = parent->children();
 	if( !list.count() ) return;
 	TQString sp(spacing);
 	sp.append(">");