Remove additional unneeded tq method conversions

(cherry picked from commit 75112ed8e227f656f98523b7ffdad5422d9a6f11)

81 files changed, 429 insertions, 429 deletions

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 9f05f61..26e618c 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -526,7 +526,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
 
 	if (i < 8)
 	{
-		KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i));
+		KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").arg(i));
 		if (this->filename.isNull())
 			close();
 		return;
@@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu()
 {
 	TQStringList estates;
 	for (int i = 1; i <= max; i++)
-		estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i)));
+		estates.append(i18n("Jump to Estate %1").arg(TQString::number(i)));
 	estateAct->setItems(estates);
 }
 
@@ -679,7 +679,7 @@ void AtlanticDesigner::save()
 
 		writtenGroups.append((*it).name());
 
-		t << endl << TQString("[%1]").tqarg((*it).name()) << endl;
+		t << endl << TQString("[%1]").arg((*it).name()) << endl;
 
 		if ((*it).globalPrice() > 0)
 			t << "price=" << (*it).globalPrice() << endl;
@@ -748,7 +748,7 @@ void AtlanticDesigner::save()
 
 	for (estate = estates.first(); estate; estate = estates.next())
 	{
-		t << endl << TQString("[%1]").tqarg(estate->name()) << endl;
+		t << endl << TQString("[%1]").arg(estate->name()) << endl;
 
 		switch (estate->type())
 		{
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index ea3ab6e..7a80f89 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( parentWidget(), msg.tqarg( fileName ) );
+    KMessageBox::error( parentWidget(), msg.arg( 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( parentWidget(), i18n("%1 is not a GMX address book file.").tqarg(fileName) );
+	KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.").arg(fileName) );
 	return addrList;
   }
 
@@ -214,8 +214,8 @@ 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( parentWidget(), txt.tqarg( url.url() )
-                          .tqarg( strerror( tmpFile.status() ) ) );
+      KMessageBox::error( parentWidget(), txt.arg( url.url() )
+                          .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
 
@@ -229,7 +229,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
 
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
-      KMessageBox::error( parentWidget(), txt.tqarg( filename ) );
+      KMessageBox::error( parentWidget(), txt.arg( filename ) );
       return false;
     }
 
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 51a37ac..3d07955 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -58,9 +58,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
   if ( flags != 0 ) {
     for ( int i = 0; i < flags; ++i ) {
       FlagInfo info;
-      info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).tqarg( i ) );
-      info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).tqarg( i ) );
-      info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).tqarg( i ) );
+      info.latitude = config.readDoubleNumEntry( TQString( "Flag_%1_Latitude" ).arg( i ) );
+      info.longitude = config.readDoubleNumEntry( TQString( "Flag_%1_Longitude" ).arg( i ) );
+      info.color = config.readColorEntry( TQString( "Flag_%1_Color" ).arg( i ) );
 
       availableFlags.append( info );
     }
@@ -102,9 +102,9 @@ bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
   int startVal = 0;
   TQValueList<FlagInfo>::Iterator it;
   for ( it = flagList.begin(); it != flagList.end(); ++it, ++startVal ) {
-    config.writeEntry( TQString( "Flag_%1_Color" ).tqarg( startVal ), (*it).color );
-    config.writeEntry( TQString( "Flag_%1_Latitude" ).tqarg( startVal ), (*it).latitude );
-    config.writeEntry( TQString( "Flag_%1_Longitude" ).tqarg( startVal ), (*it).longitude );
+    config.writeEntry( TQString( "Flag_%1_Color" ).arg( startVal ), (*it).color );
+    config.writeEntry( TQString( "Flag_%1_Latitude" ).arg( startVal ), (*it).latitude );
+    config.writeEntry( TQString( "Flag_%1_Longitude" ).arg( startVal ), (*it).longitude );
   }
   config.writeEntry( "Flags", startVal );
 
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index a499ef2..5d59d5e 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
     /*  if (m_oldInitURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
@@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
       /*if (m_saveURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 6f51e9b..56a0dc8 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
     if ( ! file.open( IO_ReadOnly ) )
     {
       KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
-                          i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename),
+                          i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename),
                           i18n("Template Plugin"), 0 );
       KIO::NetAccess::removeTempFile( tmpfile );
       return;
@@ -479,7 +479,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
         count++;
 
     if ( docname.contains( "%1" ) )
-      docname = docname.tqarg( count );
+      docname = docname.arg( count );
 
     doc->setDocName( docname );
 
@@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
       "edit the data in the KDE email information."), page ) );
 
   cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the "
-    "'%{fullname}' macro").tqarg( sFullname ), page );
+    "'%{fullname}' macro").arg( sFullname ), page );
   cbRRealname->setEnabled( ! sFullname.isEmpty() );
   lo->addWidget( cbRRealname );
 
   cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the "
-      "'%email' macro").tqarg( sEmail ), page);
+      "'%email' macro").arg( sEmail ), page);
   cbREmail->setEnabled( ! sEmail.isEmpty() );
   lo->addWidget( cbREmail );
 
@@ -922,7 +922,7 @@ void KateTemplateWizard::accept()
       if ( KMessageBox::warningContinueCancel( this, i18n(
           "<p>The file <br><strong>'%1'</strong><br> already exists; if you "
           "do not want to overwrite it, change the template file name to "
-          "something else.").tqarg( templateUrl.prettyURL() ),
+          "something else.").arg( templateUrl.prettyURL() ),
       i18n("File Exists"), i18n("Overwrite") )
            == KMessageBox::Cancel )
         return;
@@ -976,7 +976,7 @@ void KateTemplateWizard::accept()
       {
         KMessageBox::sorry( this, i18n(
             "<qt>Error opening the file<br><strong>%1</strong><br>for reading. "
-            "The document will not be created</qt>").tqarg(u.prettyURL()),
+            "The document will not be created</qt>").arg(u.prettyURL()),
             i18n("Template Plugin"), 0 );
 
         KIO::NetAccess::removeTempFile( tmpfile );
@@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept()
   {
     KMessageBox::sorry( this, i18n(
         "Unable to save the template to '%1'.\n\nThe template will be opened, "
-        "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ),
+        "so you can save it from the editor.").arg( templateUrl.prettyURL() ),
         i18n("Save Failed") );
 
     kft->application()->activeMainWindow()->viewManager()->openURL( KURL() );
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index f88f0ba..c94c24f 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg()
 {
     if ( sh->isRunning() ) {
       wdlg = new WaitDlg( (TQWidget*)kv, i18n(
-        "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd)  );
+        "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd)  );
       connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) );
     }
     if ( sh->isRunning() )    // we may have finished while creating the dialog.
diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp
index 9f49bcb..34bd1b0 100644
--- a/kate/kjswrapper/bindings.cpp
+++ b/kate/kjswrapper/bindings.cpp
@@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const
 		kdDebug()<<"calling illegal method of DocumentManager"<<endl;
 		return KJS::Null(); 
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
 	    return KJS::Undefined();
@@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self,
 
 
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
             return KJS::Undefined();
@@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self,
 		default:
 		return KJS::Undefined();
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
             return KJS::Undefined();
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index 926b184..a4c3e83 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name,
     w->show();
     //w->show();*/
     kdDebug()<<"m_scriptname="<<m_scriptname<<endl;
-    m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname)));
+    m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname)));
 //"/home/jowenn/development/kde/cvs/kdeaddons/kate/kjswrapper/samples/test1.js");
 }
 
@@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win)
     if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl;
 
     view->setInstance (new KInstance("kate"));
-    view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname));
+    view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname));
     win->guiFactory()->addClient (view);
 }
 
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 34c9167..183e1e7 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -286,7 +286,7 @@ KPyBrowser::parseText (TQString & pytext)
       line = &(*iter);
       if (class_rx.search(*line) >= 0)
 	{
-	  //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no));
+	  //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no));
 	  //strip out the beginning class and ending colon
 	  class_sig = line->stripWhiteSpace ().mid (6);
 	  class_sig = class_sig.left (class_sig.length () - 1);
@@ -318,7 +318,7 @@ KPyBrowser::parseText (TQString & pytext)
 	}
       if ((function_rx.search(*line) >= 0))
 	{
-	  //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no));
+	  //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no));
 	  function_sig = line->stripWhiteSpace ().mid (4);
 	  function_sig = function_sig.left (function_sig.find (":"));
 	  paren_i = function_sig.find ("(");
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 4cd379c..4b8490c 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line)
   if (apiline == -1)
   {
           KMessageBox::information(0,
-                  i18n("Could not find method/class %1.").tqarg(name), i18n("Selection"));
+                  i18n("Could not find method/class %1.").arg(name), i18n("Selection"));
   }
   else
   {
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 8b116f1..b71422a 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -192,7 +192,7 @@ protected:
 
 TQString ErrorMessage::caption() const
 {
-	return TQString::fromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line());
+	return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line());
 }
 
 TQString ErrorMessage::fancyMessage() const
@@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item)
 			<< globalPos.x() << "," << globalPos.y() << endl;
 #if 0
 		KPassivePopup::message(
-			TQString::fromLatin1("%1:%2").tqarg(filename).tqarg(lineno),
+			TQString::fromLatin1("%1:%2").arg(filename).arg(lineno),
 			msg,
 			this);
 #else
@@ -644,7 +644,7 @@ bool PluginKateMakeView::slotValidate()
 		KMessageBox::sorry(0,
 			i18n("The file <i>%1</i> is not a local file. "
 				"Non-local files cannot be compiled.")
-				.tqarg(url.path()));
+				.arg(url.path()));
 		return false;
 	}
 
@@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate()
 		make = KStandardDirs::findExe("make");
 	*m_proc << make;
 	if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
-		KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ?
+		KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?
 			"make" : make));
 		return false;
 	}
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index b1a0ea3..94ffe2c 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 	setResizeMode(TQListView::LastColumn);
 	connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
 
-/* TODO?: tqinvalidate the listview when document has changed
+/* TODO?: invalidate the listview when document has changed
 	Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView();
 	if( ! kv ) {
 		kdDebug() << "Warning: no Kate::View" << endl;
@@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate()
 	if( m_tmp_file->status() != 0 ) {
 		kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl;
 		KMessageBox::error(0, i18n("<b>Error:</b> Could not create "
-			"temporary file '%1'.").tqarg(m_tmp_file->name()));
+			"temporary file '%1'.").arg(m_tmp_file->name()));
 		delete m_tmp_file;
 		m_tmp_file=0L;
 		return false;
diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml
index 03505ae..f7b48d0 100644
--- a/kate/xmltools/html4-loose.dtd.xml
+++ b/kate/xmltools/html4-loose.dtd.xml
@@ -689,11 +689,11 @@
         type="param"
 >
 <text-expanded>align      (left|center|right|justify|char) #IMPLIED
-   char       CDATA    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment char --</text>
 </entity>
 
 <entity name="pre.exclusion"
@@ -3621,8 +3621,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- default number of columns in group --
   width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4909,8 +4909,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5086,7 +5086,7 @@
   name        CDATA          #IMPLIED  -- allows applets to find each other --
   width       %Length;       #REQUIRED -- initial width --
   height      %Length;       #REQUIRED -- initial height --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
   </attdecl>
@@ -5170,8 +5170,8 @@
 <attlist name="TFOOT">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5683,8 +5683,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- COL attributes affect N columns --
   width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -6457,7 +6457,7 @@
   width       %Length;       #IMPLIED  -- override width --
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   border      %Pixels;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -6648,7 +6648,7 @@
   rel         %LinkTypes;    #IMPLIED  -- forward link types --
   rev         %LinkTypes;    #IMPLIED  -- reverse link types --
   accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  tqshape       %Shape;        rect      -- for use with client-side image maps --
+  shape       %Shape;        rect      -- for use with client-side image maps --
   coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
   onfocus     %Script;       #IMPLIED  -- the element got the focus --
@@ -6742,7 +6742,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -6956,7 +6956,7 @@
 <attlist name="H1">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7085,7 +7085,7 @@
 <attlist name="H2">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7214,7 +7214,7 @@
 <attlist name="H3">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7439,7 +7439,7 @@
 <attlist name="H4">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7716,7 +7716,7 @@
 <attlist name="H5">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8002,7 +8002,7 @@
 <attlist name="H6">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8645,7 +8645,7 @@
 <attlist name="P">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -9871,7 +9871,7 @@
 <attlist name="DIV">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   %reserved;                           -- reserved for possible future use --
   </attdecl>
 <attribute name="title"
@@ -10579,7 +10579,7 @@
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   name        CDATA          #IMPLIED  -- submit as part of form --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   border      %Pixels;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -10824,8 +10824,8 @@
 <attlist name="THEAD">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -11505,7 +11505,7 @@
   marginwidth %Pixels;       #IMPLIED  -- margin widths in pixels --
   marginheight %Pixels;      #IMPLIED  -- margin height in pixels --
   scrolling   (yes|no|auto)  auto      -- scrollbar or none --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   height      %Length;       #IMPLIED  -- frame height --
   width       %Length;       #IMPLIED  -- frame width --
   </attdecl>
@@ -11742,7 +11742,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  tqshape       %Shape;        rect      -- controls interpretation of coords --
+  shape       %Shape;        rect      -- controls interpretation of coords --
   coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
   href        %URI;          #IMPLIED  -- URI for linked resource --
   target      %FrameTarget;  #IMPLIED  -- render in this frame --
@@ -11817,7 +11817,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -12054,8 +12054,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
   bgcolor     %Color;        #IMPLIED  -- cell background color --
   width       %Length;       #IMPLIED  -- width for cell --
@@ -12476,8 +12476,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
   bgcolor     %Color;        #IMPLIED  -- cell background color --
   width       %Length;       #IMPLIED  -- width for cell --
@@ -13024,8 +13024,8 @@
 <attlist name="TR">
 <attdecl>                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   bgcolor     %Color;        #IMPLIED  -- background color for row --
   </attdecl>
 <attribute name="onmouseout"
@@ -13339,7 +13339,7 @@
   onselect    %Script;       #IMPLIED  -- some text was selected --
   onchange    %Script;       #IMPLIED  -- the element value was changed --
   accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   %reserved;                           -- reserved for possible future use --
   </attdecl>
 <attribute name="accesskey"
diff --git a/kate/xmltools/html4-strict.dtd.xml b/kate/xmltools/html4-strict.dtd.xml
index 063051f..bbcf853 100644
--- a/kate/xmltools/html4-strict.dtd.xml
+++ b/kate/xmltools/html4-strict.dtd.xml
@@ -594,11 +594,11 @@
         type="param"
 >
 <text-expanded>align      (left|center|right|justify|char) #IMPLIED
-   char       CDATA    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment char --</text>
 </entity>
 
 <entity name="pre.exclusion"
@@ -3127,8 +3127,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- default number of columns in group --
   width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4148,8 +4148,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4253,8 +4253,8 @@
 <attlist name="TFOOT">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4734,8 +4734,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- COL attributes affect N columns --
   width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5636,7 +5636,7 @@
   rel         %LinkTypes;    #IMPLIED  -- forward link types --
   rev         %LinkTypes;    #IMPLIED  -- reverse link types --
   accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  tqshape       %Shape;        rect      -- for use with client-side image maps --
+  shape       %Shape;        rect      -- for use with client-side image maps --
   coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
   onfocus     %Script;       #IMPLIED  -- the element got the focus --
@@ -5726,7 +5726,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -8923,8 +8923,8 @@
 <attlist name="THEAD">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -9624,7 +9624,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  tqshape       %Shape;        rect      -- controls interpretation of coords --
+  shape       %Shape;        rect      -- controls interpretation of coords --
   coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
   href        %URI;          #IMPLIED  -- URI for linked resource --
   nohref      (nohref)       #IMPLIED  -- this region has no action --
@@ -9694,7 +9694,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -9919,8 +9919,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -10250,8 +10250,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -10751,8 +10751,8 @@
 <attlist name="TR">
 <attdecl>                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 734c257..f772aeb 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -466,7 +466,7 @@ void PluginKateXMLTools::getDTD()
     url.setFileName( defaultDir + filename );
     KMessageBox::information(0, i18n("The current file has been identified "
         "as a document of type \"%1\". The meta DTD for this document type "
-            "will now be loaded.").tqarg( doctype ),
+            "will now be loaded.").arg( doctype ),
         i18n( "Loading XML Meta DTD" ),
         TQString::fromLatin1( "DTDAssigned") );
   }
@@ -503,7 +503,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job )
   {
     // catch failed loading loading via http:
     KMessageBox::error(0, i18n("The file '%1' could not be opened. "
-        "The server returned an error.").tqarg( m_urlString ),
+        "The server returned an error.").arg( m_urlString ),
         i18n( "XML Plugin Error") );
   }
   else
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
       --col;
     }
 
-    ushort ch = str.tqat( col).tqunicode();
+    ushort ch = str.at( col).tqunicode();
 
     switch( parseState )
     {
@@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
 
             TQString tag = str.mid( col + 1 );
             for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
-              ch = tag.tqat( pos).tqunicode();
+              ch = tag.at( pos).tqunicode();
               if( ch == ' ' || ch == '\t' || ch == '>' ) {
                 tag.truncate( pos );
                 break;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index 99de846..b13c35f 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
   if ( ! doc.setContent( metaDtd) )
   {
     KMessageBox::error(0, i18n("The file '%1' could not be parsed. "
-        "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ),
+        "Please check that the file is well-formed XML.").arg( metaDtdUrl ),
         i18n( "XML Plugin Error") );
     return;
   }
@@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
         "Please check that the file is of this type:\n"
             "-//Norman Walsh//DTD DTDParse V2.0//EN\n"
             "You can produce such files with dtdparse. "
-            "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ),
+            "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ),
         i18n("XML Plugin Error") );
     return;
   }
diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml
index e66fc60..aa1e7dd 100644
--- a/kate/xmltools/testcases.xml
+++ b/kate/xmltools/testcases.xml
@@ -40,7 +40,7 @@ the current cursor position, replacing the old value:
 	<td align="">	center, char, justify, left, right
 	<td valign="">	baseline, bottom, middle, top
 	<td valign="foobar"> -- "foobar" should be replaced
-	<area tqshape="">	circle, default, poly, rect
+	<area shape="">	circle, default, poly, rect
 	<area foobar="">	(no predefined values)
 
 6. Type "&". A list with named entities should appear. Select one and
diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml
index 73bf4bc..6530334 100644
--- a/kate/xmltools/xhtml1-frameset.dtd.xml
+++ b/kate/xmltools/xhtml1-frameset.dtd.xml
@@ -7533,7 +7533,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7608,7 +7608,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -12001,7 +12001,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12097,7 +12097,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-strict.dtd.xml b/kate/xmltools/xhtml1-strict.dtd.xml
index 850de19..907cd86 100644
--- a/kate/xmltools/xhtml1-strict.dtd.xml
+++ b/kate/xmltools/xhtml1-strict.dtd.xml
@@ -6190,7 +6190,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -6260,7 +6260,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -9838,7 +9838,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   </attdecl>
 <attribute name="rev"
@@ -9929,7 +9929,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-transitional.dtd.xml b/kate/xmltools/xhtml1-transitional.dtd.xml
index 5f04e87..9506803 100644
--- a/kate/xmltools/xhtml1-transitional.dtd.xml
+++ b/kate/xmltools/xhtml1-transitional.dtd.xml
@@ -7600,7 +7600,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7675,7 +7675,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -11940,7 +11940,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12036,7 +12036,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/kfile-plugins/lnk/kfile_lnk.cpp
index 804181a..eb9e106 100644
--- a/kfile-plugins/lnk/kfile_lnk.cpp
+++ b/kfile-plugins/lnk/kfile_lnk.cpp
@@ -75,8 +75,8 @@ bool lnkPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 
   if ( ! lnkInfo.isNetworkPath )
   {
-    appendItem(group, "Where", i18n("on Windows disk: %1").tqarg(lnkInfo.volumeName));  // volume label
-    appendItem(group, "PointsTo", TQString("%1%2").tqarg(lnkInfo.driveName).tqarg(lnkInfo.path));
+    appendItem(group, "Where", i18n("on Windows disk: %1").arg(lnkInfo.volumeName));  // volume label
+    appendItem(group, "PointsTo", TQString("%1%2").arg(lnkInfo.driveName).arg(lnkInfo.path));
   }
   else
   {
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp
index 645486e..c3825e0 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/kfile-plugins/lnk/read_lnk.cpp
@@ -182,8 +182,8 @@ bool readLNK(const KURL &url, LNKInfo &info)
     else  // network path
     {
       info.path = TQString("%1\\%2")
-                          .tqarg(start + loc.netVolume + 0x14)  // network share name
-                          .tqarg(start + loc.pathname);
+                          .arg(start + loc.netVolume + 0x14)  // network share name
+                          .arg(start + loc.pathname);
     }
 
     delete [] data;
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 1e08d2f..dbfd9a5 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
  * Update the preview
  */
 void SettingsImp::updatePreview(){
-	int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+	int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
 	int look = KLed::Raised;
 	look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
 	look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
 	kLed5->setBackgroundColor(backgroundColor);
 	kLed6->setBackgroundColor(backgroundColor);
 
-	kLed1->setShape((KLed::Shape)tqshape);
-	kLed2->setShape((KLed::Shape)tqshape);
-	kLed3->setShape((KLed::Shape)tqshape);
-	kLed4->setShape((KLed::Shape)tqshape);
-	kLed5->setShape((KLed::Shape)tqshape);
-	kLed6->setShape((KLed::Shape)tqshape);
+	kLed1->setShape((KLed::Shape)shape);
+	kLed2->setShape((KLed::Shape)shape);
+	kLed3->setShape((KLed::Shape)shape);
+	kLed4->setShape((KLed::Shape)shape);
+	kLed5->setShape((KLed::Shape)shape);
+	kLed6->setShape((KLed::Shape)shape);
 
 	kLed1->setColor(color);
 	kLed2->setColor(color);
@@ -173,7 +173,7 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
  * Load the settings for the clock.
  */
 void KBinaryClock::loadSettings(){
-	int tqshape = prefs->shape();
+	int shape = prefs->shape();
 	int look = prefs->look();
 	TQColor color = prefs->color();
 
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
 	}
 	for(int i=0; i < 4; i++){
 		for(int j=0; j < ledWidth;j++){
-			ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
+			ledMatrix[j][i]->setShape((KLed::Shape)shape);
 			ledMatrix[j][i]->setColor(color);
 			ledMatrix[j][i]->setLook((KLed::Look)look);
 			ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
 		proc << locate("exe", "kdesu");
 		proc << "--nonewdcop";
 		proc << TQString("%1 clock --lang %2")
-				.tqarg(locate("exe", "kcmshell"))
-				.tqarg(KGlobal::locale()->language());
+				.arg(locate("exe", "kcmshell"))
+				.arg(KGlobal::locale()->language());
 		proc.start(KProcess::DontCare);
 		break;
 	case 104:
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
+	tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
 }
 
 #include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 2ebb466..7f21dec 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>Dark</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index fbce8cf..9acfc26 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -140,7 +140,7 @@ void KolourPicker::slotHistory()
 		TQPopupMenu *sub = copyPopup(*it, false);
 		subMenus.append(sub);
 		popup.insertItem(colorPixmap(*it),
-			TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()),
+			TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()),
 			sub);
 	}
 	popup.insertSeparator();
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f5239bd..4760982 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc
index 54d1edf..99ea20b 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cc
@@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
     KMessageBox::error(timemon,
                        i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
                             "This file is required to determine current memory usage.\n"
-                            "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                            "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
     exit(1);
   }
 
@@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
     KMessageBox::error(timemon,
                        i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
                             "This file is required to determine current system info. "
-                            "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                            "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
     exit(1);
   }
 
@@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
                                      "The diagnostics are:\n%1.\n"
                                      "Are you really running Solaris? "
                                      "Please contact the maintainer at mueller@kde.org "
-                                     "who will try to figure out what went wrong.").tqarg(strerror(errno)));
+                                     "who will try to figure out what went wrong.").arg(strerror(errno)));
     exit(1);
   }
 #endif
@@ -210,7 +210,7 @@ void KSample::readSample()
     if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0)
     {
         fatal(i18n("Unable to read the memory usage file '%1'.\n"
-                   "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                   "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno)));
     }
     buffer[l] = '\0';
     l = 0;
@@ -223,7 +223,7 @@ void KSample::readSample()
                        "different file format than expected.\n"
                        "Maybe your version of the proc filesystem is "
                        "incompatible with supported versions. "
-		       "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME));
+		       "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME));
         l++;
     }
 
@@ -237,7 +237,7 @@ void KSample::readSample()
     lseek(statFD, 0, 0);
     if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0)
         fatal(i18n("Unable to read the system usage file '%1'.\n"
-                   "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno)));
+                   "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno)));
 
     buffer[l] = '\0';
 
@@ -271,7 +271,7 @@ void KSample::readSample()
 
     struct tbl_sysinfo sysinfo;
     if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1)
-        fatal(msg.tqarg("TBL_SYSINFO"));
+        fatal(msg.arg("TBL_SYSINFO"));
 
     sample.user = sysinfo.si_user;
     sample.nice = sysinfo.si_nice;
@@ -281,7 +281,7 @@ void KSample::readSample()
 
     struct tbl_vmstats vmstats;
     if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1)
-        fatal(msg.tqarg("TBL_VMSTATS"));
+        fatal(msg.arg("TBL_VMSTATS"));
 
     sample.mtotal = vmstats.free_count + vmstats.active_count +
         vmstats.inactive_count + vmstats.wire_count;
@@ -291,7 +291,7 @@ void KSample::readSample()
 
     struct tbl_swapinfo swapinfo;
     if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1)
-        fatal(msg.tqarg("TBL_SWAPINFO"));
+        fatal(msg.arg("TBL_SWAPINFO"));
 
     sample.stotal = swapinfo.size;
     sample.sfree = swapinfo.free;
@@ -324,7 +324,7 @@ void KSample::readSample()
             kstat_read(kc, ksp, &cstat) == -1) // and read into buffer
             fatal(i18n("Unable to read the CPU statistics entry "
                        "from the 'kstat' library. The diagnostics are '%1'.\n"
-                       "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                       "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
         // fields are: idle user kernel iowait (no nice info?)
         sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus;
@@ -338,7 +338,7 @@ void KSample::readSample()
         fatal(i18n("The number of CPUs appears to have changed at "
                    "very short notice, or the 'kstat' library returns "
                    "inconsistent results (%1 vs. %2 CPUs).\n"
-                   "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus));
+                   "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus));
 
     // availrmem = pages of core for user-proc ( == physmem - kernelmem)
     // freemem = no of free pages
@@ -350,7 +350,7 @@ void KSample::readSample()
         fatal(i18n("Unable to read the memory statistics entry "
                    "from the 'kstat' library. The diagnostics are '%1'\n"
                    "You might want to contact the maintainer at "
-                   "http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                   "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
     int i;
     unsigned long physmem = 0, freemem = 0, availrmem = 0;
@@ -367,7 +367,7 @@ void KSample::readSample()
         fatal(i18n("There seems to be a problem with KTimeMon's handling "
                    "of the 'kstat' library: 0 bytes of physical memory determined!\n"
                    "Free memory is %1, available memory is %2.\n"
-                   "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem));
+                   "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem));
 
     sample.mtotal = physmem;
     sample.free = freemem;
@@ -378,7 +378,7 @@ void KSample::readSample()
     if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1)
         fatal(i18n("Unable to determine the number of "
                    "swap spaces. The diagnostics are '%1'.\n"
-                   "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                   "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
     if (swapentries != 0) {
                                 // 2* to get some space for padding??
@@ -389,8 +389,8 @@ void KSample::readSample()
                        "trying to determine the swap usage.\n"
                        "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n"
                        "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.")
-                  .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
-                  .tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent)));
+                  .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
+                  .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent)));
 
         char path[1024];
         stbl->swt_n = swapentries;
@@ -399,7 +399,7 @@ void KSample::readSample()
         if ((swapentries = swapctl(SC_LIST, stbl)) == -1)
             fatal(i18n("Unable to determine the swap usage.\n"
                        "The diagnostics are '%1'.\n"
-                       "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                       "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
 
         if (!warned && swapentries != stbl->swt_n) {
@@ -407,7 +407,7 @@ void KSample::readSample()
             nonfatal(i18n("Information was requested for "
                           "%1 swap spaces, but only %2 swap entries were returned.\n"
                           "KTimeMon will attempt to continue.\n"
-                          "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries));
+                          "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries));
         }
 
         for (i = 0; i < swapentries; i++) {
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index f0cc61a..991a2e9 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -171,11 +171,11 @@ void KTimeMon::maybeTip(const TQPoint& p)
     if ( idle < 0 )
         idle = 0;
     TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free")
-                .tqarg(idle)
-                .tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
-                .tqarg(100-s.used)
-                .tqarg(KGlobal::locale()->formatNumber(s.stotal, 0))
-                .tqarg(100-s.sused);
+                .arg(idle)
+                .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
+                .arg(100-s.used)
+                .arg(KGlobal::locale()->formatNumber(s.stotal, 0))
+                .arg(100-s.sused);
 
     tip(rect(), str);
 }
@@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration()
     conf->sync();
 }
 
-// Make the KSample object update its internal sample and tqrepaint the
+// Make the KSample object update its internal sample and repaint the
 // object.
 void KTimeMon::timeout()
 {
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index e1dee3e..8a58064 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -656,41 +656,41 @@ int Parser::getfix(TQString name)
 int Parser::errmsg()
 {   switch(err)
 	{  case 1:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 2:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 3:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 4:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 5:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 6:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 7:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 8:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 	   
        case 9:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
-       case 10:  KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)),
+       case 10:  KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)),
                                                    i18n("Math Expression Evaluator"));
      			break;
        case 11:  KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator"));
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 916c0e1..6621c53 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
+				result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
 			}
 		}
 	}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
+				result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
 			}
 		}
 		else // artist is non-empty
 		{
 			if(title.isEmpty())
 			{
-				result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
+				result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
 			}
 			else
 			{
-				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
+				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
 			}
 		}
 	}
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index ac32064..95cf81c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
 		{
 			KNotifyClient::event(winId(), KNotifyClient::warning,
 				i18n("There was trouble loading theme %1. Please choose" \
-					" a different theme.").tqarg(skindir));
+					" a different theme.").arg(skindir));
 
 			// default to kde-icons, they have to be installed :)
 			slotIconChanged();
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index b17afa3..98ba0cb 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
         switch (e)
         {
             case TQSocket::ErrConnectionRefused:
-                message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port);
+                message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
                 break;
             case TQSocket::ErrHostNotFound:
-                message=i18n("Host '%1' not found.").tqarg(hostname);
+                message=i18n("Host '%1' not found.").arg(hostname);
                 break;
             case TQSocket::ErrSocketRead:
                 message=i18n("Error reading socket.");
@@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
 
     if (songid>-1)
     {
-        if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1()))
+        if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
         {
             fetchOk(); // unlocks
         }
@@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta)
         volume+=delta;
         if (volume<0) volume=0;
         if (volume>100) volume=100;
-        if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1()))
+        if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
         {
             fetchOk();
         }
@@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                 // found song, so lets play it
                 if (songid>-1)
                 {
-                    if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1()))
+                    if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
                     {
                         if (fetchOk()) list.pop_front();
                         return;
@@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
 
     if (!(songid>-1)) return result;
 
-    if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1()))
+    if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
         return result;
 
     TQString artist;
@@ -559,7 +559,7 @@ const TQString MpdInterface::getTrackTitle() const
         else
             return album;
     }
-    return i18n("No tags: %1").tqarg(file);
+    return i18n("No tags: %1").arg(file);
 }
 
 int MpdInterface::playingStatus()
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f5239bd..4760982 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 6c49555..f2bfa7e 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
         {
             item = itemList.first();
             m_name = itemList.first()->name();
-            action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this,
+            action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
                                     TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
         }
         else
@@ -143,7 +143,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
             {
                 TQString targetName = itemList.first()->name();
                 stripExtension( targetName );
-                action = new KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this,
+                action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
                                         TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
             }
             else
@@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos )
         int i=1;
         while ( KIO::NetAccess::exists(target, true, 0 ) )
         {
-            target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ];
+            target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
             i++;
         }
     }
@@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault()
         int i=1;
         while ( KIO::NetAccess::exists(name, true, 0 ) )
         {
-            name = m_dir + i18n("Archive %1").tqarg(i) + m_ext;
+            name = m_dir + i18n("Archive %1").arg(i) + m_ext;
             i++;
         }
     }
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index 8951451..7ab20b4 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -59,14 +59,14 @@ void DOMListViewItem::init()
   clos = false;
 }
 
-void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
+void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
 {
   TQColorGroup _cg( cg );
   TQColor c = _cg.text();
 
   p->setFont(m_font);
   _cg.setColor( TQColorGroup::Text, m_color );
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
   _cg.setColor( TQColorGroup::Text, c );
 }
 
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h
index 3ba7378..f6f74f6 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.h
+++ b/konq-plugins/domtreeviewer/domlistviewitem.h
@@ -33,7 +33,7 @@ class DOMListViewItem : public TQListViewItem
    virtual ~DOMListViewItem();
  
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment );  
+			  int column, int width, int alignment );  
 
   void setColor( const TQColor &color) { m_color = color; }
 
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index a072409..5837239 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -53,7 +53,7 @@ static const char * const dom_error_msgs[] = {
 TQString domtreeviewer::domErrorMessage(int dom_err)
 {
   if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0])
-    return i18n("Unknown Exception %1").tqarg(dom_err);
+    return i18n("Unknown Exception %1").arg(dom_err);
   else
     return i18n(dom_error_msgs[dom_err]);
 }
diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h
index 6361fd7..eed0822 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.h
+++ b/konq-plugins/domtreeviewer/domtreecommands.h
@@ -305,7 +305,7 @@ class InsertNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~InsertNodeCommand();
@@ -331,7 +331,7 @@ class RemoveNodeCommand : public ManipulateNodeCommand
 public:
   /**
    * Prepare insertion command, inserting \c node into \c parent, just 
-   * before \c after. If \c after is 0, append it to the list of tqchildren.
+   * before \c after. If \c after is 0, append it to the list of children.
    */
   RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~RemoveNodeCommand();
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 615f056..4a15a2b 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -124,7 +124,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part)
     // nothing here yet
   }
 
-  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).tqarg(part->url().prettyURL()) : i18n("DOM Tree") );
+  parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
 
   TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
 }
@@ -530,7 +530,7 @@ void DOMTreeView::slotSaveClicked()
 
     if (file.exists()) {
       const TQString title = i18n( "File Exists" );
-      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).tqarg(url.url());
+      const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url());
       if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) {
 	return;
       }
@@ -545,12 +545,12 @@ void DOMTreeView::slotSaveClicked()
       delete m_textStream;
     } else {
       const TQString title = i18n( "Unable to Open File" );
-      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).tqarg(url.path());
+      const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path());
       KMessageBox::sorry( this, text, title );
     }
   } else {
     const TQString title = i18n( "Invalid URL" );
-    const TQString text = i18n( "This URL \n %1 \n is not valid." ).tqarg(url.url());
+    const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url());
     KMessageBox::sorry( this, text, title );
   }
 }
@@ -973,7 +973,7 @@ public:
 
 protected:
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-			  int column, int width, int tqalignment )
+			  int column, int width, int alignment )
   {
     bool updates_enabled = listView()->isUpdatesEnabled();
     listView()->setUpdatesEnabled(false);
@@ -993,7 +993,7 @@ protected:
 
     TQColorGroup _cg( cg );
     _cg.setColor( TQColorGroup::Text, c );
-    super::paintCell( p, _cg, column, width, tqalignment );
+    super::paintCell( p, _cg, column, width, alignment );
 
     if (text_changed) setText(column, oldText);
     listView()->setUpdatesEnabled(updates_enabled);
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 6ff1634..43c389c 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -169,7 +169,7 @@ class DOMTreeView : public DOMTreeViewBase
     // == DOM Node Info panel ======================================
 
     public:
-        // Keep in sync with the widget stack tqchildren
+        // Keep in sync with the widget stack children
         enum InfoPanel { ElementPanel, CDataPanel, EmptyPanel };
     
     public slots:
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 830bb3d..931c43f 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
     double s;
     TQString str;
     for (i=1;i<=ccount;i++) {
-      str = TQString("Dir%1").tqarg(i);
+      str = TQString("Dir%1").arg(i);
       if (!cconfig.hasKey(str)) continue;
       str = cconfig.readPathEntry(str);
-      s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0);
-      f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0);
-      d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0);
+      s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0);
+      f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0);
+      d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0);
       if (s==0.0 || f==0 || d==0) continue;
       setDirMetric(str, s, f, d);
     }
@@ -147,7 +147,7 @@ void FSView::setPath(TQString p)
 
   b->setPeer(d);
 
-  setCaption(TQString("%1 - FSView").tqarg(_path));
+  setCaption(TQString("%1 - FSView").arg(_path));
   requestUpdate(b);
 }
 
@@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
   popup.insertItem(i18n("Refresh"), 5);
   popup.setItemEnabled(5, !_sm.scanRunning());
 
-  if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4);
+  if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4);
   popup.insertSeparator();
   addDepthStopItems(dpopup, 1001, i);
   popup.insertItem(i18n("Stop at Depth"), dpopup, 1000);
@@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g)
   TQMap<TQString, MetricEntry>::iterator it;
   int c = 1;
   for (it=_dirMetric.begin();it!=_dirMetric.end();++it) {
-    g->writePathEntry(TQString("Dir%1").tqarg(c), it.key());
-    g->writeEntry(TQString("Size%1").tqarg(c), (*it).size);
-    g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount);
-    g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount);
+    g->writePathEntry(TQString("Dir%1").arg(c), it.key());
+    g->writeEntry(TQString("Size%1").arg(c), (*it).size);
+    g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount);
+    g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount);
     c++;
   }
   g->writeEntry("Count", c-1);
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 0d5eda7..5182dbe 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
     emitPercent(percent, 100);
     slotInfoMessage(this, i18n("Read 1 folder, in %1",
                                "Read %n folders, in %1",
-                               dirs ).tqarg(cDir));
+                               dirs ).arg(cDir));
   }
   else
     slotInfoMessage(this, i18n("1 folder", "%n folders",  dirs));
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp
index c84f5d5..6f5073c 100644
--- a/konq-plugins/fsview/inode.cpp
+++ b/konq-plugins/fsview/inode.cpp
@@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d)
 {
   if (_dirPeer == d) _dirPeer = 0;
 
-  // remove tqchildren
+  // remove children
   clear();
 }
 
@@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f)
 
 
 
-TreeMapItemList* Inode::tqchildren()
+TreeMapItemList* Inode::children()
 {
   if (!_dirPeer) return 0;
 
-  if (!_tqchildren) {
+  if (!_children) {
     if (!_dirPeer->scanStarted()) return 0;
 
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
 
     setSorting(-1);
 
@@ -215,7 +215,7 @@ TreeMapItemList* Inode::tqchildren()
     _resortNeeded = false;
   }
 
-  return _tqchildren;
+  return _children;
 }  
 
 
@@ -325,21 +325,21 @@ TQString Inode::text(int i) const
     double s = size();
 
     if (s < 1000)
-      text = TQString("%1 B").tqarg((int)(s+.5));
+      text = TQString("%1 B").arg((int)(s+.5));
     else if (s < 10 * 1024)
-      text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2));
+      text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2));
     else if (s < 100 * 1024)
-      text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1));
+      text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1));
     else if (s < 1000 * 1024)
-      text = TQString("%1 kB").tqarg((int)(s/1024+.5));
+      text = TQString("%1 kB").arg((int)(s/1024+.5));
     else if (s < 10 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
+      text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2));
     else if (s < 100 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
+      text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1));
     else if (s < 1000 * 1024 * 1024)
-      text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5));
+      text = TQString("%1 MB").arg((int)(s/1024/1024+.5));
     else
-      text =  TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
+      text =  TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2));
 
     if (_sizeEstimation>0) text += "+";
     return text;
@@ -354,10 +354,10 @@ TQString Inode::text(int i) const
 
     if (f>0) {
       while (f>1000) {
-        text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text);
+        text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text);
         f /= 1000;
       }
-      text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text);
+      text = TQString("%1 %2").arg(TQString::number(f)).arg(text);
       if (_fileCountEstimation>0) text += "+";
     }
     return text;
diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h
index d21a689..eb1e3dd 100644
--- a/konq-plugins/fsview/inode.h
+++ b/konq-plugins/fsview/inode.h
@@ -53,7 +53,7 @@ public:
 
   void setPeer(ScanDir*);
 
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
 
   double value() const;
   double size() const;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index bcc5b3e..cab9809 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -756,7 +756,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
   _parent = parent;
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
   setText(0, text1);
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -801,7 +801,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
 
 TreeMapItem::~TreeMapItem()
 {
-  if (_tqchildren) delete _tqchildren;
+  if (_children) delete _children;
   if (_freeRects) delete _freeRects;
 
   // finally, notify widget about deletion
@@ -842,18 +842,18 @@ void TreeMapItem::redraw()
 
 void TreeMapItem::clear()
 {
-  if (_tqchildren) {
+  if (_children) {
     // delete selected items below this item from selection
     if (_widget) _widget->clearSelection(this);
 
-    delete _tqchildren;
-    _tqchildren = 0;
+    delete _children;
+    _children = 0;
   }
 }
 
 
-// invalidates current tqchildren and forces redraw
-// this is only usefull when tqchildren are created on demand in items()
+// invalidates current children and forces redraw
+// this is only usefull when children are created on demand in items()
 void TreeMapItem::refresh()
 {
   clear();
@@ -887,9 +887,9 @@ int TreeMapItem::depth() const
 
 bool TreeMapItem::initialized()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
     return false;
   }
   return true;
@@ -899,16 +899,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
 {
   if (!i) return;
 
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
   i->setParent(this);
 
   if (sorting(0) == -1)
-    _tqchildren->append(i); // preserve insertion order
+    _children->append(i); // preserve insertion order
   else
-    _tqchildren->inSort(i);
+    _children->inSort(i);
 }
 
 
@@ -974,17 +974,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
     _sortAscending = ascending;
     _sortTextNo = textNo;
 
-    if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
+    if (_children && _sortTextNo != -1) _children->sort();
 }
 
 void TreeMapItem::resort(bool recursive)
 {
-  if (!_tqchildren) return;
+  if (!_children) return;
 
-  if (_sortTextNo != -1) _tqchildren->sort();
+  if (_sortTextNo != -1) _children->sort();
 
   if (recursive)
-    for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
+    for (TreeMapItem* i=_children->first(); i; i=_children->next())
       i->resort(recursive);
 }
 
@@ -1002,13 +1002,13 @@ int TreeMapItem::rtti() const
   return 0;
 }
 
-TreeMapItemList* TreeMapItem::tqchildren()
+TreeMapItemList* TreeMapItem::children()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
-  return _tqchildren;
+  return _children;
 }
 
 void TreeMapItem::clearItemRect()
@@ -1252,7 +1252,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
 
 TQString TreeMapWidget::defaultFieldType(int f) const
 {
-  return i18n("Text %1").tqarg(f+1);
+  return i18n("Text %1").arg(f+1);
 }
 
 TQString TreeMapWidget::defaultFieldStop(int) const
@@ -1482,7 +1482,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
   if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
 
   while (1) {
-    TreeMapItemList* list = p->tqchildren();
+    TreeMapItemList* list = p->children();
     if (!list)
       i = 0;
     else {
@@ -1546,12 +1546,12 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
                 (i->itemRect().height() <1))) {
       TreeMapItem* p = i->parent();
       if (!p) break;
-      int idx = p->tqchildren()->findRef(i);
+      int idx = p->children()->findRef(i);
       idx--;
       if (idx<0)
         i = p;
       else
-        i = p->tqchildren()->at(idx);
+        i = p->children()->at(idx);
     }
   }
   return i;
@@ -1745,7 +1745,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
     i2 = i2->parent();
   if (!i2) return changed;
 
-  TreeMapItemList* list = commonParent->tqchildren();
+  TreeMapItemList* list = commonParent->children();
   if (!list) return changed;
 
   TreeMapItem* i = list->first();
@@ -1768,7 +1768,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
 {
   //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
 
-  if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+  if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@@ -1938,12 +1938,12 @@ int nextVisible(TreeMapItem* i)
   TreeMapItem* p = i->parent();
   if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
-  while (idx < (int)p->tqchildren()->count()-1) {
+  while (idx < (int)p->children()->count()-1) {
     idx++;
-    TQRect r = p->tqchildren()->at(idx)->itemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -1956,12 +1956,12 @@ int prevVisible(TreeMapItem* i)
   TreeMapItem* p = i->parent();
   if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
   while (idx > 0) {
     idx--;
-    TQRect r = p->tqchildren()->at(idx)->itemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -2042,24 +2042,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
     int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Right) {
     int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Down) {
-    if (_current->tqchildren() && _current->tqchildren()->count()>0) {
+    if (_current->children() && _current->children()->count()>0) {
       int newIdx = _current->index();
       if (newIdx<0)
-        newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
-      if (newIdx>=(int)_current->tqchildren()->count())
-        newIdx = _current->tqchildren()->count()-1;
-      newItem = visibleItem(_current->tqchildren()->at(newIdx));
+        newIdx = goBack ? (_current->children()->count()-1) : 0;
+      if (newIdx>=(int)_current->children()->count())
+        newIdx = _current->children()->count()-1;
+      newItem = visibleItem(_current->children()->at(newIdx));
       setCurrent(newItem, true);
     }
   }
@@ -2245,12 +2245,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
   TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
                   origRect.width()-2*bw, origRect.height()-2*bw);
 
-  TreeMapItemList* list = item->tqchildren();
+  TreeMapItemList* list = item->children();
   TreeMapItem* i;
 
   bool stopDrawing = false;
 
-  // only subdivide if there are tqchildren
+  // only subdivide if there are children
   if (!list || list->count()==0)
     stopDrawing = true;
 
@@ -2283,7 +2283,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
 
   if (stopDrawing) {
     if (list) {
-      // tqinvalidate rects
+      // invalidate rects
       for (i=list->first();i;i=list->next())
         i->clearItemRect();
     }
@@ -2399,7 +2399,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
     }
 
-    // set selfRect (not occupied by tqchildren) for tooltip
+    // set selfRect (not occupied by children) for tooltip
     item->addFreeRect(sr);
 
     if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@@ -2537,7 +2537,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
 {
   p->setBrush(TQt::Dense4Pattern);
@@ -2546,7 +2546,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
   i->addFreeRect(r);
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
                              TreeMapItemListIterator it, int len, bool goBack)
 {
@@ -2845,10 +2845,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
   popup->insertItem(i18n("Border"), bpopup, id+1);
   bpopup->insertItem(i18n("Correct Borders Only"), id+2);
   bpopup->insertSeparator();
-  bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
-  bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
-  bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
-  bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
+  bpopup->insertItem(i18n("Width %1").arg(0), id+3);
+  bpopup->insertItem(i18n("Width %1").arg(1), id+4);
+  bpopup->insertItem(i18n("Width %1").arg(2), id+5);
+  bpopup->insertItem(i18n("Width %1").arg(3), id+6);
   bpopup->setItemChecked(id+2, skipIncorrectBorder());
   bpopup->setItemChecked(id+3, borderWidth()==0);
   bpopup->setItemChecked(id+4, borderWidth()==1);
@@ -2955,7 +2955,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
   connect(popup, TQT_SIGNAL(activated(int)),
           this, TQT_SLOT(fieldStopActivated(int)));
 
-  popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
+  popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
   popup->setItemChecked(id, fieldStop(0).isEmpty());
   _menuItem = i;
   bool foundFieldStop = false;
@@ -3014,7 +3014,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     int area = i->width() * i->height();
     popup->insertSeparator();
     popup->insertItem(i18n("Area of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(area), id+1);
+                       .arg(i->text(0)).arg(area), id+1);
     if (area == minimalArea()) {
       popup->setItemChecked(id+1, true);
       foundArea = true;
@@ -3040,9 +3040,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     }
 
     popup->insertItem(i18n("Double Area Limit (to %1)")
-                       .tqarg(minimalArea()*2), id+5);
+                       .arg(minimalArea()*2), id+5);
     popup->insertItem(i18n("Halve Area Limit (to %1)")
-                       .tqarg(minimalArea()/2), id+6);
+                       .arg(minimalArea()/2), id+6);
   }
 }
 
@@ -3079,7 +3079,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
     int d = i->depth();
     popup->insertSeparator();
     popup->insertItem(i18n("Depth of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(d), id+1);
+                       .arg(i->text(0)).arg(d), id+1);
     if (d == maxDrawingDepth()) {
       popup->setItemChecked(id+1, true);
       foundDepth = true;
@@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   popup->insertSeparator();
   int depth = 2, count;
   for (count=0;count<3;count++) {
-    popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count);
+    popup->insertItem(i18n("Depth %1").arg(depth), id+4+count);
     if (depth == maxDrawingDepth()) {
       popup->setItemChecked(id+4+count, true);
       foundDepth = true;
@@ -3100,14 +3100,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   if (maxDrawingDepth()>1) {
     popup->insertSeparator();
     if (!foundDepth) {
-      popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
+      popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
       popup->setItemChecked(id+10, true);
     }
 
     popup->insertItem(i18n("Decrement (to %1)")
-                       .tqarg(maxDrawingDepth()-1), id+2);
+                       .arg(maxDrawingDepth()-1), id+2);
     popup->insertItem(i18n("Increment (to %1)")
-                       .tqarg(maxDrawingDepth()+1), id+3);
+                       .arg(maxDrawingDepth()+1), id+3);
   }
 }
 
@@ -3130,13 +3130,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
   int f, fCount = _attr.size();
   config->writeEntry(prefix+"FieldCount", fCount);
   for (f=0;f<fCount;f++) {
-    config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
                        _attr[f].visible);
-    config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
                        _attr[f].forced);
-    config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
                        _attr[f].stop);
-    config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
                        fieldPositionString(f));
   }
 }
@@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
 
   int f;
   for (f=0;f<num;f++) {
-    str = TQString(prefix+"FieldVisible%1").tqarg(f);
+    str = TQString(prefix+"FieldVisible%1").arg(f);
     if (config->hasKey(str))
       setFieldVisible(f, config->readBoolEntry(str));
 
-    str = TQString(prefix+"FieldForced%1").tqarg(f);
+    str = TQString(prefix+"FieldForced%1").arg(f);
     if (config->hasKey(str))
       setFieldForced(f, config->readBoolEntry(str));
 
-    str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
     setFieldStop(f, str);
 
-    str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
     if (!str.isEmpty()) setFieldPosition(f, str);
   }
 }
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 6cb5edd..31ac9d3 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -215,7 +215,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
  *
  * If you want more flexibility, reimplement TreeMapItem and
  * override the corresponding methods. For dynamic creation of child
- * items on demand, reimplement tqchildren().
+ * items on demand, reimplement children().
  */
 class TreeMapItem: public StoredDrawParams
 {
@@ -250,7 +250,7 @@ public:
   // force a redraw of this item
   void redraw();
 
-  // delete all tqchildren
+  // delete all children
   void clear();
 
   // force new child generation & refresh
@@ -343,7 +343,7 @@ public:
    * For value() sorting, use <textNo> = -2
    *
    * For fast sorting, set this to -1 before child insertions and call
-   * again after inserting all tqchildren.
+   * again after inserting all children.
    */
   void setSorting(int textNo, bool ascending = true);
 
@@ -351,18 +351,18 @@ public:
    * Resort according to the already set sorting.
    *
    * This has to be done if the sorting base changes (e.g. text or values
-   * change). If this is only true for the tqchildren of this item, you can
+   * change). If this is only true for the children of this item, you can
    * set the recursive parameter to false.
    */
   void resort(bool recursive = true);
 
   virtual SplitMode splitMode() const;
   virtual int rtti() const;
-  // not const as this can create tqchildren on demand
-  virtual TreeMapItemList* tqchildren();
+  // not const as this can create children on demand
+  virtual TreeMapItemList* children();
 
 protected:
-  TreeMapItemList* _tqchildren;
+  TreeMapItemList* _children;
   double _sum, _value;
 
 private:
@@ -436,7 +436,7 @@ public:
   /**
    * Selects or unselects an item.
    * In multiselection mode, the constrain that a selected item
-   * has no selected tqchildren or parents stays true.
+   * has no selected children or parents stays true.
    */
   void setSelected(TreeMapItem*, bool selected = true);
 
@@ -452,7 +452,7 @@ public:
   void setMarked(int markNo = 1, bool redraw = true);
 
   /**
-   * Clear selection of all selected items which are tqchildren of
+   * Clear selection of all selected items which are children of
    * parent. When parent == 0, clears whole selection
    * Returns true if selection changed.
    */
@@ -464,7 +464,7 @@ public:
    * Range means for a hierarchical widget:
    * - select/unselect i1 and i2 according selected
    * - search common parent of i1 and i2, and select/unselect the
-   *   range of direct tqchildren between but excluding the child
+   *   range of direct children between but excluding the child
    *   leading to i1 and the child leading to i2.
    */
   void setRangeSelection(TreeMapItem* i1,
@@ -517,7 +517,7 @@ public:
   void setVisibleWidth(int width, bool reuseSpace = false);
 
   /**
-   * If a tqchildren value() is almost the parents sum(),
+   * If a children 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
    * parent/child size relation can not be mapped to a correct
@@ -629,7 +629,7 @@ public:
   virtual TQString tipString(TreeMapItem* i) const;
 
   /**
-   * Redraws an item with all tqchildren.
+   * Redraws an item with all children.
    * This takes changed values(), sums(), colors() and text() into account.
    */
   void redraw(TreeMapItem*);
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 671b90e..d5fe29a 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -60,7 +60,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
 
 void KIGPDialog::slotDefault()
 {
-    m_title->setText(i18n("Image Gallery for %1").tqarg(m_path));
+    m_title->setText(i18n("Image Gallery for %1").arg(m_path));
     m_imagesPerRow->setValue(4);
     m_imageName->setChecked(true);
     m_imageSize->setChecked(false);
@@ -96,7 +96,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
     label = new TQLabel( i18n("&Page title:"), page);
     vlay->addWidget(label);
 
-    m_title = new TQLineEdit(i18n("Image Gallery for %1").tqarg(path), page);
+    m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page);
     vlay->addWidget( m_title );
     label->setBuddy(m_title);
 
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index bae46bf..47dbff1 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -105,7 +105,7 @@ bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir,
     if (!thumb_dir.exists()) {
         thumb_dir.setPath( imgGalleryDir);
         if (!(thumb_dir.mkdir(dirName, false))) {
-            KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").tqarg(thumb_dir.path()));
+            KMessageBox::sorry(m_part->widget(), i18n("Couldn't create folder: %1").arg(thumb_dir.path()));
             return false;
         } else {
             thumb_dir.setPath( imgGalleryDir + "/" + dirName + "/" );
@@ -166,8 +166,8 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
     const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
 
     stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl;
-    stream << i18n("<i>Number of images</i>: %1").tqarg(numOfImages) << "<br/>" << endl;
-    stream << i18n("<i>Created on</i>: %1").tqarg(today) << "</p>" << endl;
+    stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl;
+    stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl;
 
     stream << "<hr/>" << endl;
 
@@ -205,10 +205,10 @@ void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDi
                 const TQString imgPath("thumbs/" + imgName + extension(imageFormat));
                 stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" ";
                 stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>";
-                m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").tqarg(imgName) );
+                m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) );
             } else {
                 kdDebug(90170) << "Creating thumbnail for " << imgName << " failed" << endl;
-                m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").tqarg(imgName) );
+                m_progressDlg->setLabelText( i18n("Creating thumbnail for: \n%1\n failed").arg(imgName) );
             }
             stream << "</a>" << endl;
 
@@ -266,7 +266,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
             if (!subDir.exists()) {
                 subDir.setPath( url.directory() );
                 if (!(subDir.mkdir(currentDir, false))) {
-                    KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").tqarg(subDir.path()));
+                    KMessageBox::sorry(part->widget(), i18n("Couldn't create folder: %1").arg(subDir.path()));
                     continue;
                 } else {
                     subDir.setPath( url.directory() + "/" + currentDir );
@@ -320,7 +320,7 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName
         return !m_cancelled;
 
     } else {
-        KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").tqarg(url.path(+1)));
+        KMessageBox::sorry(m_part->widget(),i18n("Couldn't open file: %1").arg(url.path(+1)));
         return false;
     }
 }
@@ -415,7 +415,7 @@ void KImGalleryPlugin::loadCommentFile()
         kdDebug(90170) << "File closed." << endl;
         delete m_textStream;
     } else {
-        KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").tqarg(m_configDlg->getCommentFile()));
+        KMessageBox::sorry(m_part->widget(), i18n("Couldn't open file: %1").arg(m_configDlg->getCommentFile()));
         m_useCommentFile = false;
     }
 }
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index b9fa89d..030ac98 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -42,11 +42,11 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
       src( _src ),
       action( 0 )
 {
-    tqchildren.setAutoDelete( true );
+    children.setAutoDelete( true );
     initIconMap( );
     connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) );
     connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) );
-    tqchildren.clear(); // just in case
+    children.clear(); // just in case
 
     TQFileInfo fileInfo(path);
     if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
@@ -55,7 +55,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
 KDirMenu::~KDirMenu( ) {
     delete action;
     clear( );
-    tqchildren.clear( );
+    children.clear( );
 }
 void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
     static const TQIconSet folder = SmallIconSet("folder");
@@ -80,7 +80,7 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
     }
     else
         insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
-    tqchildren.append( submenu );
+    children.append( submenu );
     connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)),
             this, TQT_SLOT(slotFileSelected(const TQString &)));
 }
diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h
index 979fdf6..f4bd6bf 100644
--- a/konq-plugins/kuick/kdirmenu.h
+++ b/konq-plugins/kuick/kdirmenu.h
@@ -48,7 +48,7 @@ private:
     TQString name;
     KURL src;
     KAction *action;
-    TQPtrList<KDirMenu> tqchildren;
+    TQPtrList<KDirMenu> children;
     void initIconMap( );
 public slots:
     void slotAboutToShow( );
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 7b2d61b..53c1e37 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -394,7 +394,7 @@ void RelLinksPlugin::guessRelations()
 
 		TQString href=rx.cap(1)+ nval_str + rx.cap(3);
 		KURL ref( m_part->url(), href );
-		TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
+		TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
 		DOM::Element e= m_part->document().createElement("link");
 		e.setAttribute("href",href);
 		element_map["next"][0] = e;
@@ -408,7 +408,7 @@ void RelLinksPlugin::guessRelations()
 				nval_str.prepend(zeros.left(lenval-nval_str.length()));
 			TQString href=rx.cap(1)+ nval_str + rx.cap(3);
 			KURL ref( m_part->url(), href );
-			TQString title = i18n("[Autodetected] %1").tqarg(ref.prettyURL());
+			TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL());
 			e= m_part->document().createElement("link");
 			e.setAttribute("href",href);
 			element_map["prev"][0] = e;
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index d099e7e..4da4d30 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -273,7 +273,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
 		TQStringList list;
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
-		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
+		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
                 if (service) {
 		    const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
 		    data.setData( searchProviderPrefix + search );
@@ -329,7 +329,7 @@ void SearchBarPlugin::setIcon()
 		TQStringList list;
 		list << "kurisearchfilter" << "kuriikwsfilter";
 
-		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(m_currentEngine));
+		service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine));
                 if (service) {
 		    const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter();
 		    data.setData( searchProviderPrefix + "some keyword" );
@@ -353,7 +353,7 @@ void SearchBarPlugin::setIcon()
 			m_searchIcon = SmallIcon("google");
 			providername = "Google";
 		}
-		hinttext = i18n("%1 Search").tqarg(providername);;
+		hinttext = i18n("%1 Search").arg(providername);;
 	}
 	static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext);
 
@@ -389,7 +389,7 @@ void SearchBarPlugin::showSelectionMenu()
 		for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it )
 		{
 			i++;
-			service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(*it));
+			service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it));
 			if(!service)
 			{
 				continue;
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 3f3b03a..612be03 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -302,7 +302,7 @@ void MainWidget::slotRenameTag()
     if ( tag )
     {
         TQString oldName = tag->name();
-        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) );
+        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) );
         if ( !newName.isEmpty() )
         {
             KURL url( "http://del.icio.us/api/tags/rename" );
@@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark()
     BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() );
     if ( bookmark )
     {
-        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ),
+        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ),
                                                          i18n( "Delete Bookmark" ), KStdGuiItem::del() );
 
         if ( result == KMessageBox::Continue )
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index e6c594c..b199b58 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -156,7 +156,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         KDesktopFile desktop(url.path(), TRUE);
         
         if(desktop.hasApplicationType ()){                    
-          MetabarWidget::addEntry(innerHTML, i18n("Run %1").tqarg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
+          MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon());
           
           m_functions->show("open");
         }
@@ -364,12 +364,12 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix)
   buffer.open(IO_WriteOnly);
   pix.save(&buffer, "PNG");
   
-  TQString src = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());  
+  TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());  
   bool media = item->mimetype().startsWith("video/");
 
   DOM::DOMString innerHTML;
   
-  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").tqarg(pix.height() + 15);
+  innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15);
   
   if(media){
     innerHTML += " href=\"preview:///\"";
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index f7bc152..1aaf9e8 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -81,7 +81,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList tqchildren = node.childNodes();
+    DOM::NodeList children = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
       }
     }
     else{
-      style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
     }
   }
 }
@@ -117,7 +117,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
   DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item));
   
   if(!node.isNull()){
-    DOM::NodeList tqchildren = node.childNodes();
+    DOM::NodeList children = node.childNodes();
     DOM::CSSStyleDeclaration style = node.style();
     DOM::DOMString expanded = node.getAttribute("expanded");
     
@@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
         }
       }
       else{
-        style.setProperty("height", TQString("%1px").tqarg(height), CSS_PRIORITY);
+        style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY);
       }
     }
   }
@@ -176,7 +176,7 @@ void MetabarFunctions::animate()
       }
       
       int change = currentHeight < height ? changeValue : -changeValue;
-      style.setProperty("height", TQString("%1px").tqarg(currentHeight + change), CSS_PRIORITY);
+      style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY);
       doc.updateRendering();
     }
   }
@@ -209,9 +209,9 @@ void MetabarFunctions::hide(DOM::DOMString item)
 int MetabarFunctions::getHeight(DOM::HTMLElement &element)
 {
   int height = 0;
-  DOM::NodeList tqchildren = element.childNodes();
-  for(uint i = 0; i < tqchildren.length(); i++){
-    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(tqchildren.item(i));
+  DOM::NodeList children = element.childNodes();
+  for(uint i = 0; i < children.length(); i++){
+    DOM::HTMLElement node = static_cast<DOM::HTMLElement>(children.item(i));
     DOM::CSSStyleDeclaration style = node.style();
     
     DOM::DOMString css_height = style.getPropertyValue("height");
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 700cb74..05ce39a 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -118,7 +118,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   tqlayout->addWidget(html->view());
   
   popup = new KPopupMenu(0);
-  KAction *configAction = new KAction(i18n("Configure %1...").tqarg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+  KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
   configAction->plug(popup);
   
   KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
@@ -289,7 +289,7 @@ void MetabarWidget::loadCompleted()
       if(node.hasAttribute("image")){
         TQString icon = node.getAttribute("image").string();
         TQString url = getIconPath(icon);
-        TQString style = TQString("background-image: url(%1);").tqarg(url);
+        TQString style = TQString("background-image: url(%1);").arg(url);
         
         node.setAttribute("style", style);
       }
@@ -308,7 +308,7 @@ void MetabarWidget::loadCompleted()
   }
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/default.css").tqarg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default")));
   if(file.isNull()){
     file = locate("data", TQString("metabar/themes/default/default.css"));
   }
@@ -393,7 +393,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
         skip = true; //needed to prevent some weired reload
       
         DOM::DOMString innerHTML;
-        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").tqarg(image.width(), image.height());
+        innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
         innerHTML += "<object class=\"preview\" type=\"";
         innerHTML += item->mimetype();
         innerHTML += "\" data=\"";
@@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
     
     if(element.id().string().startsWith("hidden")){
-      TQString style = TQString("background-image: url(%1);").tqarg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
+      TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow"));
       element.setInnerText( showMore ? i18n("More") : i18n("Less") );
       element.setAttribute("style", style);
     }
@@ -475,7 +475,7 @@ TQString MetabarWidget::getIconPath(const TQString &name)
   buffer.open(IO_WriteOnly);
   icon.save(&buffer, "PNG");
   
-  return TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+  return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
 }
 
 void MetabarWidget::slotShowSharingDialog()
@@ -584,7 +584,7 @@ void MetabarWidget::setTheme()
   loadComplete = false;
 
   config->setGroup("General");
-  TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").tqarg(config->readEntry("Theme", "default")));
+  TQString file = locate("data", TQString("metabar/themes/%1/tqlayout.html").arg(config->readEntry("Theme", "default")));
   
   html->openURL(KURL(file));
 }
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 1779b37..8daf5ba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -71,7 +71,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
     TQBuffer buffer(data);
     buffer.open(IO_WriteOnly);
     pix.save(&buffer, "PNG");
-    TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").tqarg(KCodecs::base64Encode(data).data());
+    TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data).data());
     
     icon.setSrc(icondata);
   }
@@ -81,7 +81,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
       name.setInnerText(m_items.getFirst()->name());
     }
     else{
-      name.setInnerText(i18n("%1 Elements").tqarg(m_items.count()));
+      name.setInnerText(i18n("%1 Elements").arg(m_items.count()));
     }
   }
   
@@ -105,7 +105,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
         }
       }
 
-      type.setInnerText(i18n("%1 Folders, %2 Files").tqarg(dirs).tqarg(files));
+      type.setInnerText(i18n("%1 Folders, %2 Files").arg(dirs).arg(files));
     }
 
     
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index dbafc59..a9efc26 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -135,21 +135,21 @@ void UAChangerPlugin::parseDescFiles()
       continue; // Ignore dups!
 
     m_lstIdentity << tmp;
-    tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-SYSNAME")).tqarg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
+    tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE"));
 
     if ( tmp.stripWhiteSpace().isEmpty() )
     {
       if(tag == "NN" || tag == "IE" || tag == "MOZ")
-         tmp = i18n("Version %1").tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+         tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION"));
       else
-         tmp = TQString("%1 %2").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION"));
+         tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION"));
     }
     else
     {
       if(tag == "NN" || tag == "IE" || tag == "MOZ")
-         tmp = i18n("Version %1 on %2").tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+         tmp = i18n("Version %1 on %2").arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
       else
-        tmp = i18n("%1 %2 on %3").tqarg(UA_PTOS("X-KDE-UA-NAME")).tqarg(UA_PTOS("X-KDE-UA-VERSION")).tqarg(tmp);
+        tmp = i18n("%1 %2 on %3").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")).arg(tmp);
     }
 
     m_lstAlias << tmp;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index fe61ae3..f669308 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -184,7 +184,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
           	i18n("<qt>The selected URL cannot be verified because it contains "
           	     "a password. Sending this URL to <b>%1</b> would put the security "
           	     "of <b>%2</b> at risk.</qt>")
-          	     .tqarg(validatorUrl.host()).tqarg(partUrl.host()));
+          	     .arg(validatorUrl.host()).arg(partUrl.host()));
           return;
         }
       // Set entered URL as a parameter
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index b72ca42..24b49b8 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -88,7 +88,7 @@ void ArchiveDialog::archive()
 
    } else {
      const TQString title = i18n( "Unable to Open Web-Archive" );
-     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).tqarg(m_tarBall->fileName());
+     const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
      KMessageBox::sorry( 0L, text, title );
    }
 }
@@ -207,7 +207,7 @@ static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
    }
    catch (...)
    {
-     // No tqchildren, stop recursion here
+     // No children, stop recursion here
      child = DOM::Node();
    }
 
@@ -346,7 +346,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
    }
    catch (...)
    {
-     // No tqchildren, stop recursion here
+     // No children, stop recursion here
      child = DOM::Node();
    }
 
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 85d43ee..c76f56c 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -94,7 +94,7 @@ void PluginWebArchiver::slotSaveToArchive()
 
   if (!(url.isValid())) {
     const TQString title = i18n( "Invalid URL" );
-    const TQString text = i18n( "The URL\n%1\nis not valid." ).tqarg(url.prettyURL());
+    const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
     KMessageBox::sorry(part->widget(), text, title );
     return;
   }
@@ -102,7 +102,7 @@ void PluginWebArchiver::slotSaveToArchive()
   const TQFile file(url.path());
   if (file.exists()) {
     const TQString title = i18n( "File Exists" );
-    const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).tqarg(url.prettyURL());
+    const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
     if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
       return;
     }
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 4d6938b..1cc7ca1 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -91,8 +91,8 @@ void KSig::setupLayout()
     sigEdit->setEnabled(false);
     sigEdit->setCheckSpellingEnabled(true);
 
-    statusBar()->insertItem(i18n(" Line: %1 ").tqarg(0), LineNumber, 0, true);
-    statusBar()->insertItem(i18n(" Col: %1 ").tqarg(0), ColumnNumber, 0, true);
+    statusBar()->insertItem(i18n(" Line: %1 ").arg(0), LineNumber, 0, true);
+    statusBar()->insertItem(i18n(" Col: %1 ").arg(0), ColumnNumber, 0, true);
     statusBar()->show();
     
     updateListLock = false;
@@ -261,8 +261,8 @@ void KSig::updateEdit()
 
 void KSig::updateStatus(int line, int column)
 {
-    statusBar()->changeItem(i18n(" Line: %1 ").tqarg(line + 1), LineNumber);
-    statusBar()->changeItem(i18n(" Col: %1 ").tqarg(column + 1), ColumnNumber);
+    statusBar()->changeItem(i18n(" Line: %1 ").arg(line + 1), LineNumber);
+    statusBar()->changeItem(i18n(" Col: %1 ").arg(column + 1), ColumnNumber);
 }
 
 void KSig::quit()
diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp
index 7f6d12f..0442c2e 100644
--- a/ksig/siglistviewitem.cpp
+++ b/ksig/siglistviewitem.cpp
@@ -56,14 +56,14 @@ void SigListViewItem::refreshText()
 
 void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s)
 {
-    TQDomNodeList tqchildren = n.childNodes();
+    TQDomNodeList children = n.childNodes();
 
-    for(uint i = 0; i < tqchildren.count(); i++) {
-	if(tqchildren.item(i).isText())
-	    s.append(tqchildren.item(i).toText().data());
+    for(uint i = 0; i < children.count(); i++) {
+	if(children.item(i).isText())
+	    s.append(children.item(i).toText().data());
 	else {
-	    nodeToText(tqchildren.item(i), s);
-	    if(tqchildren.item(i).isElement() && tqchildren.item(i).toElement().tagName() == "p") {
+	    nodeToText(children.item(i), s);
+	    if(children.item(i).isElement() && children.item(i).toElement().tagName() == "p") {
 		s.append("\n");
 	    }
 	}
@@ -90,12 +90,12 @@ SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQD
 void SigListViewItem::render()
 {
     if(dirty) {
-	TQDomNodeList tqchildren = element.childNodes();
+	TQDomNodeList children = element.childNodes();
 
 	while(!element.firstChild().isNull()) 
 	    element.removeChild(element.firstChild());
 
-	// create new tqchildren
+	// create new children
 	TQStringList lines = TQStringList::split("\n", elementText, true);
 	
 	for(TQStringList::Iterator it = lines.begin(); it != lines.end(); it++) {
diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp
index 862eb0c..72b6d9d 100644
--- a/noatun-plugins/alarm/kminutespinbox.cpp
+++ b/noatun-plugins/alarm/kminutespinbox.cpp
@@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name)
 TQString KMinuteSpinBox::mapValueToText(int v)
 {
 	if(v < 10)
-		return TQString("0%1").tqarg(v);
+		return TQString("0%1").arg(v);
 	else
 		return TQString::number(v);
 }
diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index b602d5e..3280242 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -574,7 +574,7 @@
                     <property name="text">
                         <string>Speed:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -1924,7 +1924,7 @@
                     <property name="text">
                         <string>Volume:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index ed5d576..9e13f12 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
 void AlsaPlayer::slotVolumeChanged(int i)
 {
 	TQString text("%1%");
-	volumeLabel->setText(text.tqarg(i));
+	volumeLabel->setText(text.arg(i));
 	volumeSlider->setValue(i);
 }
 
@@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
 	speed_ = newSpeed;
 
 	pauseButton->setEnabled(0 != speed_);
-	speedLabel->setText(TQString("%1%").tqarg(speed_));
+	speedLabel->setText(TQString("%1%").arg(speed_));
 
 	Arts::PlayObject playobject(napp->player()->engine()->playObject());
 	Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);
diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp
index 6b10732..42b375a 100644
--- a/noatun-plugins/blurscope/scopedisplayer.cpp
+++ b/noatun-plugins/blurscope/scopedisplayer.cpp
@@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false)
 			d++;
 			x++;
 		}
-		tqrepaint();
+		repaint();
 	}
 }
 
@@ -233,7 +233,7 @@ void SDLView::checkInput()
 
 #define output2 ((unsigned char*)outputBmp.data)
 
-void SDLView::tqrepaint()
+void SDLView::repaint()
 {
 	SDL_LockSurface(surface);
 	TEST();
diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h
index 73e6d6d..45c734c 100644
--- a/noatun-plugins/blurscope/sdlscope.h
+++ b/noatun-plugins/blurscope/sdlscope.h
@@ -94,7 +94,7 @@ protected:
 	void checkInput();
 	void setupPalette(double dummy=0.0);
 
-	void tqrepaint();
+	void repaint();
 
 private:
 	int mFd;
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 8e67516..542b527 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged()
 
 void Charlatan::slotVolumeChanged(int i)
 {
-	TQString message(i18n("Volume: %1").tqarg(i));
+	TQString message(i18n("Volume: %1").arg(i));
 
 	showingVolumeTimer_->start(2000, true);
 	titleLabel_->setText(message);
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 046ba17..5322ae6 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first()
   if (first)
     set_file(&first_file, first);
   else {
-    if (first_file) {		// tqinvalidate first
+    if (first_file) {		// invalidate first
       delete first_file;
       first_file = 0;
     }
@@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder()
   }
   else {
     TQString subdir = *top->current_subdir;
-    kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl;
+    kdDebug(90010) << "we have children, pushing now " << subdir << endl;
     push_dir(subdir, false); // push directory w/ backward iterators
   }
 }
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 606a569..3891642 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -122,7 +122,7 @@ void Lyrics::loadedURL()
   if ( !napp->player()->current() )
     return;
   statusBar()->changeItem(i18n("Loaded"), 0);
-  setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title")));
+  setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title")));
   if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) {
     kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl;
     napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
@@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index)
     pos = props_regexp.search(url);
   }
 	TQString title(napp->player()->current().property("title"));
-  setCaption(i18n("Loading Lyrics for %1").tqarg(title));
+  setCaption(i18n("Loading Lyrics for %1").arg(title));
 	// Check if we have a music playing
 	if (napp->player()->current()) {
   	htmlpart->begin();
@@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index)
       "<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>"
-    "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) );
+    "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) );
     KURL _url;
     /* Check if we should use the store url or the query one */
     if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
@@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index)
       attach_act->setChecked(false);
       site_act->setEnabled(true);
       actionCollection()->action("search_label")->setEnabled(true);
-      htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+      htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) );
     } else {
       _url = napp->player()->current().property("Lyrics::URL");
       _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
@@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index)
       attach_act->setChecked(true);
       site_act->setEnabled(false);
       actionCollection()->action("search_label")->setEnabled(false);
-      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
+      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) );
     }
     htmlpart->write( "</BODY></HTML>" );
     htmlpart->end();
diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h
index bbe3bf3..3d16762 100644
--- a/noatun-plugins/nexscope/nex.h
+++ b/noatun-plugins/nexscope/nex.h
@@ -20,8 +20,8 @@ typedef uint8_t Byte;
 
 #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b))
 #define COLORSTR(pixel) \
-	TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \
-		.tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16))
+	TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \
+		.arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16))
 
 #define STRCOLOR(pixel) \
 	Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index a43f0a2..8267865 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 			connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox);
-			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent"));
+			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
 			connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index d53437e..34ebe72 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 					group->setOption(QueryGroup::Playable, true);
 				else if (e.tagName().lower() == "playable")
 					group->setOption(QueryGroup::Playable, true);
-				else if (e.tagName().lower() == "tqchildrenvisible")
+				else if (e.tagName().lower() == "childrenvisible")
 					group->setOption(QueryGroup::ChildrenVisible, true);
 				else if (e.tagName().lower() == "autoopen")
 					group->setOption(QueryGroup::AutoOpen, true);
@@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
 		if (group->option(QueryGroup::Playable))
 			childe.appendChild(doc.createElement("playable"));
 		if (group->option(QueryGroup::ChildrenVisible))
-			childe.appendChild(doc.createElement("tqchildrenvisible"));
+			childe.appendChild(doc.createElement("childrenvisible"));
 		if (group->option(QueryGroup::AutoOpen))
 			childe.appendChild(doc.createElement("autoopen"));
 	}
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 7f3415c..0087b99 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
 		tree()->mPlayableItemCount--;
 	}
 
-	// I have to remove my tqchildren, because they need their parent
+	// I have to remove my children, because they need their parent
 	// in tact for the below code
 	while (TreeItem *c = firstChild())
 		delete c;
@@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree
 
 TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf)
 {
-	// search childOf's immediate tqchildren
-	TreeItem *tqchildren;
+	// search childOf's immediate children
+	TreeItem *children;
 	if (childOf)
-		tqchildren = childOf->firstChild();
+		children = childOf->firstChild();
 	else
-		tqchildren = firstChild();
+		children = firstChild();
 
 	TQString presentation = group->presentation(file);
-	while (tqchildren)
+	while (children)
 	{
 		// merging would be done here
 		bool matches=false;
 		if (group->fuzzyness(QueryGroup::Case))
 		{
-			matches = (tqchildren->text(0).lower() == presentation.lower());
+			matches = (children->text(0).lower() == presentation.lower());
 		}
 		else
 		{
-			matches = (tqchildren->text(0) == presentation);
+			matches = (children->text(0) == presentation);
 		}
 
-		matches = matches && !tqchildren->group()->option(QueryGroup::Playable);
+		matches = matches && !children->group()->option(QueryGroup::Playable);
 
 		if (matches)
 		{
-			tqchildren->setFile(File());
-			return tqchildren;
+			children->setFile(File());
+			return children;
 		}
 
-		tqchildren = tqchildren->nextSibling();
+		children = children->nextSibling();
 	}
 
 	TreeItem *item;
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index c8e545e..4e5ca83 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -182,7 +182,7 @@ private:
 	TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
 
 	/**
-	 * remove the siblings and tqchildren of the treeitem
+	 * remove the siblings and children of the treeitem
 	 **/
 	void remove(TreeItem *, const File &file);
 
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index aa7a79b..073873c 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -138,7 +138,7 @@ View::~View()
 		int slice = tree->slice()->id();
 		TQString query = tree->fileOfQuery();
 
-		TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
+		TQString t = TQString("%1:%2").arg(slice).arg(query);
 		tabids.append(t);
 	}
 	
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index 81c64e3..68cdbe9 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -68,7 +68,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp
index 5aeeb49..8f51eb9 100644
--- a/renamedlgplugins/audio/audio_plugin.cpp
+++ b/renamedlgplugins/audio/audio_plugin.cpp
@@ -73,11 +73,11 @@ bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, co
    TQString sentence1;
    TQString dest = KURL::fromPathOrURL(_dest).pathOrURL();
    if (mtimeDest < mtimeSrc)
-      sentence1 = i18n("An older file named '%1' already exists.\n").tqarg(dest);
+      sentence1 = i18n("An older file named '%1' already exists.\n").arg(dest);
    else if (mtimeDest == mtimeSrc)
-      sentence1 = i18n("A similar file named '%1' already exists.\n").tqarg(dest);
+      sentence1 = i18n("A similar file named '%1' already exists.\n").arg(dest);
    else
-      sentence1 = i18n("A newer file named '%1' already exists.\n").tqarg(dest);
+      sentence1 = i18n("A newer file named '%1' already exists.\n").arg(dest);
    label_head->setText(sentence1);
    label_src->setText(i18n("Source File"));
    label_dst->setText(i18n("Existing File"));
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index 94b36f3..4f2936a 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -89,27 +89,27 @@ void AudioPreview::initView( const TQString& mimeType )
       KSqueezedTextLabel *sl;
 
       sl = new KSqueezedTextLabel(this);
-      sl->setText(i18n("Artist: %1\n").tqarg(info.item("Artist").value().toString()));
+      sl->setText(i18n("Artist: %1\n").arg(info.item("Artist").value().toString()));
 
       sl = new KSqueezedTextLabel(this);
-      sl->setText(i18n("Title: %1\n").tqarg(info.item("Title").value().toString()));
+      sl->setText(i18n("Title: %1\n").arg(info.item("Title").value().toString()));
 
       sl = new KSqueezedTextLabel(this);
-      sl->setText(i18n("Comment: %1\n").tqarg(info.item("Comment").value().toString()));
+      sl->setText(i18n("Comment: %1\n").arg(info.item("Comment").value().toString()));
 
-      desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").tqarg( info.item("Bitrate").value().toString() ).tqarg( info.item("Bitrate").suffix() ));
+      desc.append(i18n("Biterate: 160 kbits/s", "Bitrate: %1 %2\n").arg( info.item("Bitrate").value().toString() ).arg( info.item("Bitrate").suffix() ));
     }
-    desc.append(i18n("Sample rate: %1 %2\n").tqarg( info.item("Sample Rate").value().toString() ).tqarg( info.item("Sample Rate").suffix() ));
+    desc.append(i18n("Sample rate: %1 %2\n").arg( info.item("Sample Rate").value().toString() ).arg( info.item("Sample Rate").suffix() ));
     desc.append(i18n("Length: "));
 
     /* Calculate length in mm:ss format */
     int length = info.item("Length").value().toInt();
     if (length/60 < 10)
       desc.append("0");
-    desc.append(TQString("%1:").tqarg(length/60, 0, 10));
+    desc.append(TQString("%1:").arg(length/60, 0, 10));
     if (length%60 < 10)
       desc.append("0");
-    desc.append(TQString("%1\n").tqarg(length%60, 0, 10));
+    desc.append(TQString("%1\n").arg(length%60, 0, 10));
   }
  
   description = new TQLabel(this);
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index 684fefb..009eb8b 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -64,8 +64,8 @@ void ImageVisualizer::loadImage( const TQString& path )
   pic->adjustSize(); 
 
   TQString desc;
-  desc.append(i18n("The color depth of an image", "Depth: %1\n").tqarg( img.depth() ));
-  desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").tqarg(img.width()).tqarg(img.height() ));
+  desc.append(i18n("The color depth of an image", "Depth: %1\n").arg( img.depth() ));
+  desc.append(i18n("The dimensions of an image", "Dimensions: %1x%1").arg(img.width()).arg(img.height() ));
   description->setText(desc );
   description->adjustSize();
 }