diff --git a/src/helpers/stringhelper.h b/src/helpers/stringhelper.h
index 80ad576..e8802db 100644
--- a/src/helpers/stringhelper.h
+++ b/src/helpers/stringhelper.h
@@ -57,7 +57,7 @@ public:
             }
             v /= 1024.0;
         }
-        return TQString("%1 %2Byte").tqarg(v,0,'f',pre?2:0).tqarg(pre?TQString(TQChar(pre)):TQString(""));
+        return TQString("%1 %2Byte").arg(v,0,'f',pre?2:0).arg(pre?TQString(TQChar(pre)):TQString(""));
     }
 };
 
diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp
index f08dc18..16ff6e4 100644
--- a/src/kiosvn/kiolistener.cpp
+++ b/src/kiosvn/kiolistener.cpp
@@ -116,9 +116,9 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
         case svn_wc_notify_add:
         {
             if (mime_type && (svn_mime_type_is_binary (mime_type)))
-                userstring = i18n( "A (bin) %1" ).tqarg( path );
+                userstring = i18n( "A (bin) %1" ).arg( path );
             else
-                userstring = i18n( "A %1" ).tqarg( path );
+                userstring = i18n( "A %1" ).arg( path );
             break;
         }
         break;
@@ -126,33 +126,33 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
             break;
         case svn_wc_notify_delete: //delete
             m_HasChanges = TRUE;
-            userstring = i18n( "D %1" ).tqarg( path );
+            userstring = i18n( "D %1" ).arg( path );
             break;
         case svn_wc_notify_restore : //restore
-            userstring=i18n( "Restored %1." ).tqarg( path );
+            userstring=i18n( "Restored %1." ).arg( path );
             break;
         case svn_wc_notify_revert : //revert
-            userstring=i18n( "Reverted %1." ).tqarg( path );
+            userstring=i18n( "Reverted %1." ).arg( path );
             break;
         case svn_wc_notify_failed_revert: //failed revert
-            userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+            userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
             break;
         case svn_wc_notify_resolved: //resolved
-            userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+            userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
             break;
         case svn_wc_notify_skip: //skip
             if ( content_state == svn_wc_notify_state_missing )
-                userstring=i18n("Skipped missing target %1.").tqarg( path );
+                userstring=i18n("Skipped missing target %1.").arg( path );
             else
-                userstring=i18n("Skipped %1.").tqarg( path );
+                userstring=i18n("Skipped %1.").arg( path );
             break;
         case svn_wc_notify_update_delete: //update_delete
             m_HasChanges = TRUE;
-            userstring=i18n( "D %1" ).tqarg( path );
+            userstring=i18n( "D %1" ).arg( path );
             break;
         case svn_wc_notify_update_add: //update_add
             m_HasChanges = TRUE;
-            userstring=i18n( "A %1" ).tqarg( path );
+            userstring=i18n( "A %1" ).arg( path );
             break;
         case svn_wc_notify_update_update: //update_update
             {
@@ -195,13 +195,13 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
             {
                 if (!m_External) {
                     if (SVN_IS_VALID_REVNUM(revision)) {
-                        userstring = i18n("Finished at revision %1.").tqarg(revision);
+                        userstring = i18n("Finished at revision %1.").arg(revision);
                     } else {
                         userstring = i18n("Finished.");
                     }
                 } else {
                     if (SVN_IS_VALID_REVNUM(revision)) {
-                        userstring = i18n("Finished external at revision %1.").tqarg(revision);
+                        userstring = i18n("Finished external at revision %1.").arg(revision);
                     } else {
                         userstring = i18n("Finished external.");
                     }
@@ -212,30 +212,30 @@ void KioListener::contextNotify (const char * path,svn_wc_notify_action_t action
             break;
         case svn_wc_notify_update_external: //update_external
             m_External = TRUE;
-            userstring = i18n("Fetching external item into %1." ).tqarg( path );
+            userstring = i18n("Fetching external item into %1." ).arg( path );
             break;
         case svn_wc_notify_status_completed: //status_completed
             if (SVN_IS_VALID_REVNUM (revision))
-                userstring = i18n( "Status against revision: %1.").tqarg( revision );
+                userstring = i18n( "Status against revision: %1.").arg( revision );
             break;
         case svn_wc_notify_status_external: //status_external
-             userstring = i18n("Performing status on external item at %1.").tqarg( path );
+             userstring = i18n("Performing status on external item at %1.").arg( path );
             break;
         case svn_wc_notify_commit_modified: //commit_modified
-            userstring = i18n( "Sending %1.").tqarg( path );
+            userstring = i18n( "Sending %1.").arg( path );
             break;
         case svn_wc_notify_commit_added: //commit_added
             if (mime_type && svn_mime_type_is_binary (mime_type)) {
-                userstring = i18n( "Adding (bin) %1.").tqarg( path );
+                userstring = i18n( "Adding (bin) %1.").arg( path );
             } else {
-                userstring = i18n( "Adding %1.").tqarg( path );
+                userstring = i18n( "Adding %1.").arg( path );
             }
             break;
         case svn_wc_notify_commit_deleted: //commit_deleted
-            userstring = i18n( "Deleting %1.").tqarg( path );
+            userstring = i18n( "Deleting %1.").arg( path );
             break;
         case svn_wc_notify_commit_replaced: //commit_replaced
-            userstring = i18n( "Replacing %1.").tqarg( path );
+            userstring = i18n( "Replacing %1.").arg( path );
             break;
         case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
             if (!m_FirstTxDelta) {
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 159a05d..142f709 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -724,7 +724,7 @@ void kio_svnProtocol::commit(const KURL::List&url)
     for (unsigned j=0;j<url.count();++j) {
         TQString userstring;
         if (nnum!=svn::Revision::UNDEFINED) {
-            userstring = i18n( "Committed revision %1." ).tqarg(nnum.toString());
+            userstring = i18n( "Committed revision %1." ).arg(nnum.toString());
         } else {
             userstring = i18n ( "Nothing to commit." );
         }
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp
index c862b38..879e49d 100644
--- a/src/ksvnwidgets/authdialogimpl.cpp
+++ b/src/ksvnwidgets/authdialogimpl.cpp
@@ -35,7 +35,7 @@ AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidg
     TQString text = m_StorePasswordButton->text();
     m_StorePasswordButton->setText(
             m_StorePasswordButton->text()+TQString(" (%1)")
-            .tqarg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage"))));
+            .arg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage"))));
     if (!realm.isEmpty()) {
         m_RealmLabel->setText(m_RealmLabel->text()+" "+realm);
         resize( TQSize(334, 158).expandedTo(minimumSizeHint()) );
diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui
index f147cbd..384bf72 100644
--- a/src/ksvnwidgets/depthform.ui
+++ b/src/ksvnwidgets/depthform.ui
@@ -57,7 +57,7 @@
 &lt;i&gt;empty depth&lt;/i&gt;&lt;br&gt;Just the named directory, no entries.  Updates will not pull in any files or subdirectories not already present.
 &lt;/p&gt;
 &lt;p&gt;
-&lt;i&gt;Files depth&lt;/i&gt;&lt;br&gt;Folder and its file tqchildren, but not subdirs. Updates will pull in any files not already present, but not subdirectories.
+&lt;i&gt;Files depth&lt;/i&gt;&lt;br&gt;Folder and its file children, but not subdirs. Updates will pull in any files not already present, but not subdirectories.
 &lt;/p&gt;
 &lt;p&gt;
 &lt;i&gt;Immediate depth&lt;/i&gt;&lt;br&gt;
diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp
index 314613d..331edc4 100644
--- a/src/ksvnwidgets/depthselector.cpp
+++ b/src/ksvnwidgets/depthselector.cpp
@@ -56,7 +56,7 @@ DepthSelector::~DepthSelector()
 void DepthSelector::addItemWidget(TQWidget*aWidget)
 {
     DepthFormLayout->removeItem(m_leftspacer);
-    aWidget->reparent(this,tqgeometry().topLeft());
+    aWidget->reparent(this,geometry().topLeft());
     DepthFormLayout->addWidget(aWidget);
     aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
     DepthFormLayout->addItem(m_leftspacer);
diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp
index 1e87d29..9671147 100644
--- a/src/ksvnwidgets/diffbrowser.cpp
+++ b/src/ksvnwidgets/diffbrowser.cpp
@@ -96,7 +96,7 @@ void DiffBrowser::saveDiff()
     TQFile tfile(saveTo);
     if (tfile.exists()) {
         if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()),
-                                     i18n("File %1 exists - overwrite?").tqarg(saveTo))
+                                     i18n("File %1 exists - overwrite?").arg(saveTo))
             !=KMessageBox::Yes) {
             return;
         }
diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui
index cb5249a..e1ce254 100644
--- a/src/ksvnwidgets/encodingselector.ui
+++ b/src/ksvnwidgets/encodingselector.ui
@@ -49,7 +49,7 @@
             <property name="text">
                 <string>Select encoding:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui
index 2199705..299c4c1 100644
--- a/src/ksvnwidgets/logmessage.ui
+++ b/src/ksvnwidgets/logmessage.ui
@@ -47,7 +47,7 @@
                         <property name="text">
                             <string>Review affected items</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -167,7 +167,7 @@
                         <property name="text">
                             <string>Enter a log message</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index d8d51b2..0c4505f 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -224,7 +224,7 @@ void Logmsg_impl::initHistory()
         KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages");
         TQString s = TQString();
         unsigned int current = 0;
-        TQString key = TQString("log_%0").tqarg(current);
+        TQString key = TQString("log_%0").arg(current);
         s = cs.readEntry(key,TQString());
         while (s!=TQString()) {
             if (current<smax_message_history) {
@@ -233,7 +233,7 @@ void Logmsg_impl::initHistory()
                 cs.deleteEntry(key);
             }
             ++current;
-            key = TQString("log_%0").tqarg(current);
+            key = TQString("log_%0").arg(current);
             s = cs.readEntry(key,TQString());
         }
     }
@@ -270,7 +270,7 @@ void Logmsg_impl::saveHistory(bool canceld)
         }
         KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages");
         for (unsigned int i = 0; i < sLogHistory.size();++i) {
-            cs.writeEntry(TQString("log_%0").tqarg(i),sLogHistory[i]);
+            cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]);
         }
         cs.sync();
     } else {
@@ -449,7 +449,7 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on,
 void Logmsg_impl::addItemWidget(TQWidget*aWidget)
 {
     m_DepthSelector->addItemWidget(aWidget);
-/*    aWidget->reparent(this,tqgeometry().topLeft());
+/*    aWidget->reparent(this,geometry().topLeft());
     m_ItemsLayout->addWidget(aWidget);
     kdDebug()<<"SizeHint: "<<aWidget->minimumSizeHint()<< endl;
     aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp
index 1791e80..2aca6b9 100644
--- a/src/ksvnwidgets/ssltrustprompt_impl.cpp
+++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp
@@ -36,7 +36,7 @@ SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *parent, c
     :SslTrustPrompt(parent, name)
 {
     m_MainLabel->setText("<p align=\"center\"><b>"+
-        i18n("Error validating server certificate for '%1'").tqarg(host)+
+        i18n("Error validating server certificate for '%1'").arg(host)+
         TQString("</b></p>"));
 }
 
diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui
index bf15c3f..23c4708 100644
--- a/src/settings/cmdexecsettings.ui
+++ b/src/settings/cmdexecsettings.ui
@@ -102,7 +102,7 @@
                     <property name="text">
                         <string>Standard message:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui
index 304e639..de5b535 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -88,7 +88,7 @@
                     <property name="text">
                         <string>see "Whats this" for details</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignCenter</set>
                     </property>
                 </widget>
@@ -107,7 +107,7 @@
                             <property name="text">
                                 <string>Conflict resolver program:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -118,7 +118,7 @@
                             <property name="text">
                                 <string>External merge program:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -156,7 +156,7 @@ Default: &lt;tt&gt;kdiff3 %o %m %n -o %t&lt;/tt&gt;
                             <property name="text">
                                 <string>External diff display:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui
index 48cb3e3..88c3a3b 100644
--- a/src/settings/dispcolor_settings.ui
+++ b/src/settings/dispcolor_settings.ui
@@ -72,7 +72,7 @@
                     <property name="text">
                         <string>Locked items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -91,7 +91,7 @@
                     <property name="text">
                         <string>Not versioned items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -102,7 +102,7 @@
                     <property name="text">
                         <string>Remote changed items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -113,7 +113,7 @@
                     <property name="text">
                         <string>Added items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -124,7 +124,7 @@
                     <property name="text">
                         <string>Deleted items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -167,7 +167,7 @@
                     <property name="text">
                         <string>Conflicted items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -178,7 +178,7 @@
                     <property name="text">
                         <string>Missed items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -189,7 +189,7 @@
                     <property name="text">
                         <string>Local changed items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -200,7 +200,7 @@
                     <property name="text">
                         <string>Item needs lock:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui
index a5f194c..f17dfd6 100644
--- a/src/settings/revisiontree_settings.ui
+++ b/src/settings/revisiontree_settings.ui
@@ -79,7 +79,7 @@
                     <property name="text">
                         <string>Color for added items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -108,7 +108,7 @@
                     <property name="text">
                         <string>Color for deleted items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -137,7 +137,7 @@
                     <property name="text">
                         <string>Color for copied items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -166,7 +166,7 @@
                     <property name="text">
                         <string>Color for renamed items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -195,7 +195,7 @@
                     <property name="text">
                         <string>Color for modified items:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 63913b5..dc2f028 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -100,7 +100,7 @@ public:
     BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*);
     virtual ~BlameDisplayItem(){}
     virtual int compare(TQListViewItem *i, int col, bool ascending)const;
-    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
     virtual int rtti()const{return 1000;}
 
     virtual int width( const TQFontMetrics & fm, const TQListView * lv, int c ) const;
@@ -116,7 +116,7 @@ public:
         }
         TQString _line = m_Content.tLine();
         _line.replace("\t","    ");
-        setText(COL_LINE,TQString("%1").tqarg(_line));
+        setText(COL_LINE,TQString("%1").arg(_line));
     }
 
 protected:
@@ -153,17 +153,17 @@ int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, in
 void BlameDisplayItem::display()
 {
     if (m_disp){
-        setText(COL_REV,TQString("%1").tqarg(m_Content.revision()));
+        setText(COL_REV,TQString("%1").arg(m_Content.revision()));
         setText(COL_AUT,m_Content.tAuthor());
         if (m_Content.date().isValid()) {
             setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date()));
         }
     }
 
-    setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1));
+    setText(COL_LINENR,TQString("%1").arg(m_Content.lineNumber()+1));
     TQString _line = m_Content.tLine();
     _line.replace("\t","    ");
-    setText(COL_LINE,TQString("%1").tqarg(_line));
+    setText(COL_LINE,TQString("%1").arg(_line));
 }
 
 int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)const
@@ -182,10 +182,10 @@ int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)cons
     return k->m_Content.lineNumber()-m_Content.lineNumber();
 }
 
-void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
-    if (tqalignment & (AlignTop || AlignBottom) == 0)
-        tqalignment |= AlignVCenter;
+    if (alignment & (AlignTop || AlignBottom) == 0)
+        alignment |= AlignVCenter;
 
     /* don't copy string */
     const TQString & str = text(column);;
@@ -213,7 +213,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
 
     if (str.isEmpty())
         return;
-    p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str);
+    p->drawText(BORDER, 0, width - 2*BORDER, height(), alignment, str);
 }
 
 class BlameDisplayData
@@ -411,7 +411,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
     }
     KDialogBase* dlg = new KDialogBase(
             TQT_TQWIDGET(KApplication::activeModalWidget()),
-    "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(bit->rev())),
+    "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
     KDialogBase::Close);
     TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
     KTextBrowser*ptr = new KTextBrowser(Dialog1Layout);
@@ -447,7 +447,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
     int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
     KDialogBase * dlg = new KDialogBase(
             TQT_TQWIDGET(KApplication::activeModalWidget()),
-            name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false,
+            name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
             KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));
 
     TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 2cf3bd0..296a3bf 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -296,7 +296,7 @@ bool CContextListener::contextSslClientCertPwPrompt (TQString & password,
     TQCString npass;
     int keep = 1;
     int res = KPasswordDialog::getPassword(npass,
-        i18n("Enter password for realm %1").tqarg(realm),
+        i18n("Enter password for realm %1").arg(realm),
         &keep);
     emit waitShow(false);
     if (res!=KPasswordDialog::Accepted) {
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 18d645e..596311b 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -211,7 +211,7 @@ int CommandExec::exec()
 
     bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii());
     if (!found) {
-        slotCmd=i18n("Command \"%1\" not implemented or known").tqarg(m_pCPart->cmd);
+        slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd);
         KMessageBox::sorry(0,slotCmd,i18n("SVN Error"));
         return -1;
     }
diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index 3c29ac2..d36fdac 100644
--- a/src/svnfrontend/copymoveview.ui
+++ b/src/svnfrontend/copymoveview.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string>&lt;p align="right"&gt;Rename&lt;/p&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
         </widget>
@@ -37,7 +37,7 @@
             <property name="text">
                 <string>this long text</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -48,7 +48,7 @@
             <property name="text">
                 <string>to</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
         </widget>
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>/there/</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 552ba72..e80aab6 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -34,7 +34,7 @@
                     <property name="text">
                         <string>Type of repository:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -74,7 +74,7 @@
                     <property name="text">
                         <string>Path to repository:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index e060c20..aad99e6 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -42,7 +42,7 @@
                     <property name="text">
                         <string>Repository to dump:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -53,7 +53,7 @@
                     <property name="text">
                         <string>Dump into:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -118,7 +118,7 @@
                     <property name="text">
                         <string>End revision:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -129,7 +129,7 @@
                     <property name="text">
                         <string>Start revision:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index 00fb964..9c5ffba 100644
--- a/src/svnfrontend/editproperty_impl.cpp
+++ b/src/svnfrontend/editproperty_impl.cpp
@@ -44,7 +44,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
     fileComments += i18n("If present, make the file executable.<br>"
         "This property can not be set on a directory. "
         "A non-recursive attempt will fail, and a recursive attempt "
-        "will set the property only on the file tqchildren of the folder.");
+        "will set the property only on the file children of the folder.");
     fileComments += i18n("Keywords to be expanded into the contents of a file.<br>"
         "They can be inserted into documents by placing a keyword anchor "
         "which is formatted as $KeywordName$.<br>"
@@ -80,7 +80,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
     dirComments += i18n("If present, make the file executable.<br>"
         "This property can not be set on a directory. "
         "A non-recursive attempt will fail, and a recursive attempt "
-        "will set the property only on the file tqchildren of the folder.");
+        "will set the property only on the file children of the folder.");
     /* TRANSLATORS: Do not translate "example" in the URL because this is according
        TRANSLATORS: to http://www.rfc-editor.org/rfc/rfc2606.txt a reserved URL.*/
     dirComments += i18n("A newline separated list of module specifiers, each "
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index da474ae..812ee69 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -144,7 +144,7 @@ void FileListViewItem::refreshStatus(bool childs,TQPtrList<SvnItem>*exclude,bool
             it = static_cast<FileListViewItem*>(it->nextSibling());
         }
     }
-    tqrepaint();
+    repaint();
 }
 
 void FileListViewItem::makePixmap()
@@ -192,7 +192,7 @@ void FileListViewItem::update()
     setText(COL_STATUS,infoText());
     setText(COL_LAST_AUTHOR,cmtAuthor());
     setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate()));
-    setText(COL_LAST_REV,TQString("%1").tqarg(cmtRev()));
+    setText(COL_LAST_REV,TQString("%1").arg(cmtRev()));
     setText(COL_IS_LOCKED,lockOwner());
 }
 
@@ -247,11 +247,11 @@ SvnItem* FileListViewItem::getParentItem()const
     return temp->fullName();
 }
 
-void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
     bool colors = Kdesvnsettings::colored_state();
     if (!colors||m_bgColor==NONE) {
-        KListViewItem::paintCell(p,cg,column,width,tqalignment);
+        KListViewItem::paintCell(p,cg,column,width,alignment);
         return;
     }
     TQColorGroup _cg = cg;
@@ -285,7 +285,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
             _bgColor = Kdesvnsettings::color_need_lock();
             break;
         default:
-            KListViewItem::paintCell(p,cg,column,width,tqalignment);
+            KListViewItem::paintCell(p,cg,column,width,alignment);
             return;
             break;
     }
@@ -301,7 +301,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
             _cg.setColor(TQColorGroup::Base,_bgColor);
         }
     }
-    TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+    TQListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 
 const svn::Revision&FileListViewItem::correctPeg()const
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index 6dab6e9..c1685fa 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -60,7 +60,7 @@ public:
     virtual SvnItem* getParentItem()const;
     virtual FileListViewItem*fItem(){return this;}
     virtual void setStat(const svn::StatusPtr&);
-    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
     virtual void setOpen(bool o);
     virtual void setOpenNoBlock(bool o);
 
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index e2ee7f4..92c805e 100644
--- a/src/svnfrontend/fillcachethread.cpp
+++ b/src/svnfrontend/fillcachethread.cpp
@@ -110,7 +110,7 @@ void FillCacheThread::run()
                 rl.fillCache(Head.revnum());
             }
             i=Head.revnum();
-            m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").tqarg(i));
+            m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").arg(i));
         }
     } catch (const svn::Exception&e) {
         m_SvnContextListener->contextNotify(e.msg());
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index 8644974..1cec475 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string>Enter URL:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp
index 1b9a2d2..7dd0d9d 100644
--- a/src/svnfrontend/fronthelpers/propertylist.cpp
+++ b/src/svnfrontend/fronthelpers/propertylist.cpp
@@ -71,7 +71,7 @@ void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool
         }
     }
     viewport()->setUpdatesEnabled(true);
-    viewport()->tqrepaint();
+    viewport()->repaint();
 }
 
 void Propertylist::clear()
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index bb2bb3c..89d36f7 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -412,28 +412,28 @@ const TQString&RevGraphView::getLabelstring(const TQString&nodeName)
     TQString res;
     switch (it1.data().Action) {
     case 'D':
-        res = i18n("Deleted at revision %1").tqarg(it1.data().rev);
+        res = i18n("Deleted at revision %1").arg(it1.data().rev);
     break;
     case 'A':
         res = i18n("Added at revision %1 as %2")
-            .tqarg(it1.data().rev)
-            .tqarg(it1.data().name);
+            .arg(it1.data().rev)
+            .arg(it1.data().name);
     break;
     case 'C':
     case 1:
-        res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
+        res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
     break;
     case 2:
-        res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
+        res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
     break;
     case 'M':
-        res = i18n("Modified at revision %1").tqarg(it1.data().rev);
+        res = i18n("Modified at revision %1").arg(it1.data().rev);
     break;
     case 'R':
-        res = i18n("Replaced at revision %1").tqarg(it1.data().rev);
+        res = i18n("Replaced at revision %1").arg(it1.data().rev);
         break;
     default:
-        res=i18n("Revision %1").tqarg(it1.data().rev);
+        res=i18n("Revision %1").arg(it1.data().rev);
     break;
     }
     m_LabelMap[nodeName]=res;
@@ -450,7 +450,7 @@ void RevGraphView::dumpRevtree()
 
     TQTextStream* stream = dotTmpFile->textStream();
     if (!stream) {
-        showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name()));
+        showText(i18n("Could not open tempfile %1 for writing.").arg(dotTmpFile->name()));
         return;
     }
 
@@ -481,7 +481,7 @@ void RevGraphView::dumpRevtree()
     for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) {
         *stream << "  " << it1.key()
             << "[ "
-            << "tqshape=box, "
+            << "shape=box, "
             << "label=\""<<getLabelstring(it1.key())<<"\","
             << "];\n";
         for (unsigned j=0;j<it1.data().targets.count();++j) {
@@ -501,9 +501,9 @@ void RevGraphView::dumpRevtree()
     if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) {
         TQString arguments;
         for (unsigned c=0;c<renderProcess->args().count();++c) {
-            arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data());
+            arguments+=TQString(" %1").arg(renderProcess->args()[c].data());
         }
-        TQString error = i18n("Could not start process \"%1\".").tqarg(arguments);
+        TQString error = i18n("Could not start process \"%1\".").arg(arguments);
         showText(error);
         renderProcess=0;
         //delete renderProcess;<
@@ -542,19 +542,19 @@ TQString RevGraphView::toolTip(const TQString&_nodename,bool full)const
     res = TQString("<html><body>");
 
     if (!full) {
-        res+=TQString("<b>%1</b>").tqarg(it.data().name);
+        res+=TQString("<b>%1</b>").arg(it.data().name);
         res += i18n("<br>Revision: %1<br>Author: %2<br>Date: %3<br>Log: %4</html>")
-            .tqarg(it.data().rev)
-            .tqarg(it.data().Author)
-            .tqarg(it.data().Date)
-            .tqarg(sm);
+            .arg(it.data().rev)
+            .arg(it.data().Author)
+            .arg(it.data().Date)
+            .arg(sm);
     } else {
         res+="<table><tr><th colspan=\"2\"><b>"+it.data().name+"</b></th></tr>";
         res+=rstart;
-        res+=i18n("<b>Revision</b>%1%2%3").tqarg(csep).tqarg(it.data().rev).tqarg(rend);
-        res+=rstart+i18n("<b>Author</b>%1%2%3").tqarg(csep).tqarg(it.data().Author).tqarg(rend);
-        res+=rstart+i18n("<b>Date</b>%1%2%3").tqarg(csep).tqarg(it.data().Date).tqarg(rend);
-        res+=rstart+i18n("<b>Log</b>%1%2%3").tqarg(csep).tqarg(sm).tqarg(rend);
+        res+=i18n("<b>Revision</b>%1%2%3").arg(csep).arg(it.data().rev).arg(rend);
+        res+=rstart+i18n("<b>Author</b>%1%2%3").arg(csep).arg(it.data().Author).arg(rend);
+        res+=rstart+i18n("<b>Date</b>%1%2%3").arg(csep).arg(it.data().Date).arg(rend);
+        res+=rstart+i18n("<b>Log</b>%1%2%3").arg(csep).arg(sm).arg(rend);
         res+="</table></body></html>";
     }
     return res;
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index 335994e..8392566 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -104,13 +104,13 @@ bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,cons
             } else if (Kdesvnsettings::network_on()) {
                 m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0);
             } else {
-                KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(i18n("No logcache possible due broken database and networking not allowed.")));
+                KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed.")));
                 return false;
             }
         }
     } catch (const svn::Exception&ce) {
         kdDebug()<<ce.msg() << endl;
-        KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(ce.msg()));
+        KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(ce.msg()));
         return false;
     }
     return true;
@@ -138,7 +138,7 @@ RevisionTree::RevisionTree(svn::Client*aClient,
     kdDebug()<<"Origin: "<<origin << endl;
 
     m_Data->progress=new KProgressDialog(
-        parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true);
+        parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").arg(origin),true);
     m_Data->progress->setMinimumDuration(100);
     m_Data->progress->show();
     m_Data->progress->setAllowCancel(true);
@@ -237,7 +237,7 @@ bool RevisionTree::topDownScan()
                     break;
                 }
                 label = i18n("%1<br>Check change entry %2 of %3")
-                        .tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+                        .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
                 kapp->processEvents();
             }
@@ -278,7 +278,7 @@ bool RevisionTree::topDownScan()
                     cancel=true;
                     break;
                 }
-                label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+                label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
                 kapp->processEvents();
             }
@@ -331,7 +331,7 @@ bool RevisionTree::topDownScan()
                     cancel=true;
                     break;
                 }
-                label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+                label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
                 kapp->processEvents();
             }
@@ -364,7 +364,7 @@ static TQString uniqueNodeName(long rev,const TQString&path)
     res.replace("\"","_quot_");
     res.replace(" ","_space_");
     TQString n; n.sprintf("%05ld",rev);
-    res = "\""+n+TQString("_%1\"").tqarg(res);
+    res = "\""+n+TQString("_%1\"").arg(res);
     return res;
 }
 
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index a226642..74aecee 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -31,7 +31,7 @@
                     <property name="text">
                         <string>Destination folder:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -58,7 +58,7 @@
                     <property name="text">
                         <string>Repository to copy:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index 5d3d113..c3e5eee 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -81,7 +81,7 @@ bool Importdir_logmsg::createDir()
 
 void Importdir_logmsg::createDirboxDir(const TQString & which)
 {
-    m_createDirBox->setText(i18n("Create subdir %1 on import").tqarg(which.isEmpty()?i18n("(Last part)"):which));
+    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which));
 }
 
 #include "importdir_logmsg.moc"
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 0c4070c..ae05cc9 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -31,7 +31,7 @@
                     <property name="text">
                         <string>Load into folder:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -48,7 +48,7 @@
                     <property name="text">
                         <string>Dump file:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string>Load into repository:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 728ce42..c0f5ba7 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -52,7 +52,7 @@
                             <property name="text">
                                 <string>Source 1:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -68,7 +68,7 @@
                             <property name="text">
                                 <string>Source 2:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -79,7 +79,7 @@
                             <property name="text">
                                 <string>Output to:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index f5151cf..9957570 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -184,11 +184,11 @@ void StopDlg::slotNetProgres(long long int current, long long int max)
         TQString s1 = helpers::ByteToString()(current);
         if (max > -1 && max != m_NetBar->totalSteps()) {
             TQString s2 = helpers::ByteToString()(max);
-            m_NetBar->setFormat(i18n("%1 of %2").tqarg(s1).tqarg(s2));
+            m_NetBar->setFormat(i18n("%1 of %2").arg(s1).arg(s2));
             m_NetBar->setTotalSteps(max);
         }
         if (max == -1) {
-            m_NetBar->setFormat(i18n("%1 transferred.").tqarg(s1));
+            m_NetBar->setFormat(i18n("%1 transferred.").arg(s1));
             m_NetBar->setTotalSteps(current+1);
         }
         m_NetBar->setValue(current);
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 45150d8..0cb1a3d 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -442,7 +442,7 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn
     }
     kdDebug()<<"Logs for "<<reposRoot<<endl;
     TQWidget*disp;
-    KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").tqarg(info.url().mid(reposRoot.length())),
+    KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").arg(info.url().mid(reposRoot.length())),
         KDialogBase::Ok,
         KDialogBase::Ok,true);
     TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
@@ -599,7 +599,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con
     TQByteArray co = file.readAll();
 
     if (co.size()) {
-        KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).tqarg(disp),false,"cat_display_dlg");
+        KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg");
         if (dlg) {
             ptr->setFont(KGlobalSettings::fixedFont());
             ptr->setWordWrap(TQTextEdit::NoWrap);
@@ -1031,7 +1031,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
         return false;
     }
     EMIT_REFRESH;
-    emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString()));
+    emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString()));
     return true;
 }
 
@@ -1232,7 +1232,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
     TQByteArray ex;
     KTempDir tdir;
     tdir.setAutoDelete(true);
-    TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff");
+    TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff");
     bool ignore_content = Kdesvnsettings::diff_ignore_content();
     TQWidget*parent = p?p:m_Data->m_ParentList->realWidget();
     TQStringList extraOptions;
@@ -1296,7 +1296,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
     KTempDir tdir;
     tdir.setAutoDelete(true);
     kdDebug()<<"Non recourse diff"<<endl;
-    TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff");
+    TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff");
     bool ignore_content = Kdesvnsettings::diff_ignore_content();
     try {
         StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort");
@@ -1511,7 +1511,7 @@ void SvnActions::makeAdd(bool rec)
         ++liter;
         if (cur->isVersioned()) {
             KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("<center>The entry<br>%1<br>is versioned - break.</center>")
-                .tqarg(cur->fullName()));
+                .arg(cur->fullName()));
             return;
         }
         items.push_back(svn::Path(cur->fullName()));
@@ -1721,7 +1721,7 @@ void SvnActions::slotRevert()
         while ((cur=liter.current())!=0){
             if (!cur->isVersioned()) {
                 KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("<center>The entry<br>%1<br>is not versioned - break.</center>")
-                    .tqarg(cur->fullName()));
+                    .arg(cur->fullName()));
                 return;
             }
             displist.append(cur->fullName());
@@ -2178,7 +2178,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force)
         return false;
     }
     if (nnum != svn::Revision::UNDEFINED) {
-        emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString()));
+        emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString()));
     }
     EMIT_REFRESH;
     return true;
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 3513e4f..80e8877 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -190,7 +190,7 @@ void SvnFileTip::drawContents( TQPainter *p )
     }
 
     if ( m_corners[m_corner].isNull())
-        m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) );
+        m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
 
     TQPixmap &pix = m_corners[m_corner];
 
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 4d45190..9cbc7e3 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -100,7 +100,7 @@ LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry)
     setMultiLinesEnabled(false);
     _revision=_entry.revision;
     fullDate=svn::DateTime(_entry.date);
-    setText(COL_REV,TQString("%1").tqarg(_revision));
+    setText(COL_REV,TQString("%1").arg(_revision));
     setText(COL_AUTHOR,_entry.author);
     setText(COL_DATE,helpers::sub2qt::apr_time2qtString(_entry.date));
     _message = _entry.message;
@@ -154,7 +154,7 @@ LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEn
     _source = e.copyFromPath;
     if (e.copyFromRevision>-1)
     {
-        setText(2,i18n("%1 at revision %2").tqarg(e.copyFromPath).tqarg(e.copyFromRevision));
+        setText(2,i18n("%1 at revision %2").arg(e.copyFromPath).arg(e.copyFromRevision));
     }
 }
 
@@ -262,7 +262,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer<svn::LogEntriesMap>&_log,con
     m_Entries = _log;
     kdDebug()<<"What: "<<what << endl;
     if (!what.isEmpty()){
-        setCaption(i18n("SVN Log of %1").tqarg(what));
+        setCaption(i18n("SVN Log of %1").arg(what));
     } else {
         setCaption(i18n("SVN Log"));
     }
@@ -444,9 +444,9 @@ void SvnLogDlgImp::saveSize()
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
     KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
     TQSize sizeToSave = size();
-    Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").tqarg( desk.width()),
+    Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
         TQString::number( sizeToSave.width()), true, false);
-    Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").tqarg( desk.height()),
+    Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
         TQString::number( sizeToSave.height()), true, false);
 }
 
@@ -458,8 +458,8 @@ TQSize SvnLogDlgImp::dialogSize()
     w = sizeHint().width();
     h = sizeHint().height();
     KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
-    w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").tqarg( desk.width()), w );
-    h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").tqarg( desk.height()), h );
+    w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
+    h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
     return( TQSize( w, h ) );
 }
 
diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp
index 53d7892..486af86 100644
--- a/src/svnfrontend/tcontextlistener.cpp
+++ b/src/svnfrontend/tcontextlistener.cpp
@@ -188,9 +188,9 @@ void ThreadContextListener::contextProgress(long long int current, long long int
     TQString s1 = helpers::ByteToString()(current);
     if (max>-1) {
         TQString s2 = helpers::ByteToString()(max);
-        msg = i18n("%1 of %2 transferred.").tqarg(s1).tqarg(s2);
+        msg = i18n("%1 of %2 transferred.").arg(s1).arg(s2);
     } else {
-        msg = i18n("%1 transferred.").tqarg(s1);
+        msg = i18n("%1 transferred.").arg(s1);
     }
     _notify->msg = msg;
     ev->setData((void*)_notify);
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index dc0b7c0..2429d70 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -706,7 +706,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
     if (ownupdates) {
         kdDebug()<<"Enable update"<<endl;
         viewport()->setUpdatesEnabled(true);
-        viewport()->tqrepaint();
+        viewport()->repaint();
     }
     return true;
 }
@@ -723,7 +723,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl
     for (it = dlist.begin();it!=dlist.end();++it) {
 /*        if (_t.elapsed()>300) {
            viewport()->setUpdatesEnabled(true);
-            viewport()->tqrepaint();
+            viewport()->repaint();
             viewport()->setUpdatesEnabled(false);
             _t.restart();
         }*/
@@ -1103,7 +1103,7 @@ void tdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item)
         }
     } else {
         if ( KRun::runCommand(feditor + " " +  fki->kdeName(rev).prettyURL()) <= 0) {
-            KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName()));
+            KMessageBox::error(this,i18n("Failed: %1 %2").arg(feditor).arg(fki->fullName()));
         }
     }
 }
@@ -1273,7 +1273,7 @@ void tdesvnfilelist::refreshCurrentTree()
     if (item->fullName()==baseUri()) {
         if (!refreshItem(item)) {
             setUpdatesEnabled(true);
-            viewport()->tqrepaint();
+            viewport()->repaint();
             return;
         } else {
             refreshRecursive(item);
@@ -1286,7 +1286,7 @@ void tdesvnfilelist::refreshCurrentTree()
     }
     kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl;
     setUpdatesEnabled(true);
-    viewport()->tqrepaint();
+    viewport()->repaint();
     TQTimer::singleShot(1,this,TQT_SLOT(readSupportData()));
     //m_pList->startScan();
 }
@@ -1301,7 +1301,7 @@ void tdesvnfilelist::refreshCurrent(SvnItem*cur)
     setUpdatesEnabled(false);
     refreshRecursive(cur->fItem());
     setUpdatesEnabled(true);
-    viewport()->tqrepaint();
+    viewport()->repaint();
 }
 
 bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
@@ -1657,7 +1657,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event)
         if (tmpRect!=m_pList->mOldDropHighlighter) {
             cleanHighLighter();
             m_pList->mOldDropHighlighter=tmpRect;
-            viewport()->tqrepaint(tmpRect);
+            viewport()->repaint(tmpRect);
             kapp->processEvents();
         }
     }
@@ -1683,7 +1683,7 @@ void tdesvnfilelist::cleanHighLighter()
     if (m_pList->mOldDropHighlighter.isValid()) {
         TQRect rect=m_pList->mOldDropHighlighter;
         m_pList->mOldDropHighlighter=TQRect();
-        viewport()->tqrepaint(rect, true);
+        viewport()->repaint(rect, true);
     }
 }
 
@@ -2600,7 +2600,7 @@ void tdesvnfilelist::_dirwatchTimeout()
     m_pList->dirItems.clear();
     viewport()->setUpdatesEnabled(true);
     if (repaintit) {
-//        viewport()->tqrepaint();
+//        viewport()->repaint();
     }
 }
 
@@ -2758,7 +2758,7 @@ void tdesvnfilelist::slotSettingsChanged()
     if (m_pList->reReadSettings()) {
         refreshCurrentTree();
     } else {
-        viewport()->tqrepaint();
+        viewport()->repaint();
     }
     enableActions();
     sort();
@@ -2783,7 +2783,7 @@ void tdesvnfilelist::slotRelocate()
     path = k->fullName();
     fromUrl = k->Url();
     CheckoutInfo_impl*ptr;
-    KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg");
+    KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").arg(path),true,"relocate_dlg");
     if (dlg) {
         ptr->setStartUrl(fromUrl);
         ptr->disableAppend(true);
@@ -3087,8 +3087,8 @@ void tdesvnfilelist::slotUnfoldTree()
     }
     setFocus();
     setUpdatesEnabled(true);
-    viewport()->tqrepaint();
-    tqrepaint();
+    viewport()->repaint();
+    repaint();
     m_SvnWrapper->slotCancel(false);
 }
 
diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp
index 880c041..199a5f9 100644
--- a/src/svnqt/cache/DatabaseException.cpp
+++ b/src/svnqt/cache/DatabaseException.cpp
@@ -7,6 +7,6 @@ svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber)
     : Exception(msg),m_number(aNumber)
 {
     if (aNumber>-1) {
-        setMessage(TQString("(Code %1) %2").tqarg(aNumber).tqarg(msg));
+        setMessage(TQString("(Code %1) %2").arg(aNumber).arg(msg));
     }
 }
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp
index fd62eee..4dcb27b 100644
--- a/src/svnqt/cache/LogCache.cpp
+++ b/src/svnqt/cache/LogCache.cpp
@@ -154,7 +154,7 @@ public:
         int i = 0;
         TQString _key = dbFile;
         while (TQSqlDatabase::contains(_key)) {
-            _key = TQString("%1-%2").tqarg(dbFile).tqarg(i++);
+            _key = TQString("%1-%2").arg(dbFile).arg(i++);
         }
 //        qDebug("The repository key is now: %s",_key.TOUTF8().data());
         TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key);
diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp
index d63d1d3..34aa99f 100644
--- a/src/svnqt/cache/ReposLog.cpp
+++ b/src/svnqt/cache/ReposLog.cpp
@@ -360,15 +360,15 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start,
     svn::Revision peg = date2numberRev(_peg,true);
     svn::Revision end = date2numberRev(_end,true);
     svn::Revision start = date2numberRev(_start,true);
-    TQString query_string = TQString(s_q).tqarg(what.native()).tqarg(what.native()).tqarg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").tqarg(peg.revnum())));
+    TQString query_string = TQString(s_q).arg(what.native()).arg(what.native()).arg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").arg(peg.revnum())));
     if (peg==svn::Revision::UNDEFINED) {
         peg = latestCachedRev();
     }
     if (!itemExists(peg,what)) {
-        throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").tqarg(what.native()).tqarg(peg.toString()));
+        throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").arg(what.native()).arg(peg.toString()));
     }
     if (limit>0) {
-        query_string+=TQString(" LIMIT %1").tqarg(limit);
+        query_string+=TQString(" LIMIT %1").arg(limit);
     }
     TQSqlQuery _q(TQString(),m_Database);
     TQSqlQuery _q2(TQString(),m_Database);
@@ -384,7 +384,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start,
         target[revision].author=_q.value(1).toString();
         target[revision].date=_q.value(2).toLongLong();
         target[revision].message=_q.value(3).toString();
-        query_string=s_e.tqarg(revision);
+        query_string=s_e.arg(revision);
         _q2.prepare(query_string);
         if (!_q2.exec()) {
             qDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data());
@@ -416,7 +416,7 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa
 #if 0
     static TQString _s1("select revision from changeditems where changeditem='%1' and action='A' and revision<=%2 order by revision desc limit 1");
     TQSqlQuery _q(TQString(),m_Database);
-    TQString query_string=TQString(_s1).tqarg(path.native()).tqarg(peg.revnum());
+    TQString query_string=TQString(_s1).arg(path.native()).arg(peg.revnum());
     if (!_q.exec(query_string)) {
         qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data());
         qDebug(_q.lastQuery().TOUTF8().data());
@@ -429,10 +429,10 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa
     static TQString _s2("select revision from changeditem where changeditem in (%1) and action='D' and revision>%2 and revision<=%3 order by revision desc limit 1");
     TQStringList p_list;
     while (_p.length()>0) {
-        p_list.append(TQString("'%1'").tqarg(_p.native()));
+        p_list.append(TQString("'%1'").arg(_p.native()));
         _p.removeLast();
     }
-    query_string=TQString(_s2).tqarg(p_list.join(",")).tqarg();
+    query_string=TQString(_s2).arg(p_list.join(",")).arg();
 #endif
     return true;
 }
diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp
index 70195ac..68d0aa0 100644
--- a/src/svnqt/client.hpp
+++ b/src/svnqt/client.hpp
@@ -428,7 +428,7 @@ namespace svn
      * @param native_eol Either "LF", "CR" or "CRLF" or NULL.
      * @param ignore_externals don't process externals definitions as part of this operation.
      * @param recurse if true, export recursively.<br>
-      Otherwise, export just the directory represented by from and its immediate non-directory tqchildren.
+      Otherwise, export just the directory represented by from and its immediate non-directory children.
      */
     virtual svn_revnum_t
     doExport (const Path & srcPath,
diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp
index 361603b..4e2ea60 100644
--- a/src/svnqt/client_impl.hpp
+++ b/src/svnqt/client_impl.hpp
@@ -398,7 +398,7 @@ namespace svn
      * @param overwrite overwrite existing files
      * @param native_eol Either "LF", "CR" or "CRLF" or NULL.
      * @param ignore_externals don't process externals definitions as part of this operation.
-     * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory tqchildren.
+     * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory children.
      */
     virtual svn_revnum_t
     doExport (const Path & srcPath,
diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp
index f1837ce..756e771 100644
--- a/src/svnqt/diff_data.cpp
+++ b/src/svnqt/diff_data.cpp
@@ -130,7 +130,7 @@ namespace svn
         close();
         TQFile fi(m_outFileName);
         if (!fi.open(IO_ReadOnly|IO_Raw)) {
-            throw ClientException(TQString("%1 '%2'").tqarg(fi.errorString()).tqarg(m_outFileName));
+            throw ClientException(TQString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName));
         }
 
         TQByteArray res = fi.readAll();
diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp
index bc25345..1824572 100644
--- a/src/svnqt/exception.cpp
+++ b/src/svnqt/exception.cpp
@@ -121,7 +121,7 @@ namespace svn
       {
         message += TQString::FROMUTF8("In file ");
         message += TQString::FROMUTF8(error->file);
-        message += TQString(" Line %1").tqarg(error->line);
+        message += TQString(" Line %1").arg(error->line);
       }
     }
     while (next != NULL && next->message != NULL)
diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp
index 1ac0140..f3a2f6f 100644
--- a/src/svnqt/tests/lsdir.cpp
+++ b/src/svnqt/tests/lsdir.cpp
@@ -15,8 +15,8 @@ int main(int,char**)
     m_Svnclient->setContext(m_CurrentContext);
     svn::DirEntries dlist;
 
-    TQString p = TQString("file://%1").tqarg(TESTREPOPATH);
-    TQString l = TQString("%1").tqarg(TESTCOPATH);
+    TQString p = TQString("file://%1").arg(TESTREPOPATH);
+    TQString l = TQString("%1").arg(TESTCOPATH);
 
     try {
         dlist = m_Svnclient->list(svn::Path(p),svn::Revision::HEAD,svn::Revision::HEAD,svn::DepthInfinity,true);
diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp
index 44c79d3..ceb8e49 100644
--- a/src/svnqt/version_check.cpp
+++ b/src/svnqt/version_check.cpp
@@ -52,8 +52,8 @@ namespace svn {
     {
         if (curr_version_string.length()==0) {
             curr_version_string =
-                TQString("%1.%2.%3.%4").tqarg(svn_client_version()->major).tqarg(svn_client_version()->minor)
-                    .tqarg(svn_client_version()->patch).tqarg(svn_client_version()->tag);
+                TQString("%1.%2.%3.%4").arg(svn_client_version()->major).arg(svn_client_version()->minor)
+                    .arg(svn_client_version()->patch).arg(svn_client_version()->tag);
         }
         return curr_version_string;
     }
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index 597978c..8002350 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -201,7 +201,7 @@ void tdesvn::load(const KURL& url,bool addRescent)
             }
         }
         if (!ret) {
-            changeStatusbar(i18n("Could not open url %1").tqarg(url.prettyURL()));
+            changeStatusbar(i18n("Could not open url %1").arg(url.prettyURL()));
             if (rac) {
                 rac->removeURL(url);
             }
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index 1aa3be2..dd33ddf 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -156,8 +156,8 @@ void tdesvnPart::slotDispPopup(const TQString&name,TQWidget**target)
 
 KAboutData* tdesvnPart::createAboutData()
 {
-    m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).tqarg(svn::Version::linked_version());
-    m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).tqarg(svn::Version::running_version());
+    m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version());
+    m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version());
 
     KAboutData*about = new KAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description,
                      KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
@@ -208,7 +208,7 @@ void tdesvnPart::setupActions()
     kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl;
 
     KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
-    t->setText(i18n("&Configure %1...").tqarg("Kdesvn"));
+    t->setText(i18n("&Configure %1...").arg("Kdesvn"));
     if (TQString(kapp->instanceName())!=TQString("tdesvn")) {
         (void)new KAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
         (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn");
diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp
index 9575f78..fde8fd0 100644
--- a/src/tdesvnd/tdesvnd_dcop.cpp
+++ b/src/tdesvnd/tdesvnd_dcop.cpp
@@ -238,7 +238,7 @@ TQStringList tdesvnd_dcop::get_sslclientcertpw(TQString realm)
     TQStringList resList;
     TQCString npass;
     int keep = 1;
-    int res = KPasswordDialog::getPassword(npass,i18n("Enter password for realm %1").tqarg(realm),&keep);
+    int res = KPasswordDialog::getPassword(npass,i18n("Enter password for realm %1").arg(realm),&keep);
     if (res!=KPasswordDialog::Accepted) {
         return resList;
     }