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/kdeaddons@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

50 files changed, 151 insertions, 151 deletions

diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index a726458..9cc67a8 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -80,7 +80,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
-    KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) );
+    KMessageBox::error( parentWidget(), msg.tqarg( fileName ) );
     return addrList;
   }
 
@@ -91,7 +91,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const
   line  = gmxStream.readLine();
   line2 = gmxStream.readLine();
   if (!line.startsWith("AB_ADDRESSES:") || !line2.startsWith("Address_id")) {
-	KMessageBox::error( tqparentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) );
+	KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) );
 	return addrList;
   }
 
@@ -214,7 +214,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
-      KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
+      KMessageBox::error( parentWidget(), txt.tqarg( url.url() )
                           .tqarg( strerror( tmpFile.status() ) ) );
       return false;
     }
@@ -222,14 +222,14 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
+    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
 
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
-      KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) );
+      KMessageBox::error( parentWidget(), txt.tqarg( filename ) );
       return false;
     }
 
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 5bf0906..8931bce 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -133,7 +133,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol()
       //connect(symbols, TQT_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQT_SLOT(slotViewChanged(TQResizeEvent *)));
 
       m_Active = true;
-      //symbols->addColumn(i18n("Symbols"), symbols->tqparentWidget()->width());
+      //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width());
       symbols->addColumn(i18n("Symbols"));
       symbols->addColumn(i18n("Position"));
       symbols->setColumnWidthMode(1, TQListView::Manual);
@@ -192,7 +192,7 @@ void KatePluginSymbolViewerView::slotDocChanged()
 void KatePluginSymbolViewerView::slotViewChanged(TQResizeEvent *)
 {
  kdDebug(13000)<<"View changed !!!!"<<endl;
- symbols->setColumnWidth(0, symbols->tqparentWidget()->width());
+ symbols->setColumnWidth(0, symbols->parentWidget()->width());
 }
 
 void KatePluginSymbolViewerView::slotShowContextMenu(TQListViewItem *, const TQPoint &p, int)
@@ -307,8 +307,8 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p )
 
 // BEGIN KatePluginSymbolViewerConfigPage
 KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage(
-    TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
-  : Kate::PluginConfigPage( tqparentWidget )
+    TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+  : Kate::PluginConfigPage( parentWidget )
 {
   TQVBoxLayout* top = new TQVBoxLayout(this, 0,
       KDialogBase::spacingHint());
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index d247852..9d0779f 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -94,7 +94,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage
   friend class KatePluginSymbolViewer;
 
   public:
-    KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~KatePluginSymbolViewerConfigPage ();
 
     /**
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 5d6649a..33639ce 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -504,7 +504,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
 }
 
 
-TQWidget *KateFileTemplates::tqparentWindow()
+TQWidget *KateFileTemplates::parentWindow()
 {
   return dynamic_cast<TQWidget*>(application()->activeMainWindow());
 }
@@ -523,7 +523,7 @@ TQWidget *KateFileTemplates::tqparentWindow()
 // and edit the file as she wants to...
 void KateFileTemplates::slotCreateTemplate()
 {
-  KateTemplateWizard w( tqparentWindow(), this );
+  KateTemplateWizard w( parentWindow(), this );
   w.exec();
 
   updateTemplateDirs();
@@ -536,7 +536,7 @@ void KateFileTemplates::slotCreateTemplate()
 // * Set the URL to a writable one if required
 void KateFileTemplates::slotEditTemplate()
 {
-  KDialogBase dlg( tqparentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close);
+  KDialogBase dlg( parentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close);
   dlg.setMainWidget( new KateTemplateManager( this, &dlg ) );
   dlg.exec();
 }
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index 6bcffce..e6fef30 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -102,7 +102,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
     /**
      * @return a a pointer to the active main window
      */
-    TQWidget * tqparentWindow();
+    TQWidget * parentWindow();
 
   public slots:
     /**
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index cc88a5b..2b8e80e 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -367,8 +367,8 @@ WaitDlg::~WaitDlg()
 //BEGIN InsertCommandConfigPage
 // This is the config page for this plugin.
 InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/,
-                                                 TQWidget *tqparentWidget)
-  : Kate::PluginConfigPage( tqparentWidget )
+                                                 TQWidget *parentWidget)
+  : Kate::PluginConfigPage( parentWidget )
 {
   TQVBoxLayout* lo = new TQVBoxLayout( this );
   lo->setSpacing(KDialogBase::spacingHint());
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index ff3a584..5765a9b 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -146,7 +146,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage
   friend class PluginKateInsertCommand;
 
   public:
-    InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~InsertCommandConfigPage() {}
 
     /** Reimplemented from Kate::PluginConfigPage
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index 4ebac34..521024c 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -371,8 +371,8 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p )
 }
 
 KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent, 
-                                                 TQWidget *tqparentWidget)
-  : Kate::PluginConfigPage( tqparentWidget ),m_plugin(tqparent)
+                                                 TQWidget *parentWidget)
+  : Kate::PluginConfigPage( parentWidget ),m_plugin(tqparent)
 {
 	TQVBoxLayout *l=new TQVBoxLayout(this);
 	l->setAutoAdd(true);
diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h
index ee6a311..31300d9 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.h
+++ b/kate/kjswrapper/plugin_katekjswrapper.h
@@ -122,7 +122,7 @@ class KateKJSWrapperConfigPage : public Kate::PluginConfigPage
   friend class PluginKateKJSWrapper;
 
   public:
-    KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~KateKJSWrapperConfigPage() {};
 
     /** Reimplemented from Kate::PluginConfigPage
diff --git a/kate/kjswrapper/samples/katekjstest1.js b/kate/kjswrapper/samples/katekjstest1.js
index a8b061b..7e4e041 100644
--- a/kate/kjswrapper/samples/katekjstest1.js
+++ b/kate/kjswrapper/samples/katekjstest1.js
@@ -1,7 +1,7 @@
 /****************************************************************
 		First configuration page
 ****************************************************************/
-function Page1 (tqparentWidget) {
+function Page1 (parentWidget) {
 		this.defaults=function() {
 			alert("Defaults has been called");
 		}
@@ -11,7 +11,7 @@ function Page1 (tqparentWidget) {
 		this.reset=function() {
 			alert("Reset defaults has been called");
 		}
-		box=new QVBox(tqparentWidget);
+		box=new QVBox(parentWidget);
 		this.button1=new QPushButton(box);
 		this.button1.text="P1 Button 1";
 		this.button1.show();
@@ -27,8 +27,8 @@ Page1.fullName="Test1/Page1";
 		Second configuration page
 ****************************************************************/
 
-function Page2 (tqparentWidget) {
-		box=new QVBox(tqparentWidget);
+function Page2 (parentWidget) {
+		box=new QVBox(parentWidget);
 		this.button1=new QPushButton(box);
 		this.button1.text="P2 Button 1";
 		this.button1.show();
@@ -44,8 +44,8 @@ Page2.fullName="Test1/Page2";
 		Third configuration page
 ****************************************************************/
 
-function Page3 (tqparentWidget) {
-		box=new QVBox(tqparentWidget);
+function Page3 (parentWidget) {
+		box=new QVBox(parentWidget);
 		this.button1=new QPushButton(box);
 		this.button1.text="P3 Button 1";
 		this.button1.show();
@@ -62,11 +62,11 @@ Page3.fullName="Test1/Page3";
 		First toolview
 ****************************************************************/
 
-function MyToolView1 (mainwindow,tqparentwidget) {
-	tqparentwidget.caption="This is my first JS Toolview";
-	tqparentwidget.icon=StdIcons.BarIcon("yes");
+function MyToolView1 (mainwindow,parentwidget) {
+	parentwidget.caption="This is my first JS Toolview";
+	parentwidget.icon=StdIcons.BarIcon("yes");
 
-	this.lv = new KListView( tqparentwidget );
+	this.lv = new KListView( parentwidget );
 
 	this.lv.addColumn('Pix');
 	this.lv.addColumn('One');
@@ -99,11 +99,11 @@ MyToolView1.name="myfirstjstoolview"
 		Second toolview
 ****************************************************************/
 
-function MyToolView2 (mainwindow,tqparentwidget) {
-	tqparentwidget.caption="This is my second JS Toolview";
-	tqparentwidget.icon=StdIcons.BarIcon("no");
+function MyToolView2 (mainwindow,parentwidget) {
+	parentwidget.caption="This is my second JS Toolview";
+	parentwidget.icon=StdIcons.BarIcon("no");
 
-	this.lb=new QListBox(tqparentwidget);
+	this.lb=new QListBox(parentwidget);
 	this.mainwindow=mainwindow;
 	this.cleanup=function() {
 		alert("Cleanup MyToolView2");
@@ -121,11 +121,11 @@ MyToolView2.name="mysecondjstoolview"
 function newWindowCallBack(mainwindow) {
 	alert("New Window has been created");
 /*
-	anotherToolView = function  (mainwindow,tqparentwidget) {
-		tqparentwidget.caption="This is my third JS Toolview";
-		tqparentwidget.icon=StdIcons.BarIcon("kate");
+	anotherToolView = function  (mainwindow,parentwidget) {
+		parentwidget.caption="This is my third JS Toolview";
+		parentwidget.icon=StdIcons.BarIcon("kate");
 
-		this.lb=new QListBox(tqparentwidget);
+		this.lb=new QListBox(parentwidget);
 		this.mainwindow=mainwindow;
 		this.cleanup=function() {
 			alert("Cleanup MyToolView3");
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 5d2c268..483a677 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -390,7 +390,7 @@ KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p)
   TQString str;
   TQRect r;
 
-  ((KPyBrowser *) tqparentWidget ())->tip (p, r, str);
+  ((KPyBrowser *) parentWidget ())->tip (p, r, str);
 
   if (!str.isEmpty () && r.isValid ())
     tip (r, str);
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index b694158..37c2aab 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -210,5 +210,5 @@
 <functions>
     <function returnType="TQListViewItem *">insertItem( const TQString&amp; name, bool bRename )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index e789c20..ece507f 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -475,8 +475,8 @@ void KateTabBarExtension::slotViewChanged ()
 
 // BEGIN KateTabBarExtensionConfigPage
 KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage(
-    TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
-  : Kate::PluginConfigPage( tqparentWidget )
+    TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+  : Kate::PluginConfigPage( parentWidget )
 {
   TQVBoxLayout* top = new TQVBoxLayout(this, 0,
       KDialogBase::spacingHint());
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 1655e18..bcc759a 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -268,7 +268,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage
   friend class KatePluginTabBarExtension;
 
   public:
-    KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~KateTabBarExtensionConfigPage ();
 
     /**
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 65130e9..06b7a1e 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -8326,7 +8326,7 @@
 <attribute name="xreflabel" type="#IMPLIED" value="CDATA" default=""/>
 <attribute name="status" type="#IMPLIED" value="CDATA" default=""/>
 <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
-<attribute name="tqparentbook" type="#IMPLIED" value="IDREF" default=""/>
+<attribute name="parentbook" type="#IMPLIED" value="IDREF" default=""/>
 <attribute name="class" type="#IMPLIED" enumeration="yes" value="journalarticle productsheet whitepaper techreport specification faq" default=""/>
 <attribute name="id" type="#IMPLIED" value="ID" default=""/>
 <attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index fe5c9f4..b3eea59 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -282,9 +282,9 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ )
   else if( leftCh == "<" )
   {
     kdDebug() << "*outside tag -> get elements" << endl;
-    TQString tqparentElement = getParentElement( *kv, true );
-    kdDebug() << "tqparent: " << tqparentElement << endl;
-    allowed = m_docDtds[docNumber]->allowedElements(tqparentElement );
+    TQString parentElement = getParentElement( *kv, true );
+    kdDebug() << "tqparent: " << parentElement << endl;
+    allowed = m_docDtds[docNumber]->allowedElements(parentElement );
     m_mode = elements;
   }
   // TODO: optionally close tqparent tag if not left=="/>"
@@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement()
   }
 
   PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()];
-  TQString tqparentElement = getParentElement( *kv, false );
+  TQString parentElement = getParentElement( *kv, false );
   TQStringList allowed;
 
   if( dtd )
-    allowed = dtd->allowedElements(tqparentElement );
+    allowed = dtd->allowedElements(parentElement );
 
   InsertElement *dialog = new InsertElement(
       ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" );
@@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement()
     kdDebug() << "Warning: no Kate::View" << endl;
     return;
   }
-  TQString tqparentElement = getParentElement( *kv, false );
+  TQString parentElement = getParentElement( *kv, false );
 
-  //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl;
-  TQString closeTag = "</" + tqparentElement + ">";
-  if( ! tqparentElement.isEmpty() )
+  //kdDebug() << "parentElement: '" << parentElement << "'" << endl;
+  TQString closeTag = "</" + parentElement + ">";
+  if( ! parentElement.isEmpty() )
     kv->insertText( closeTag );
 }
 
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index b6cc9b0..e0376d4 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -196,7 +196,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress )
  * a list of allowed elements, but it doesn't care about order or if only a certain
  * number of occurences is allowed.
  */
-TQStringList PseudoDTD::allowedElements( TQString tqparentElement )
+TQStringList PseudoDTD::allowedElements( TQString parentElement )
 {
   if( m_sgmlSupport )
   {
@@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString tqparentElement )
     TQMap<TQString,TQStringList>::Iterator it;
     for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it )
     {
-      if( it.key().lower() == tqparentElement.lower() )
+      if( it.key().lower() == parentElement.lower() )
         return it.data();
     }
   }
-  else if( m_elementsList.tqcontains(tqparentElement) )
-    return m_elementsList[tqparentElement];
+  else if( m_elementsList.tqcontains(parentElement) )
+    return m_elementsList[parentElement];
 
   return TQStringList();
 }
diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h
index f798bea..912ec4b 100644
--- a/kate/xmltools/pseudo_dtd.h
+++ b/kate/xmltools/pseudo_dtd.h
@@ -46,11 +46,11 @@ class PseudoDTD
 
     void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd );
 
-    TQStringList allowedElements( TQString tqparentElement );
-    TQStringList allowedAttributes( TQString tqparentElement );
+    TQStringList allowedElements( TQString parentElement );
+    TQStringList allowedAttributes( TQString parentElement );
     TQStringList attributeValues( TQString element, TQString attribute );
     TQStringList entities( TQString start );
-    TQStringList requiredAttributes( const TQString &tqparentElement ) const;
+    TQStringList requiredAttributes( const TQString &parentElement ) const;
 
   protected:
 
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 0b94ee9..321f913 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -475,7 +475,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kled.h</includehint>
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index c49cbab..d8592a2 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -660,7 +660,7 @@ int Parser::errmsg()
 		        break;
 
        case 2:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Missing tqparenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 3:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index 533ba20..6ac8b49 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -185,7 +185,7 @@ void JuKInterface::dropEvent(TQDropEvent* event)
 			kdDebug(90200) << "Couldn't send drop to juk" << endl;
 		}
 
-		// Aptqparently we should auto-play?
+		// Apparently we should auto-play?
 		TQByteArray strData;
 		TQDataStream strArg(strData, IO_WriteOnly);
 		strArg << *fileList.begin();
diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp
index 147dc5a..b67708c 100644
--- a/kicker-applets/mediacontrol/mcslider.cpp
+++ b/kicker-applets/mediacontrol/mcslider.cpp
@@ -36,10 +36,10 @@ void MCSlider::setBackground()
 {
     unsetPalette();
     
-    if (tqparentWidget()->paletteBackgroundPixmap())
+    if (parentWidget()->paletteBackgroundPixmap())
     {
         TQPixmap pm(width(), height());
-        pm.fill(tqparentWidget(), pos());
+        pm.fill(parentWidget(), pos());
         setPaletteBackgroundPixmap(pm);
     }
 }
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 8386754..36a3e0e 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -14,9 +14,9 @@
             <height>245</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <property name="toolTip" stdset="0">
         <string></string>
@@ -170,9 +170,9 @@
                                 <property name="title">
                                     <string>Preview</string>
                                 </property>
-                                <property name="tqlayoutMargin" stdset="0">
+                                <property name="layoutMargin" stdset="0">
                                 </property>
-                                <property name="tqlayoutSpacing" stdset="0">
+                                <property name="layoutSpacing" stdset="0">
                                 </property>
                                 <property name="whatsThis" stdset="0">
                                     <string>Shows you how the selected theme will look</string>
@@ -365,7 +365,7 @@
 <Q_SIGNALS>
     <signal>toggled(bool)</signal>
 </Q_SIGNALS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/knewsticker-scripts/stock.pl b/knewsticker-scripts/stock.pl
index 6c8fe05..9e07adf 100755
--- a/knewsticker-scripts/stock.pl
+++ b/knewsticker-scripts/stock.pl
@@ -60,7 +60,7 @@
 # Please set your stock symbols and the ticker you wish to retrieve them from
 # as follows:
 # Locate the Variable that is named 'my @tickers'
-# within the tqparenthesis put as the FIRST values you ticker, for example yahoo
+# within the parenthesis put as the FIRST values you ticker, for example yahoo
 # or yahoo_europe or any of the others mentioned above
 # any subsequent value seperated by a whitespace is a ticker symbol
 # such as MSFT or IBM or LNUX
@@ -74,7 +74,7 @@ use POSIX qw(strftime);
 # encouraged, that you only use this when you have 1 stock symbol and not more.
 my $verbose = 0;
 
-#Make sure you set the first value within the tqparenthesis to match the ticker
+#Make sure you set the first value within the parenthesis to match the ticker
 #you wish to retrieve data from, such as yahoo or yahoo_europe. Each following
 #entry, seperated by a whitespace, represnts a stock symbol to the script
 my @tickers = qw(yahoo_europe IBM MSFT LNUX);
diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index c98bb3d..c0abc0e 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -166,7 +166,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>ktextedit.h</includehint>
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 812cb5b..fb0760a 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -124,14 +124,14 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
     // nothing here yet
   }
 
-  tqparentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
+  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
 
   TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
 }
 
 DOMTreeWindow *DOMTreeView::mainWindow() const
 {
-  return static_cast<DOMTreeWindow *>(tqparentWidget());
+  return static_cast<DOMTreeWindow *>(parentWidget());
 }
 
 bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e)
@@ -214,7 +214,7 @@ void DOMTreeView::slotShowTree(const DOM::Node &pNode)
 void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, uint depth)
 {
   DOMListViewItem *cur_item;
-  DOMListViewItem *tqparent_item = m_itemdict[pNode.handle()];
+  DOMListViewItem *parent_item = m_itemdict[pNode.handle()];
 
   if (depth > m_maxDepth) {
     m_maxDepth = depth;
@@ -224,7 +224,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u
     cur_item = new DOMListViewItem(node, m_listView);
     m_document = pNode.ownerDocument();
   } else {
-    cur_item = new DOMListViewItem(node, tqparent_item);
+    cur_item = new DOMListViewItem(node, parent_item);
   }
 
   //kdDebug(90180) << node.nodeName().string() << " [" << depth << "]" << endl;
@@ -252,7 +252,7 @@ void DOMTreeView::showRecursive(const DOM::Node &pNode, const DOM::Node &node, u
 	cur_item = new DOMListViewItem(node, m_listView, cur_item);
 	m_document = pNode.ownerDocument();
       } else {
-	cur_item = new DOMListViewItem(node, tqparent_item, cur_item);
+	cur_item = new DOMListViewItem(node, parent_item, cur_item);
       }
       //kdDebug(90180) << "</" << node.nodeName().string() << ">" << endl;
       addElement(element, cur_item, true);
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 025c623..0d3a204 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -509,7 +509,7 @@
     <tabstop>m_highlightHTMLCheckBox</tabstop>
     <tabstop>nodeAttributes</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index f91f717..d703eeb 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -192,7 +192,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index 73223a5..c6d20bc 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -110,7 +110,7 @@
 <Q_SLOTS>
     <slot specifier="non virtual">addMessage( const TQString &amp; msg )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index 8563032..b68a31e 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -142,7 +142,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index b9d2f5b..0fdfee7 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -93,7 +93,7 @@ KAboutData* FSViewPart::createAboutData()
   return aboutData;
 }
 
-FSViewPart::FSViewPart(TQWidget *tqparentWidget, const char *widgetName,
+FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
                        TQObject *tqparent, const char *name,
                        const TQStringList& /* args */)
     : KParts::ReadOnlyPart(tqparent, name)
@@ -101,7 +101,7 @@ FSViewPart::FSViewPart(TQWidget *tqparentWidget, const char *widgetName,
     // we need an instance
     setInstance( FSViewPartFactory::instance() );
 
-    _view = new FSView(new Inode(), tqparentWidget, widgetName);
+    _view = new FSView(new Inode(), parentWidget, widgetName);
     TQWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical "
 				"browsing mode showing filesystem utilization "
 				"by using a tree map visualization.</p>"
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 1adba9e..2328e21 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -86,7 +86,7 @@ class FSViewPart : public KParts::ReadOnlyPart
   TQ_OBJECT
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
 public:
-  FSViewPart(TQWidget *tqparentWidget, const char *widgetName,
+  FSViewPart(TQWidget *parentWidget, const char *widgetName,
              TQObject *tqparent, const char *name, const TQStringList &args);
 
   virtual ~FSViewPart();
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index b3f6cb6..285230d 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -852,7 +852,7 @@ void TreeMapItem::clear()
 }
 
 
-// tqinvalidates current tqchildren and forces redraw
+// invalidates current tqchildren and forces redraw
 // this is only usefull when tqchildren are created on demand in items()
 void TreeMapItem::refresh()
 {
@@ -1083,10 +1083,10 @@ protected:
 
 void TreeMapTip::maybeTip( const TQPoint& pos )
 {
-  if ( !tqparentWidget()->inherits( "TreeMapWidget" ) )
+  if ( !parentWidget()->inherits( "TreeMapWidget" ) )
         return;
 
-  TreeMapWidget* p = (TreeMapWidget*)tqparentWidget();
+  TreeMapWidget* p = (TreeMapWidget*)parentWidget();
   TreeMapItem* i;
   i = p->item(pos.x(), pos.y());
   TQPtrList<TQRect>* rList = i ? i->freeRects() : 0;
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index ca10251..47665ea 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -436,7 +436,7 @@ public:
   /**
    * Selects or unselects an item.
    * In multiselection mode, the constrain that a selected item
-   * has no selected tqchildren or tqparents stays true.
+   * has no selected tqchildren or parents stays true.
    */
   void setSelected(TreeMapItem*, bool selected = true);
 
@@ -517,7 +517,7 @@ public:
   void setVisibleWidth(int width, bool reuseSpace = false);
 
   /**
-   * If a tqchildren value() is almost the tqparents sum(),
+   * If a tqchildren value() is almost the parents sum(),
    * it can happen that the border to be drawn for visibilty of
    * nesting relations takes to much space, and the
    * tqparent/child size relation can not be mapped to a correct
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
index 2ca7a5c..1869438 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
+++ b/konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui
@@ -192,6 +192,6 @@
     <slot access="private">slotClearMoveCache()</slot>
     <slot access="protected">slotClearCopyCache()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="0"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint"/>
+<layoutdefaults spacing="6" margin="0"/>
+<layoutfunctions spacing="KDialog::spacingHint"/>
 </UI>
diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp
index f0e99a4..1bf9341 100644
--- a/konq-plugins/rsync/rsyncconfigdialog.cpp
+++ b/konq-plugins/rsync/rsyncconfigdialog.cpp
@@ -127,14 +127,14 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name,
     tqlayout->addWidget(mLabel);
 
     // Create an exclusive button group
-    TQButtonGroup *tqlayoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
-    tqlayout->addWidget( tqlayoutg );
-    tqlayoutg->setExclusive( TRUE );
+    TQButtonGroup *layoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
+    tqlayout->addWidget( layoutg );
+    layoutg->setExclusive( TRUE );
 
     // Insert radiobuttons
-    rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg);
-    rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), tqlayoutg);
-    rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), tqlayoutg);
+    rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg);
+    rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg);
+    rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg);
 
     if (syncmode == 1)
         rsync_rb1->setChecked( TRUE );
@@ -143,15 +143,15 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name,
     else if (syncmode == 3)
         rsync_rb3->setChecked( TRUE );
 
-    //(void)new TQRadioButton( "R&adiobutton 2", tqlayoutg );
-    //(void)new TQRadioButton( "Ra&diobutton 3", tqlayoutg );
+    //(void)new TQRadioButton( "R&adiobutton 2", layoutg );
+    //(void)new TQRadioButton( "Ra&diobutton 3", layoutg );
 
     // Create an exclusive button group
-    TQButtonGroup *tqlayoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
-    tqlayout->addWidget( tqlayoutm );
-    tqlayoutg->setExclusive( TRUE );
+    TQButtonGroup *layoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
+    tqlayout->addWidget( layoutm );
+    layoutg->setExclusive( TRUE );
 
-    m_rsync_txt = new TQLineEdit(tqlayoutm);
+    m_rsync_txt = new TQLineEdit(layoutm);
     if (remotefolder.isEmpty() == false) {
         m_rsync_txt->setText(remotefolder);
     }
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index e7a82af..c85760a 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -158,7 +158,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
index 129f737..4f07e62 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
@@ -12,9 +12,9 @@
             <height>151</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -30,7 +30,7 @@
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -166,9 +166,9 @@
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -242,9 +242,9 @@
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -336,5 +336,5 @@
 <includes>
     <include location="global" impldecl="in declaration">controls.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
index 50d0222..9027637 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
@@ -12,9 +12,9 @@
             <height>151</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -30,7 +30,7 @@
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -166,9 +166,9 @@
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -242,9 +242,9 @@
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -336,5 +336,5 @@
 <includes>
     <include location="global" impldecl="in declaration">controls.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/konq-plugins/sidebar/newsticker/configfeedsbase.ui b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
index 594e72b..2d39220 100644
--- a/konq-plugins/sidebar/newsticker/configfeedsbase.ui
+++ b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
@@ -18,7 +18,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 8e5ca1e..571b39d 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -119,7 +119,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp
index a9f4f5e..d0aecdd 100644
--- a/ksig/siglistviewitem.cpp
+++ b/ksig/siglistviewitem.cpp
@@ -29,7 +29,7 @@
 SigListViewItem::~SigListViewItem()
 {
     // remove the element from the tree
-    element.tqparentNode().removeChild(element);
+    element.parentNode().removeChild(element);
 }
 
 TQString SigListViewItem::text() const
diff --git a/ksig/standardtextbase.ui b/ksig/standardtextbase.ui
index f7373fd..136e3ca 100644
--- a/ksig/standardtextbase.ui
+++ b/ksig/standardtextbase.ui
@@ -112,7 +112,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index 925a51f..73c4249 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -18,9 +18,9 @@
     <property name="acceptDrops">
         <bool>true</bool>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -292,9 +292,9 @@
             <property name="frameShadow">
                 <enum>Plain</enum>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -2216,7 +2216,7 @@
             <property name="name">
                 <cstring>Layout10</cstring>
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -2232,7 +2232,7 @@
                     <property name="name">
                         <cstring>Layout9</cstring>
                     </property>
-                    <property name="tqlayoutSpacing" stdset="0">
+                    <property name="layoutSpacing" stdset="0">
                     </property>
                     <vbox>
                         <property name="name">
@@ -2265,7 +2265,7 @@
                             <property name="name">
                                 <cstring>Layout8</cstring>
                             </property>
-                            <property name="tqlayoutSpacing" stdset="0">
+                            <property name="layoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2407,7 +2407,7 @@
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
-                    <property name="tqlayoutSpacing" stdset="0">
+                    <property name="layoutSpacing" stdset="0">
                     </property>
                     <vbox>
                         <property name="name">
@@ -2423,7 +2423,7 @@
                             <property name="name">
                                 <cstring>Layout3</cstring>
                             </property>
-                            <property name="tqlayoutSpacing" stdset="0">
+                            <property name="layoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2501,7 +2501,7 @@
                             <property name="name">
                                 <cstring>Layout4</cstring>
                             </property>
-                            <property name="tqlayoutSpacing" stdset="0">
+                            <property name="layoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2636,5 +2636,5 @@
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui
index c403ae0..437dfa9 100644
--- a/noatun-plugins/dub/dub/dubprefs.ui
+++ b/noatun-plugins/dub/dub/dubprefs.ui
@@ -178,7 +178,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index ae22592..a65bf96 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -67,7 +67,7 @@ void FileMenu::removeFromList()
 
 void FileMenu::properties()
 {
-	new ObliquePropertiesDialog(mFiles, tqparentWidget());
+	new ObliquePropertiesDialog(mFiles, parentWidget());
 }
 
 void FileMenu::toggleInSlice(Slice *slice)
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index 8f92f2a..af14f95 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -61,8 +61,8 @@ public:
 	virtual int compare(TQListViewItem * i, int col, bool) const;
 
 	/**
-	 * open my tqparents so that I'm visible, if I'm playing or
-	 * close my tqparents if I'm not playing, and the user
+	 * open my parents so that I'm visible, if I'm playing or
+	 * close my parents if I'm not playing, and the user
 	 * didn't open
 	 **/
 	void autoExpand();
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index e533bd2..c200860 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -191,5 +191,5 @@
     <slot access="protected">offsetChanged(int)</slot>
     <slot access="protected">rangeChanged(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index 846a3b7..570bdb6 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -257,14 +257,14 @@ struct SliderBar : public UIObject
 
 struct PopperUpper : public UIObject
 {
-	int tqmaskAdd;
+	int maskAdd;
 
 	PopperUpper(int _am,int _vm,double _x,double _y,
-			double _width,double _height, int _tqmaskAdd)
+			double _width,double _height, int _maskAdd)
 	{
 		activeMask = _am; visibleMask = _vm;
 		x = _x; y = _y; width = _width; height = _height;
-		tqmaskAdd = _tqmaskAdd;
+		maskAdd = _maskAdd;
 	}
 
 	int go(bool mouseDown,bool mouseClick, bool mouseOver,
@@ -282,7 +282,7 @@ struct PopperUpper : public UIObject
 				0x0200,
 				x*scale,y*scale,width*scale,height*scale);
 
-		return mouseOver ? tqmaskAdd : 0;
+		return mouseOver ? maskAdd : 0;
 	}
 
 	void handleKey(char key, int &action)
@@ -346,7 +346,7 @@ void Interface::setupPalette()
 #define OPEN 64
 
 
-// TODO Lay things out with tqparents and a stack, like QT
+// TODO Lay things out with parents and a stack, like QT
 Interface::Interface()
 {
 	static const float IconSize=0.2;
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index 663816c..2c09991 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -170,14 +170,14 @@ struct SliderBar : public UIObject
 
 struct PopperUpper : public UIObject
 {
-	int tqmaskAdd;
+	int maskAdd;
 
 	PopperUpper(int _am,int _vm,double _x,double _y,
-			double _width,double _height, int _tqmaskAdd)
+			double _width,double _height, int _maskAdd)
 	{
 		activeMask = _am; visibleMask = _vm; 
 		x = _x; y = _y; width = _width; height = _height;
-		tqmaskAdd = _tqmaskAdd;
+		maskAdd = _maskAdd;
 	}
 
 	int go(bool mouseDown,bool mouseClick, bool mouseOver,
@@ -195,7 +195,7 @@ struct PopperUpper : public UIObject
 				0x0200,
 				x*scale,y*scale,width*scale,height*scale);
 
-		return mouseOver ? tqmaskAdd : 0;
+		return mouseOver ? maskAdd : 0;
 	}
 
 	void handleKey(char key, int &action)
@@ -259,7 +259,7 @@ void Interface::setupPalette()
 #define OPEN 64 
 
 
-// TODO Lay things out with tqparents and a stack, like QT
+// TODO Lay things out with parents and a stack, like QT
 Interface::Interface()
 {
 	static const float IconSize=0.2;