rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

15 files changed, 50 insertions, 50 deletions

diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index d0f25543..9f6e26ae 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -47,7 +47,7 @@
 		[class]widget[/class]
 	@description:
 		This widget organizes buttons in a group.
-		It will be usually a tqparent for other child controls.
+		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.
 		The class ineriths groupbox.
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 490aabb8..366cf5f0 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -46,10 +46,10 @@
 	@description:
 		Rappresents a dialog object. The class is really
 		similar to the widget class, it has only a couple of minor differences.
-		A dialog is always a top-level widget, but if it has a tqparent, its default
-		location is centered on top of the tqparent. It will also share the tqparent's taskbar entry.
+		A dialog is always a top-level widget, but if it has a parent, its default
+		location is centered on top of the parent. It will also share the parent's taskbar entry.
 		If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.
+		it will appear above its parent widget and block its input until it's closed.
 	@functions:
 */
 
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index aa9c8f88..40fc473b 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -141,7 +141,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(((TQWidget *)(pWidget->object()))->tqparent() != (TQObject *)_pDockWindow)
+	if(((TQWidget *)(pWidget->object()))->parent() != (TQObject *)_pDockWindow)
 	{
 		c->warning(__tr2qs("The added widget is not a child of this dock window"));
 	}
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index f741f704..07f73bea 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -59,7 +59,7 @@ const int align_cod[] = {
 		[class]widget[/class]
 	@description:
 		This widget can be used to display a groupbox.
-		It will be usually a tqparent for other child controls.
+		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.
 	@functions:
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 1a23aa4c..ce2c5365 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -196,9 +196,9 @@ const int frame_cod[] = {
 		[pre]
 		Plain       - no 3D effect (draws using foreground color)[br]
 		Raised      - makes the label look like it was raised above the
-		tqparent widget[br]
+		parent widget[br]
 		Sunken      - makes the label look like it was "pushed" inside
-		the tqparent widget[br]
+		the parent widget[br]
 		[/pre]
 		!fn: $setImage(<image_id>)
 		Sets the image to be displayed on this label. 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 3cc6a0ef..b2842a8c 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -55,7 +55,7 @@
 		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
 		automatically.[br]
-		The tqparent of the tqlayout must be the widget for which child widget geometries have to be managed.
+		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]
 	@functions:
@@ -80,12 +80,12 @@
 		!fn: $setMargin(<margin:uint>)
 		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setResizeMode(<resize_mode:string>)
-		Sets the resize mode of the tqparent widget in relation to this tqlayout.
+		Sets the resize mode of the parent widget in relation to this tqlayout.
 		<mode> can be one of:[br]
 		-Auto: this is the default[br]
-		-Fixed: the tqparent 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 tqparent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-		-FreeResize: the tqparent widget of this tqlayout is not constrained at all[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]
 */
 
 
@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 	if(!w)
 	{
-		pContext->warning(__tr2qs("The tqparent of a tqlayout must be a widget!"));
+		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
 		return false;
 	}
 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 8844d1b7..868ce8f1 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -128,8 +128,8 @@ static const int mode_cod[] =  {
 		With this property user can drag text in the lineedit.
 		!fn: $setReadOnly(<bReadonly:boolean>)
 		Sets the lineedit to read only mode.
-		!fn: $setInputMask(<tqmask:string>)
-		Sets the validation input tqmask to inputMask.[br]
+		!fn: $setInputMask(<mask:string>)
+		Sets the validation input mask to inputMask.[br]
 		Example:[br]
 		[br]
 		%esempio->$setInputMask( "+99 99 99 99 99;_" );[br]
@@ -137,7 +137,7 @@ static const int mode_cod[] =  {
 		%esempio->Ip Number Mask.[br]
 		%esempio->setInputMask( ">AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;#" );[br]
 		[br]
-		The tqmask format understands these tqmask characters:[br]
+		The mask format understands these mask characters:[br]
 		Character		Meaning[br]
 		A			ASCII alphabetic character required. A-Z, a-z.[br]
 		a			ASCII alphabetic character permitted but not required.[br]
@@ -155,7 +155,7 @@ static const int mode_cod[] =  {
 		!			Switch off case conversion.[br]
 		\			Use \ to escape the special characters listed above to use them as separators.[br]
 		[br]
-		The tqmask consists of a string of tqmask characters and separators, optionally[br]
+		The mask consists of a string of mask characters and separators, optionally[br]
 		followed by a semi-colon and the character used for blanks: the blank characters [br]
 		are always removed from the text after editing. The default blank character is space. [br]
 		!fn: $returnPressedEvent()
@@ -407,7 +407,7 @@ bool KviKvsObject_lineedit::functionSetInputMask(KviKvsObjectFunctionCall *c)
 {
 	TQString szMask;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSO_PARAMETERS_END(c)
 	if (widget())
 		((TQLineEdit *)widget())->setInputMask(szMask);
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 8dd485ab..1bfe95a7 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -59,7 +59,7 @@
 		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
-		on the tqparent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
+		on the parent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
 		is set to $true. The listview can be in Single, Multi, Extended or NoSelection selection mode.
 		In single selection mode there can be only one selected item at a time and the selected item is also
 		the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items
@@ -510,10 +510,10 @@ void KviKvsObject_listview::fileDropped(TQString &szFile,KviTalListViewItem *ite
 	callFunction(this,"fileDroppedEvent",0,&params);
 }
 
-KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *tqparent)
+KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *parent)
 :KviTalListView(par)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	setAcceptDrops(true);
 	viewport()->setAcceptDrops( TRUE );
 
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index f3826289..49c448e3 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -46,7 +46,7 @@
 		The listviewitem class implements a list view item.
 		A list view item is a multi-column object capable of displaying itself in a [class]listview[/class].
 		To use this class you must instantiate it with another listviewitem or a [class]listview[/class]
-		as tqparent. The item will be automatically displayed.
+		as parent. The item will be automatically displayed.
 		You can set the text and a pixmap in each column and you can make it checkable
 		with [classfnc:listviewitem]$setCheckable[/classfnc]().
 		A checkable listviewitem will display a small check mark in the first column.
@@ -149,7 +149,7 @@ bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVaria
 		if(parentObject()->inherits("KviKvsObject_listview"))
 			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget()));
 		else {
-			pContext->error(__tr2qs("The tqparent of the listviewitem must be either another listviewitem or a listview"));
+			pContext->error(__tr2qs("The parent of the listviewitem must be either another listviewitem or a listview"));
 			return false;
 		}
 	}
@@ -335,7 +335,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 	if(bCheckable)
 	{
 		if(m_pListViewItem->rtti() == 1)return true; // a TQCheckListItem already
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
@@ -347,7 +347,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 			m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
 	} else {
 		if(m_pListViewItem->rtti() != 1)return true; // not a TQCheckListItem yet
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index a9adda33..826d119f 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -311,14 +311,14 @@
 		[br]
 		privateimpl(%Btn,mousepressevent)[br] 
 		{[br] 
-			if ($$->$tqparent->%nextanim==0) [br] 
+			if ($$->$parent->%nextanim==0) [br] 
 			{[br] 
-				$$->$tqparent->%nextanim=1[br] 
+				$$->$parent->%nextanim=1[br] 
 				$$->$settext(Prev)[br] 
 			} [br] 
 			else[br] 
 			{[br] 
-				$$->$tqparent->%nextanim=0[br] 
+				$$->$parent->%nextanim=0[br] 
 				$$->$settext(Next)[br] 
 			}[br]
 		}[br] 
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 637feff7..2b58acd9 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -81,7 +81,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 {
 	if (!parentObject())
 	{	
-		pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
+		pContext->warning(__tr2qs("the toolbar cannot be a parent-widget!"));
 		return true;
 	}
 	if(parentObject()->inherits("KviKvsObject_mainwindow"))
@@ -90,7 +90,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	}
 	else
 	{
-		pContext->warning(__tr2qs("The tqparent-widget isn't a MainWindow."));
+		pContext->warning(__tr2qs("The parent-widget isn't a MainWindow."));
 	}
 	
 	return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 3e6b4b6b..4ff98d6e 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -147,11 +147,11 @@ const int widgettypes_cod[] = {
 		If erase is TRUE, erases the widget before the $paintEvent() call.
 		!fn: $x()
 		Returns the x coordinate of the upper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $y()
 		Returns the y coordinate of the uspper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $width()
 		Returns the width of this widget in pixels.
@@ -162,7 +162,7 @@ const int widgettypes_cod[] = {
 		x, y, width, height.
 		!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
 		Sets the tqgeometry of this widget. <x> and <y> are relative
-		to the tqparent widget or to the desktop (if this widget is
+		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>.
@@ -182,7 +182,7 @@ const int widgettypes_cod[] = {
 		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
 		!fn: $move(<x_or_array>[,<y>])
 		Moves this widget to the coordinate <x> and <y> relative to its
-		tqparent widget (or the desktop if this widget is a toplevel one).
+		parent widget (or the desktop if this widget is a toplevel one).
 		This is equivalent to [classfnc]$setGeometry[/classfnc](<x>,<y>,
 		[classfnc]$width[/classfnc](),[classfnc]$height[/classfnc]()).
 		!fn: $resize(<w_or_array>,[height])
@@ -212,10 +212,10 @@ const int widgettypes_cod[] = {
 		See also [classfnc]$show[/classfnc]() and [classfnc]$hide[/classfnc]().
 		!fn: $raise()
 		Moves this widget to the top of the stack of the widgets relative
-		to its tqparent. See also [classfnc]$lower[/classfnc].
+		to its parent. See also [classfnc]$lower[/classfnc].
 		!fn: $lower()
 		Moves this widget to the bottom of the stack of the widgets relative
-		to its tqparent. See also [classfnc]$raise[/classfnc]
+		to its parent. See also [classfnc]$raise[/classfnc]
 		!fn: $hasFocus()
 		Returns '1' if this widget has the keyboard focus.
 		See also [classfnc]$setFocus[/classfnc].
@@ -223,7 +223,7 @@ const int widgettypes_cod[] = {
 		Sets this widget to be the one that receives keyboard events.
 		See also [classfnc]$hasFocus[/classfnc]
 		!fn: $parentWidget()
-		Returns the object id of the tqparent widget, or '0' if this
+		Returns the object id of the parent widget, or '0' if this
 		widget is a toplevel one.
 		!fn: $backgroundColor()
 		Returns the background color of this widget in hexadecimal
@@ -1708,12 +1708,12 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
 	}
 	TQPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap();
 #ifdef COMPILE_USE_QT4
-	TQBitmap tqmask(pm->tqmask());
+	TQBitmap mask(pm->mask());
 #else
-	TQBitmap tqmask(*pm->tqmask());
+	TQBitmap mask(*pm->mask());
 #endif
-	if (tqmask.isNull()) c->warning(__tr2qs("Null tqmask"));
-	widget()->setMask(tqmask);
+	if (mask.isNull()) c->warning(__tr2qs("Null mask"));
+	widget()->setMask(mask);
 	return true;
 }
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 732e6f4e..393c296d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -87,9 +87,9 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 		[class]widget[/class]
 	@description:
 		This class rappresents a MDI window in a KVIrc frame.
-		Regardless of the tqparent object passed, the window will be always
+		Regardless of the parent object passed, the window will be always
 		a "physical" child of the frame window: you can't embed a window object
-		inside a widget or another window. The tqparent object will just "own" this
+		inside a widget or another window. The parent object will just "own" this
 		window object and eventually destroy it when it dies.
 		This class can manage only a single central child widget that must
 		be set with $setCentralWidget().
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 3ea0c13b..13c9bf8f 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -340,10 +340,10 @@ void KviKvsObject_wizard::backClicked()
 	KviKvsVariantList *params=0;
 	callFunction(this,"backClickedEvent",params);
 }
-KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * tqparent)
+KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * parent)
 :KviTalWizard(par)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked()));
 	connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked()));
 }
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b91af107..977c8c9b 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -86,7 +86,7 @@
 #include "class_dockwindow.h"
 #include "class_vbox.h"
 #include "class_hbox.h"
-static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
 
 static bool objects_module_cleanup(KviModule *m)
 {
@@ -910,10 +910,10 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	return true;
 }
 
-static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
 {
 #ifdef COMPILE_USE_QT4
-	const TQObjectList list = tqparent->tqchildren();
+	const TQObjectList list = parent->tqchildren();
 	if( !list.count() ) return;
 	TQString sp(spacing);
 	sp.append(">");
@@ -942,7 +942,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *sp
 	}
 
 #else
-	const TQObjectList l = tqparent->childrenListObject();
+	const TQObjectList l = parent->childrenListObject();
 	if( l.isEmpty() ) return;
 	TQObjectListIt it(l);
 	TQString sp(spacing);