Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

31 files changed, 70 insertions, 70 deletions

diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index c3710cc1..a23dcda1 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -57,7 +57,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button)
 
 bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQPushButton(tqparentScriptWidget(),name())),true);
+	setObject(TQT_TQOBJECT(new TQPushButton(parentScriptWidget(),name())),true);
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
 	return true;
 }
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 611341ae..d0f25543 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -73,11 +73,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
 bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	#ifdef COMPILE_USE_QT4
-		TQButtonGroup *group=new TQButtonGroup(tqparentScriptWidget());
+		TQButtonGroup *group=new TQButtonGroup(parentScriptWidget());
 		group->setObjectName(name());
 		setObject(group,true);
 	#else
-		setObject(TQT_TQOBJECT(new TQButtonGroup(name(),tqparentScriptWidget())), true);
+		setObject(TQT_TQOBJECT(new TQButtonGroup(name(),parentScriptWidget())), true);
 	#endif	
 
 
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 27a0fc1d..758e414d 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -79,7 +79,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
 
 bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviStyledCheckBox  * cb = new KviStyledCheckBox(tqparentScriptWidget(), name());
+	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), name());
 	setObject(TQT_TQOBJECT(cb), true);
 	connect(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 38f4472a..88a1b423 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
 
 bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQComboBox(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQComboBox(parentScriptWidget(), name())), true);
 	connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int )));
 	return true;
 }
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index b5515a7c..490aabb8 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -70,7 +70,7 @@ bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 {
 	TQWidget * w = TQT_TQWIDGET(g_pApp->activeModalWidget());
 	if(!w)w = g_pFrame;
-	TQDialog * d = new TQDialog(tqparentScriptWidget() ? tqparentScriptWidget() : w,name());
+	TQDialog * d = new TQDialog(parentScriptWidget() ? parentScriptWidget() : w,name());
 	//d->setModal(true);
 	setObject(TQT_TQOBJECT(d));
 	return true;
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 023d1e25..f741f704 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -119,23 +119,23 @@ const int align_cod[] = {
 		%inputpass=$new(lineedit,%gb)[br]
 		%inputpass->$setechomode("password")[br]
 		[br]
-		#now lets' tqlayouting the groupbox's element's.[br]
-		%tqlayoutgb=$new(tqlayout,%gb)[br]
-		%tqlayoutgb->$setmargin(20)[br]
-		%tqlayoutgb->$addwidget(%labeluser,0,0)[br]
-		%tqlayoutgb->$addwidget(%labelpass,1,0)[br]
-		%tqlayoutgb->$addwidget(%inputuser,0,1)[br]
-		%tqlayoutgb->$addwidget(%inputpass,1,1)[br]
+		#now lets' layouting the groupbox's element's.[br]
+		%layoutgb=$new(tqlayout,%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]
 		%fakewidget=$new(widget,%widget)[br]
-		%tqlayoutbtn=$new(tqlayout,%fakewidget)[br]
+		%layoutbtn=$new(tqlayout,%fakewidget)[br]
 		%btnok=$new(button,%fakewidget)[br]
 		%btnok->$settext("OK")[br]
 		%btncancel=$new(button,%fakewidget)[br]
 		%btncancel->$settext("Cancel")[br]
-		%tqlayoutbtn->$addwidget(%btnok,0,0)[br]
-		%tqlayoutbtn->$addwidget(%btncancel,0,1)[br]
+		%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).
@@ -185,11 +185,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
 bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 #ifdef COMPILE_USE_QT4
-	KviTalGroupBox *groupbox=new KviTalGroupBox(name(),tqparentScriptWidget());
+	KviTalGroupBox *groupbox=new KviTalGroupBox(name(),parentScriptWidget());
 	groupbox->setObjectName(name());
 	setObject(groupbox,true);
 #else
-	setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),tqparentScriptWidget())), true);
+	setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),parentScriptWidget())), true);
 #endif	
 	return true;
 }
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index cf855640..58c518cc 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
 bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	
-		setObject(TQT_TQOBJECT(new KviTalHBox(tqparentScriptWidget())), true);
+		setObject(TQT_TQOBJECT(new KviTalHBox(parentScriptWidget())), true);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
@@ -116,7 +116,7 @@ bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	if(((KviKvsObject_widget *)pObject)->widget()->tqparentWidget() != widget())
+	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs("The widget must be a child of this hbox"));
 		return true;
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index fcde9a18..20184b9c 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -235,7 +235,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
 
 bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLabel(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQLabel(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index cac963b1..3cc6a0ef 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -112,7 +112,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_layout)
 
 bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	TQWidget * w = tqparentScriptWidget();
+	TQWidget * w = parentScriptWidget();
 
 	if(!w)
 	{
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 539457be..3b40b64e 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -89,7 +89,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lcd)
 
 bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLCDNumber(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQLCDNumber(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index e429adfa..8844d1b7 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -218,7 +218,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
 
 bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLineEdit(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new TQLineEdit(parentScriptWidget(),getName())),true);
 	connect(widget(),TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotreturnPressed()));
 	connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus()));
 	connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index db3920f1..241c3855 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -150,7 +150,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listbox)
 
 bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviTalListBox * b = new KviTalListBox(tqparentScriptWidget());
+	KviTalListBox * b = new KviTalListBox(parentScriptWidget());
 	b->setSelectionMode(KviTalListBox::Single);
 	connect(b,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
 	connect(b,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(currentItemChanged(KviTalListBoxItem *)));
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 036e758e..8dd485ab 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
 
 bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviKvsMdmListView(tqparentScriptWidget(),name(),this)),true);
+	setObject(TQT_TQOBJECT(new KviKvsMdmListView(parentScriptWidget(),name(),this)),true);
 	connect(widget(),TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *)));
 	connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *)));
 	connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged()));
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index 0834796c..f3826289 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -137,17 +137,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listviewitem)
 
 bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	if (!tqparentObject())
+	if (!parentObject())
 	{
-			pContext->error(__tr2qs("The listviewitem cannot be tqparentless"));
+			pContext->error(__tr2qs("The listviewitem cannot be parentless"));
 			return false;
 	}
-	if(tqparentObject()->inherits("KviKvsObject_listviewitem"))
+	if(parentObject()->inherits("KviKvsObject_listviewitem"))
 	{
-		 m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_listviewitem *)tqparentObject())->m_pListViewItem);
+		 m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_listviewitem *)parentObject())->m_pListViewItem);
 	} else {
-		if(tqparentObject()->inherits("KviKvsObject_listview"))
-			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)tqparentScriptWidget()));
+		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"));
 			return false;
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 8b04053e..47c8fc68 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
 
 bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalMainWindow(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new KviTalMainWindow(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp
index 860ffafc..93945979 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/class_menubar.cpp
@@ -61,7 +61,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_menubar)
 
 bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQMenuBar(tqparentScriptWidget(), name())));
+	setObject(TQT_TQOBJECT(new TQMenuBar(parentScriptWidget(), name())));
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index fa9181e5..a4beed49 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -353,7 +353,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
 
 bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(parentScriptWidget(),getName())),true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 17bf5c0c..394c39a6 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
 
 bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalPopupMenu(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new KviTalPopupMenu(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotactivated(int)));
 	connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int)));
 	return true;
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 16ed7a42..9ec6cc5a 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]
-		%tqlayoutA=$new(tqlayout,%A)[br]
+		%layoutA=$new(tqlayout,%A)[br]
 		%Ainput=$new(lineedit,%A)[br]
 		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
 		%Aoutput=$new(label,%A)[br]
@@ -92,11 +92,11 @@
 		%bkill->$settext("&Kill ")[br]
 		%bterminate=$new(button,%A)[br]
 		%bterminate->$settext("&Ask to Terminate ")[br]
-		%tqlayoutA->$addwidget(%Ainput,0,0)[br]
-		%tqlayoutA->$addwidget(%Aoutput,1,0)[br]
-		%tqlayoutA->$addwidget(%bclosekill,3,0)[br]
-		%tqlayoutA->$addwidget(%bkill,4,0,)[br]
-		%tqlayoutA->$addwidget(%bterminate,5,0)[br]
+		%layoutA->$addwidget(%Ainput,0,0)[br]
+		%layoutA->$addwidget(%Aoutput,1,0)[br]
+		%layoutA->$addwidget(%bclosekill,3,0)[br]
+		%layoutA->$addwidget(%bkill,4,0,)[br]
+		%layoutA->$addwidget(%bterminate,5,0)[br]
 
 		%Process=$new(process)[br]
 		%Process->$addArg("cmd.exe")[br]
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index b75c144d..bfaa1eca 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -96,11 +96,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
 bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {	
 	#ifdef COMPILE_USE_QT4
-		Q3ProgressBar *pbar=new Q3ProgressBar(tqparentScriptWidget());
+		Q3ProgressBar *pbar=new Q3ProgressBar(parentScriptWidget());
 		pbar->setObjectName(name());
 		setObject(pbar,true);
 	#else
-		setObject(TQT_TQOBJECT(new TQProgressBar(tqparentScriptWidget(), name())), true);
+		setObject(TQT_TQOBJECT(new TQProgressBar(parentScriptWidget(), name())), true);
 	#endif	
 return true;
 }
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 75a20f52..204909ae 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
 
 bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQRadioButton(tqparentScriptWidget(),name())),true);
+	setObject(TQT_TQOBJECT(new TQRadioButton(parentScriptWidget(),name())),true);
 	connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
 	return true;
 }
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 2357da5f..a8e3d938 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
 
 bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQSlider(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQSlider(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 62f7df54..c7ad0922 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
 
 bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQSpinBox(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQSpinBox(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 57e30a18..d30a6b67 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.
-			%tqlayoutfirsttab=$new(tqlayout,%firsttab)
+			%layoutfirsttab=$new(tqlayout,%firsttab)
 			%labelbt=$new(label,%firsttab)
 			%labelbt->$settext(Botton Tab)
 			%labeltt=$new(label,%firsttab)
@@ -106,10 +106,10 @@
 			
 			# Now we'll give a tqlayout to all items.
 			# This also allows to use privateimpl without making buttons global variables
-			%tqlayoutfirsttab->$addwidget(%labelbt,0,0)
-			%tqlayoutfirsttab->$addwidget(%labeltt,0,1)
-			%tqlayoutfirsttab->$addwidget(%buttontb,1,0)
-			%tqlayoutfirsttab->$addwidget(%buttontt,1,1)
+			%layoutfirsttab->$addwidget(%labelbt,0,0)
+			%layoutfirsttab->$addwidget(%labeltt,0,1)
+			%layoutfirsttab->$addwidget(%buttontb,1,0)
+			%layoutfirsttab->$addwidget(%buttontt,1,1)
 			
 			# Add the page to the main tab.
 			%Tabwidget->$addTab(%firsttab,Top&Button,33)
@@ -125,15 +125,15 @@
 			}
 			
 			# We do the same work  with the second tab's page.
-			%tqlayoutsecondtab=$new(tqlayout,%secondtab)
+			%layoutsecondtab=$new(tqlayout,%secondtab)
 			%labelwp=$new(label,%secondtab)
 			%labelwp->$settext("Enjoy the new Class provided by")
-			%tqlayoutsecondtab->$addwidget(%labelwp,0,0)
+			%layoutsecondtab->$addwidget(%labelwp,0,0)
 			%labelwp->$settqalignment("Center")
 			%labelgen=$new(label,%secondtab)
 			%labelgen->$settext(Grifisx \& Noldor)
 			%labelgen->$settqalignment("Center")
-			%tqlayoutsecondtab->$addwidget(%labelgen,1,0)
+			%layoutsecondtab->$addwidget(%labelgen,1,0)
 			%Tabwidget->$addTab(%secondtab,&About,50)
 			
 			# Let's show our example. 
@@ -182,7 +182,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
 
 bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQTabWidget(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQTabWidget(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index 872a9c86..7f4de6ca 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
 
 bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	TQTextBrowser * tb = new TQTextBrowser(tqparentScriptWidget(), name());
+	TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name());
 	setObject(TQT_TQOBJECT(tb), true);
 	connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &)));
 	return true;
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 036c31ee..637feff7 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -79,14 +79,14 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbar)
 
 bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	if (!tqparentObject())
+	if (!parentObject())
 	{	
 		pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
 		return true;
 	}
-	if(tqparentObject()->inherits("KviKvsObject_mainwindow"))
+	if(parentObject()->inherits("KviKvsObject_mainwindow"))
 	{ 
-		setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)tqparentScriptWidget()))), true);
+		setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget()))), true);
 	}
 	else
 	{
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index c8efb269..57107068 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -129,7 +129,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
 
 bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQToolButton(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQToolButton(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
 	return true;
 }
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index edec898e..d068156e 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
 
 bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalVBox(tqparentScriptWidget())), true);
+	setObject(TQT_TQOBJECT(new KviTalVBox(parentScriptWidget())), true);
 	return true;
 }
 
@@ -118,7 +118,7 @@ bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(((KviKvsObject_widget *)pObject)->widget()->tqparentWidget() != widget())
+	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs("The widget must be a child of this vbox"));
 		return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 6790bbf6..3e6b4b6b 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -202,7 +202,7 @@ const int widgettypes_cod[] = {
 		!fn: $window.caption()
 		Returns the caption text of this widget.
 		!fn: $isTopLevel()
-		Returns '1' if this widget is a toplevel (tqparentless) one,
+		Returns '1' if this widget is a toplevel (parentless) one,
 		'0' otherwise.
 		!fn: $isVisible()
 		Returns '1' if this widget is currently visible (read: is managed
@@ -222,7 +222,7 @@ const int widgettypes_cod[] = {
 		!fn: $setFocus()
 		Sets this widget to be the one that receives keyboard events.
 		See also [classfnc]$hasFocus[/classfnc]
-		!fn: $tqparentWidget()
+		!fn: $parentWidget()
 		Returns the object id of the tqparent widget, or '0' if this
 		widget is a toplevel one.
 		!fn: $backgroundColor()
@@ -639,7 +639,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
 
 bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new TQWidget(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new TQWidget(parentScriptWidget(),getName())),true);
 	return true;
 }
 
@@ -1256,7 +1256,7 @@ bool KviKvsObject_widget::function_foregroundColor(KviKvsObjectFunctionCall *c)
 bool KviKvsObject_widget::function_parentWidget(KviKvsObjectFunctionCall *c)
 {
 	if(!widget())return true;
-	if(tqparentScriptWidget()) c->returnValue()->setHObject(tqparentObject()->handle());
+	if(parentScriptWidget()) c->returnValue()->setHObject(parentObject()->handle());
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
     return true;
@@ -1564,7 +1564,7 @@ bool KviKvsObject_widget::function_setWFlags(KviKvsObjectFunctionCall *c)
 #ifdef COMPILE_USE_QT4
 	widget()->setWindowFlags(sum);
 #else
-	 widget()->reparent(widget()->tqparentWidget(),sum,TQPoint(widget()->x(),widget()->y()));
+	 widget()->reparent(widget()->parentWidget(),sum,TQPoint(widget()->x(),widget()->y()));
 #endif
 	 return true;
 }
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 67226503..3ea0c13b 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
 
 bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviKvsMdmWizard(tqparentScriptWidget(), name(),this)), true);
+	setObject(TQT_TQOBJECT(new KviKvsMdmWizard(parentScriptWidget(), name(),this)), true);
 
 	return true;
 }
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index 90e36876..48092775 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_workspace)
 
 bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQWorkspace(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQWorkspace(parentScriptWidget(), name())), true);
 	return true;
 }