Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit bb7be2361770a435b3e2e8ae2ac4250bf9810bb4.

40 files changed, 265 insertions, 265 deletions

diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index d7d3ecc..06727a5 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -45,8 +45,8 @@
 #include <tqvbox.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <layout.h>
-#include <textcodec.h>
+#include <tqlayout.h>
+#include <tqtextcodec.h>
 
 #define COL_LINENR 0
 #define COL_REV 1
@@ -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 alignment);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
     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").arg(_line));
+        setText(COL_LINE,TQString("%1").tqarg(_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").arg(m_Content.revision()));
+        setText(COL_REV,TQString("%1").tqarg(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").arg(m_Content.lineNumber()+1));
+    setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1));
     TQString _line = m_Content.tLine();
     _line.replace("\t","    ");
-    setText(COL_LINE,TQString("%1").arg(_line));
+    setText(COL_LINE,TQString("%1").tqarg(_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 alignment)
+void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
 {
-    if (alignment & (AlignTop || AlignBottom) == 0)
-        alignment |= AlignVCenter;
+    if (tqalignment & (AlignTop || AlignBottom) == 0)
+        tqalignment |= AlignVCenter;
 
     /* don't copy string */
     const TQString & str = text(column);;
@@ -202,7 +202,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
         if (Kdesvnsettings::self()->colored_blame()) {
             _bgColor = cb->rev2color(m_Content.revision());
         } else {
-            _bgColor = listView()->viewport()->colorGroup().base();
+            _bgColor = listView()->viewport()->tqcolorGroup().base();
         }
     }
 
@@ -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(), alignment, str);
+    p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str);
 }
 
 class BlameDisplayData
@@ -344,7 +344,7 @@ const TQColor BlameDisplay_impl::rev2color(svn_revnum_t r )const
     {
         return m_Data->m_shadingMap[r];
     } else {
-        return m_BlameList->viewport()->colorGroup().base();
+        return m_BlameList->viewport()->tqcolorGroup().base();
     }
 }
 
@@ -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").arg(bit->rev())),
+    "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(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")).arg(item),buttons,KDialogBase::Close,false,
+            name,true,TQString(i18n("Blame %1")).tqarg(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/cacheentry.h b/src/svnfrontend/cacheentry.h
index fd9ae64..1b36a95 100644
--- a/src/svnfrontend/cacheentry.h
+++ b/src/svnfrontend/cacheentry.h
@@ -569,7 +569,7 @@ public:
     ValidRemoteOnly():m_List(){}
     void operator()(const std::pair<TQString,helpers::ptrEntry>&_data)
     {
-        if(_data.second.isValid() && _data.second.content()->validReposStatus()&&!_data.second.content()->validLocalStatus()) {
+        if(_data.second.isValid() && _data.second.content()->validRepostqStatus()&&!_data.second.content()->validLocaltqStatus()) {
             m_List.push_back(_data.second.content());
         }
     }
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 691b288..2cf3bd0 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -32,7 +32,7 @@
 #include <kfiledialog.h>
 
 #include <tqmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqthread.h>
 
 class CContextListenerData
@@ -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").arg(realm),
+        i18n("Enter password for realm %1").tqarg(realm),
         &keep);
     emit waitShow(false);
     if (res!=KPasswordDialog::Accepted) {
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 81212a9..431125c 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -40,7 +40,7 @@
 #include <ktextbrowser.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvaluelist.h>
 #include <tqvbox.h>
 
@@ -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").arg(m_pCPart->cmd);
+        slotCmd=i18n("Command \"%1\" not implemented or known").tqarg(m_pCPart->cmd);
         KMessageBox::sorry(0,slotCmd,i18n("SVN Error"));
         return -1;
     }
@@ -606,7 +606,7 @@ bool CommandExec::askRevision()
     TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
     Rangeinput_impl*rdlg;
     rdlg = new Rangeinput_impl(Dialog1Layout);
-    dlg.resize( TQSize(120,60).expandedTo(dlg.minimumSizeHint()));
+    dlg.resize( TQSize(120,60).expandedTo(dlg.tqminimumSizeHint()));
     rdlg->setStartOnly(m_pCPart->single_revision);
     if (dlg.exec()==TQDialog::Accepted) {
         Rangeinput_impl::revision_range range = rdlg->getRange();
diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index f16b5b0..3c29ac2 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="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
         </widget>
@@ -37,7 +37,7 @@
             <property name="text">
                 <string>this long text</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -48,13 +48,13 @@
             <property name="text">
                 <string>to</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>/there/</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp
index f635cf8..98e3d60 100644
--- a/src/svnfrontend/copymoveview_impl.cpp
+++ b/src/svnfrontend/copymoveview_impl.cpp
@@ -88,7 +88,7 @@ TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move,
     TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
     CopyMoveView_impl*ptr=new CopyMoveView_impl(base,old,(move),Dialog1Layout);
     TQString nName = TQString();
-    dlg.resize( TQSize(500,160).expandedTo(dlg.minimumSizeHint()) );
+    dlg.resize( TQSize(500,160).expandedTo(dlg.tqminimumSizeHint()) );
     if (dlg.exec()!=TQDialog::Accepted) {
         if (ok) *ok = false;
     } else {
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 0ca5ef5..552ba72 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -34,7 +34,7 @@
                     <property name="text">
                         <string>Type of repository:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -74,7 +74,7 @@
                     <property name="text">
                         <string>Path to repository:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -119,7 +119,7 @@
                 <string>Create trunk, tags and branches folder</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>If this is set then the base layout (&lt;tt&gt;/trunk&lt;/tt&gt;,&lt;tt&gt;/branches&lt;/tt&gt; and &lt;tt&gt;/tags&lt;/tt&gt;) will created after opening the fresh repository.</string>
+                <string>If this is set then the base tqlayout (&lt;tt&gt;/trunk&lt;/tt&gt;,&lt;tt&gt;/branches&lt;/tt&gt; and &lt;tt&gt;/tags&lt;/tt&gt;) will created after opening the fresh repository.</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index 5238574..e060c20 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -42,7 +42,7 @@
                     <property name="text">
                         <string>Repository to dump:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -53,7 +53,7 @@
                     <property name="text">
                         <string>Dump into:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -105,7 +105,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -118,7 +118,7 @@
                     <property name="text">
                         <string>End revision:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -129,7 +129,7 @@
                     <property name="text">
                         <string>Start revision:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index 9c5ffba..00fb964 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 children of the folder.");
+        "will set the property only on the file tqchildren 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 children of the folder.");
+        "will set the property only on the file tqchildren 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/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui
index 68aa585..c0bab16 100644
--- a/src/svnfrontend/editpropsdlg.ui
+++ b/src/svnfrontend/editpropsdlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>107</width>
                             <height>20</height>
@@ -79,7 +79,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout24</cstring>
+                <cstring>tqlayout24</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -105,7 +105,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout23</cstring>
+                        <cstring>tqlayout23</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -121,7 +121,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>60</height>
@@ -154,7 +154,7 @@
                                     <property name="name">
                                         <cstring>helpButton</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>36</width>
                                             <height>36</height>
@@ -185,7 +185,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>50</height>
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index 812ee69..a285590 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -118,7 +118,7 @@ void FileListViewItem::setStat(const svn::StatusPtr&stat)
     init();
 }
 
-void FileListViewItem::refreshStatus(bool childs,TQPtrList<SvnItem>*exclude,bool depsonly)
+void FileListViewItem::refreshtqStatus(bool childs,TQPtrList<SvnItem>*exclude,bool depsonly)
 {
     FileListViewItem*it;
 
@@ -133,18 +133,18 @@ void FileListViewItem::refreshStatus(bool childs,TQPtrList<SvnItem>*exclude,bool
     it = static_cast<FileListViewItem*>(parent());
     if (!childs) {
         if (it && (!exclude || exclude->find(it)==-1)) {
-            it->refreshStatus(false,exclude);
+            it->refreshtqStatus(false,exclude);
         }
     } else if (firstChild()){
         it = static_cast<FileListViewItem*>(firstChild());
         while (it) {
             if (!exclude || exclude->find(it)==-1) {
-                it->refreshStatus(true,exclude);
+                it->refreshtqStatus(true,exclude);
             }
             it = static_cast<FileListViewItem*>(it->nextSibling());
         }
     }
-    repaint();
+    tqrepaint();
 }
 
 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").arg(cmtRev()));
+    setText(COL_LAST_REV,TQString("%1").tqarg(cmtRev()));
     setText(COL_IS_LOCKED,lockOwner());
 }
 
@@ -228,7 +228,7 @@ void FileListViewItem::removeChilds()
     }
 }
 
-void FileListViewItem::updateStatus(const svn::StatusPtr&s)
+void FileListViewItem::updatetqStatus(const svn::StatusPtr&s)
 {
     setStat(s);
 }
@@ -247,11 +247,11 @@ SvnItem* FileListViewItem::getParentItem()const
     return temp->fullName();
 }
 
-void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
 {
     bool colors = Kdesvnsettings::colored_state();
     if (!colors||m_bgColor==NONE) {
-        KListViewItem::paintCell(p,cg,column,width,alignment);
+        KListViewItem::paintCell(p,cg,column,width,tqalignment);
         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,alignment);
+            KListViewItem::paintCell(p,cg,column,width,tqalignment);
             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, alignment);
+    TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
 }
 
 const svn::Revision&FileListViewItem::correctPeg()const
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index c1685fa..cc82456 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -44,8 +44,8 @@ public:
     virtual ~FileListViewItem();
     virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
 
-    virtual void updateStatus(const svn::StatusPtr&s);
-    virtual void refreshStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false);
+    virtual void updatetqStatus(const svn::StatusPtr&s);
+    virtual void refreshtqStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false);
 
 #if 0
     virtual void refreshMe();
@@ -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 alignment);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
     virtual void setOpen(bool o);
     virtual void setOpenNoBlock(bool o);
 
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index 92c805e..e2ee7f4 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").arg(i));
+            m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").tqarg(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 ee7f673..048711e 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string>Enter URL:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -96,7 +96,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -134,7 +134,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -144,7 +144,7 @@
                     <property name="name">
                         <cstring>m_DepthSelector</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/src/svnfrontend/fronthelpers/cursorstack.h b/src/svnfrontend/fronthelpers/cursorstack.h
index cadad9b..4daf061 100644
--- a/src/svnfrontend/fronthelpers/cursorstack.h
+++ b/src/svnfrontend/fronthelpers/cursorstack.h
@@ -39,7 +39,7 @@ public:
      * Create instance and changes the application cursor to \a c
      * \param c cursortype to set.
      */
-    CursorStack(TQt::CursorShape c = TQt::WaitCursor)
+    CursorStack(TQt::tqCursorShape c = TQt::WaitCursor)
     {
         KApplication::setOverrideCursor(TQCursor(c));
     }
diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp
index 7dd0d9d..1b9a2d2 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()->repaint();
+    viewport()->tqrepaint();
 }
 
 void Propertylist::clear()
diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
index 1cd37f6..e21eaca 100644
--- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
+++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
@@ -21,7 +21,7 @@
 #include "helpers/sub2qt.h"
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <knuminput.h>
 #include <kdatetimewidget.h>
@@ -36,8 +36,8 @@ Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name)
     m_endRevInput->setRange(0,INT_MAX,1,false);
     m_startRevInput->setValue(1);
     m_endRevInput->setValue(1);
-    m_startDateInput->setDateTime(TQDateTime::currentDateTime ());
-    m_stopDateInput->setDateTime(TQDateTime::currentDateTime ());
+    m_startDateInput->setDateTime(TQDateTime::tqcurrentDateTime ());
+    m_stopDateInput->setDateTime(TQDateTime::tqcurrentDateTime ());
     m_stopDateInput->setEnabled(false);
     m_startDateInput->setEnabled(false);
     m_stopHeadButton->setChecked(true);
@@ -186,8 +186,8 @@ void Rangeinput_impl::setStartOnly(bool theValue)
         m_startRevBox->setTitle(i18n( "Start with revision" ));
     }
     updateGeometry();
-    setMinimumSize(minimumSizeHint());
-    resize( TQSize(397, 272).expandedTo(minimumSizeHint()) );
+    setMinimumSize(tqminimumSizeHint());
+    resize( TQSize(397, 272).expandedTo(tqminimumSizeHint()) );
 }
 
 #include "rangeinput_impl.moc"
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index 89d36f7..bb2bb3c 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").arg(it1.data().rev);
+        res = i18n("Deleted at revision %1").tqarg(it1.data().rev);
     break;
     case 'A':
         res = i18n("Added at revision %1 as %2")
-            .arg(it1.data().rev)
-            .arg(it1.data().name);
+            .tqarg(it1.data().rev)
+            .tqarg(it1.data().name);
     break;
     case 'C':
     case 1:
-        res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
+        res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
     break;
     case 2:
-        res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
+        res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
     break;
     case 'M':
-        res = i18n("Modified at revision %1").arg(it1.data().rev);
+        res = i18n("Modified at revision %1").tqarg(it1.data().rev);
     break;
     case 'R':
-        res = i18n("Replaced at revision %1").arg(it1.data().rev);
+        res = i18n("Replaced at revision %1").tqarg(it1.data().rev);
         break;
     default:
-        res=i18n("Revision %1").arg(it1.data().rev);
+        res=i18n("Revision %1").tqarg(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.").arg(dotTmpFile->name()));
+        showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name()));
         return;
     }
 
@@ -481,7 +481,7 @@ void RevGraphView::dumpRevtree()
     for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) {
         *stream << "  " << it1.key()
             << "[ "
-            << "shape=box, "
+            << "tqshape=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").arg(renderProcess->args()[c].data());
+            arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data());
         }
-        TQString error = i18n("Could not start process \"%1\".").arg(arguments);
+        TQString error = i18n("Could not start process \"%1\".").tqarg(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>").arg(it.data().name);
+        res+=TQString("<b>%1</b>").tqarg(it.data().name);
         res += i18n("<br>Revision: %1<br>Author: %2<br>Date: %3<br>Log: %4</html>")
-            .arg(it.data().rev)
-            .arg(it.data().Author)
-            .arg(it.data().Date)
-            .arg(sm);
+            .tqarg(it.data().rev)
+            .tqarg(it.data().Author)
+            .tqarg(it.data().Date)
+            .tqarg(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").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+=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+="</table></body></html>";
     }
     return res;
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index 152a2b7..335994e 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -42,7 +42,7 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 
 #define INTERNALCOPY 1
@@ -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").arg(i18n("No logcache possible due broken database and networking not allowed.")));
+                KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(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").arg(ce.msg()));
+        KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(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").arg(origin),true);
+        parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(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")
-                        .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
+                        .tqarg(olabel).tqarg(i).tqarg(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").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
+                label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(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").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
+                label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(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\"").arg(res);
+    res = "\""+n+TQString("_%1\"").tqarg(res);
     return res;
 }
 
diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp
index 171e688..2652e3c 100644
--- a/src/svnfrontend/graphtree/revtreewidget.cpp
+++ b/src/svnfrontend/graphtree/revtreewidget.cpp
@@ -23,7 +23,7 @@
 #include <tqvariant.h>
 #include <tqsplitter.h>
 #include <ktextbrowser.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include "revgraphview.h"
@@ -44,7 +44,7 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
     m_Splitter->setOrientation( Qt::Vertical );
 
     m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" );
-    m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) );
+    m_RevGraphView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) );
     connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&)));
     connect(m_RevGraphView,
                     TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
@@ -63,10 +63,10 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
            );
 
     m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" );
-    m_Detailstext->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) );
+    m_Detailstext->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) );
     m_Detailstext->setResizePolicy( KTextBrowser::Manual );
     RevTreeWidgetLayout->addWidget( m_Splitter );
-    resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
+    resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
     TQValueList<int> list = Kdesvnsettings::tree_detail_height();
     if (list.count()==2 && (list[0]>0||list[1]>0)) {
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index 6dd3193..a226642 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="text">
                         <string>Destination folder:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -58,7 +58,7 @@
                     <property name="text">
                         <string>Repository to copy:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index 62637e8..5d3d113 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
@@ -81,7 +81,7 @@ bool Importdir_logmsg::createDir()
 
 void Importdir_logmsg::createDirboxDir(const TQString & which)
 {
-    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which));
+    m_createDirBox->setText(i18n("Create subdir %1 on import").tqarg(which.isEmpty()?i18n("(Last part)"):which));
 }
 
 #include "importdir_logmsg.moc"
diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp
index 1d60730..fb8795b 100644
--- a/src/svnfrontend/itemdisplay.cpp
+++ b/src/svnfrontend/itemdisplay.cpp
@@ -82,13 +82,13 @@ bool ItemDisplay::filterOut(const SvnItem*item)
 
 
 /*!
-    \fn ItemDisplay::filterOut(const svn::Status&)
+    \fn ItemDisplay::filterOut(const svn::tqStatus&)
  */
 bool ItemDisplay::filterOut(const svn::StatusPtr&item)
 {
     bool res = false;
 
-    if (!item->validReposStatus()) {
+    if (!item->validRepostqStatus()) {
         if ((!Kdesvnsettings::display_unknown_files() && !item->isVersioned()) ||
             (Kdesvnsettings::hide_unchanged_files() && item->isRealVersioned() && !item->isModified() && !item->entry().isDir())) {
             res = true;
diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h
index 2c3ffbc..f4d1f28 100644
--- a/src/svnfrontend/itemdisplay.h
+++ b/src/svnfrontend/itemdisplay.h
@@ -32,7 +32,7 @@ class SvnItem;
 
 namespace svn
 {
-    class Status;
+    class tqStatus;
 }
 
 class ItemDisplay
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 470a266..0c4070c 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -31,7 +31,7 @@
                     <property name="text">
                         <string>Load into folder:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -48,7 +48,7 @@
                     <property name="text">
                         <string>Dump file:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string>Load into repository:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 547b07b..82aea40 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -52,7 +52,7 @@
                             <property name="text">
                                 <string>Source 1:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -68,7 +68,7 @@
                             <property name="text">
                                 <string>Source 2:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -79,7 +79,7 @@
                             <property name="text">
                                 <string>Output to:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -87,7 +87,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -145,7 +145,7 @@
             <property name="name">
                 <cstring>m_RangeInput</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>40</width>
                     <height>40</height>
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index b0c1d87..44a07c5 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool s
         m_OutLabel->hide();
     }
     adjustSize();
-    setMinimumSize(minimumSizeHint());
+    setMinimumSize(tqminimumSizeHint());
     m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default());
 }
 
@@ -190,7 +190,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for
     dlg.setHelp("merging-items","tdesvn");
     TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
     ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false);
-    dlg.resize( TQSize(480,360).expandedTo(dlg.minimumSizeHint()) );
+    dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) );
     if (dlg.exec()!=TQDialog::Accepted) {
         return false;
     }
diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp
index 717b0c2..ec1f24d 100644
--- a/src/svnfrontend/propertiesdlg.cpp
+++ b/src/svnfrontend/propertiesdlg.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <klocale.h>
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index 305d5d6..e67d126 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -27,7 +27,7 @@
 #include <twin.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwidgetlist.h>
 #include <kprogress.h>
@@ -49,15 +49,15 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt
     mCancelText = actionButton(KDialogBase::Cancel)->text();
 
     TQFrame* mainWidget = plainPage();
-    layout = new TQVBoxLayout(mainWidget, 10);
+    tqlayout = new TQVBoxLayout(mainWidget, 10);
     mLabel = new TQLabel(text, mainWidget);
-    layout->addWidget(mLabel);
+    tqlayout->addWidget(mLabel);
     m_ProgressBar=new KProgress(15,mainWidget);
     m_ProgressBar->setCenterIndicator (false);
     m_ProgressBar->setTextEnabled(false);
-    layout->addWidget(m_ProgressBar);
+    tqlayout->addWidget(m_ProgressBar);
     m_NetBar = new KProgress(15,mainWidget);
-    layout->addWidget(m_NetBar);
+    tqlayout->addWidget(m_NetBar);
 
     mWait = false;
     m_LogWindow = 0;
@@ -162,9 +162,9 @@ void StopDlg::slotExtraMessage(const TQString&msg)
     if (!m_LogWindow) {
         TQFrame* mainWidget = plainPage();
         m_LogWindow = new KTextBrowser(mainWidget);
-        layout->addWidget(m_LogWindow);
+        tqlayout->addWidget(m_LogWindow);
         m_LogWindow->show();
-        resize( TQSize(500, 400).expandedTo(minimumSizeHint()) );
+        resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()) );
     }
     if (m_lastLogLines >= Kdesvnsettings::self()->cmdline_log_minline() &&
         isHidden() ) {
@@ -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").arg(s1).arg(s2));
+            m_NetBar->setFormat(i18n("%1 of %2").tqarg(s1).tqarg(s2));
             m_NetBar->setTotalSteps(max);
         }
         if (max == -1) {
-            m_NetBar->setFormat(i18n("%1 transferred.").arg(s1));
+            m_NetBar->setFormat(i18n("%1 transferred.").tqarg(s1));
             m_NetBar->setTotalSteps(current+1);
         }
         m_NetBar->setValue(current);
diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h
index 635957f..973d30e 100644
--- a/src/svnfrontend/stopdlg.h
+++ b/src/svnfrontend/stopdlg.h
@@ -62,7 +62,7 @@ protected:
     bool m_netBarShown;
     TQTime m_StopTick;
     KTextBrowser*m_LogWindow;
-    TQVBoxLayout*layout;
+    TQVBoxLayout*tqlayout;
 
     TQString m_lastLog;
     unsigned int m_lastLogLines;
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 6374ac5..6e102ea 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -78,10 +78,10 @@
 #include <tqstring.h>
 #include <tqmap.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvaluelist.h>
 #include <tqvbox.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqregexp.h>
 #include <tqimage.h>
 #include <tqthread.h>
@@ -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").arg(info.url().mid(reposRoot.length())),
+    KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").tqarg(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")).arg(disp),false,"cat_display_dlg");
+        KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).tqarg(disp),false,"cat_display_dlg");
         if (dlg) {
             ptr->setFont(KGlobalSettings::fixedFont());
             ptr->setWordWrap(TQTextEdit::NoWrap);
@@ -791,7 +791,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const
                 text+=rb+i18n("Lock comment")+cs+
                     (*it).lockEntry().Comment()+re;
             } else {
-                svn::SharedPointer<svn::Status> d;
+                svn::SharedPointer<svn::tqStatus> d;
                 if (checkReposLockCache(_what,d)&& d && d->lockEntry().Locked()) {
                     text+=rb+i18n("Lock token")+cs+(d->lockEntry().Token())+re;
                     text+=rb+i18n("Owner")+cs+(d->lockEntry().Owner())+re;
@@ -876,7 +876,7 @@ void SvnActions::slotProperties()
     TQValueList<TQString> delList;
     dlg.changedItems(setList,delList);
     changeProperties(setList,delList,k->fullName());
-    k->refreshStatus();
+    k->refreshtqStatus();
     EMIT_FINISHED;
 }
 
@@ -972,18 +972,18 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
             for (unsigned int i = 0; i < _Cache.count();++i) {
                 _p = _Cache[i]->path();
                 if (_Cache[i]->isRealVersioned()&& (
-                    _Cache[i]->textStatus()==svn_wc_status_modified||
-                    _Cache[i]->textStatus()==svn_wc_status_added||
-                    _Cache[i]->textStatus()==svn_wc_status_replaced||
-                    _Cache[i]->textStatus()==svn_wc_status_deleted||
-                    _Cache[i]->propStatus()==svn_wc_status_modified
+                    _Cache[i]->texttqStatus()==svn_wc_status_modified||
+                    _Cache[i]->texttqStatus()==svn_wc_status_added||
+                    _Cache[i]->texttqStatus()==svn_wc_status_replaced||
+                    _Cache[i]->texttqStatus()==svn_wc_status_deleted||
+                    _Cache[i]->proptqStatus()==svn_wc_status_modified
                 ) ) {
-                    if (_Cache[i]->textStatus()==svn_wc_status_deleted) {
+                    if (_Cache[i]->texttqStatus()==svn_wc_status_deleted) {
                         _check.append(Logmsg_impl::logActionEntry(_p,i18n("Delete"),Logmsg_impl::logActionEntry::DELETE));
                     } else {
                         _check.append(Logmsg_impl::logActionEntry(_p,i18n("Commit"),Logmsg_impl::logActionEntry::COMMIT));
                     }
-                } else if (_Cache[i]->textStatus()==svn_wc_status_missing) {
+                } else if (_Cache[i]->texttqStatus()==svn_wc_status_missing) {
                     _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Delete and Commit"),Logmsg_impl::logActionEntry::MISSING_DELETE));
                 } else if (!_Cache[i]->isVersioned()) {
                     _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Add and Commit"),Logmsg_impl::logActionEntry::ADD_COMMIT));
@@ -1031,7 +1031,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
         return false;
     }
     EMIT_REFRESH;
-    emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString()));
+    emit sendNotify(i18n("Committed revision %1.").tqarg(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").arg(tdir.name()).arg("/svndiff");
+    TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/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").arg(tdir.name()).arg("/svndiff");
+    TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/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");
@@ -1458,8 +1458,8 @@ void SvnActions::prepareUpdate(bool ask)
             return;
         }
         rdlg->setStartOnly(true);
-        /* just here cause layout has changed meanwhile */
-        dlg->resize( TQSize(120,60).expandedTo(dlg->minimumSizeHint()) );
+        /* just here cause tqlayout has changed meanwhile */
+        dlg->resize( TQSize(120,60).expandedTo(dlg->tqminimumSizeHint()) );
         int result;
         if ((result=dlg->exec())==TQDialog::Accepted) {
             Rangeinput_impl::revision_range range = rdlg->getRange();
@@ -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>")
-                .arg(cur->fullName()));
+                .tqarg(cur->fullName()));
             return;
         }
         items.push_back(svn::Path(cur->fullName()));
@@ -1521,7 +1521,7 @@ void SvnActions::makeAdd(bool rec)
 #if 0
     while ((cur=liter.current())!=0){
         ++liter;
-        //cur->refreshStatus();
+        //cur->refreshtqStatus();
 
         //emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent()));
     }
@@ -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>")
-                    .arg(cur->fullName()));
+                    .tqarg(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.").arg(nnum.toString()));
+        emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString()));
     }
     EMIT_REFRESH;
     return true;
@@ -2295,15 +2295,15 @@ void SvnActions::makeUnlock(const TQStringList&what,bool breakit)
 
 
 /*!
-    \fn SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist)
+    \fn SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist)
  */
-bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
+bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
 {
     bool display_ignores = Kdesvnsettings::display_ignored_files();
-    return makeStatus(what,dlist,where,rec,all,display_ignores);
+    return maketqStatus(what,dlist,where,rec,all,display_ignores);
 }
 
-bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
+bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
 {
     bool disp_remote_details = Kdesvnsettings::details_on_remote_listing();
     TQString ex;
@@ -2326,7 +2326,7 @@ void SvnActions::checkAddItems(const TQString&path,bool print_error_box)
     svn::StatusEntries rlist;
     TQStringList displist;
     svn::Revision where = svn::Revision::HEAD;
-    if (!makeStatus(path,dlist,where,true,true,false,false)) {
+    if (!maketqStatus(path,dlist,where,true,true,false,false)) {
         return;
     }
     for (unsigned int i = 0; i<dlist.size();++i) {
@@ -2402,7 +2402,7 @@ void SvnActions::stopFillCache()
         }
         delete m_FCThread;
         m_FCThread = 0;
-        emit sigCacheStatus(-1,-1);
+        emit sigCachetqStatus(-1,-1);
     }
 }
 
@@ -2446,14 +2446,14 @@ void SvnActions::checkModthread()
     for (unsigned int i = 0; i < m_CThread->getList().count();++i) {
         svn::StatusPtr ptr = m_CThread->getList()[i];
         if (m_CThread->getList()[i]->isRealVersioned()&& (
-            m_CThread->getList()[i]->textStatus()==svn_wc_status_modified||
-            m_CThread->getList()[i]->textStatus()==svn_wc_status_added||
-            m_CThread->getList()[i]->textStatus()==svn_wc_status_deleted||
-            m_CThread->getList()[i]->textStatus()==svn_wc_status_replaced||
-            m_CThread->getList()[i]->propStatus()==svn_wc_status_modified
+            m_CThread->getList()[i]->texttqStatus()==svn_wc_status_modified||
+            m_CThread->getList()[i]->texttqStatus()==svn_wc_status_added||
+            m_CThread->getList()[i]->texttqStatus()==svn_wc_status_deleted||
+            m_CThread->getList()[i]->texttqStatus()==svn_wc_status_replaced||
+            m_CThread->getList()[i]->proptqStatus()==svn_wc_status_modified
          ) ) {
             m_Data->m_Cache.insertKey(ptr,ptr->path());
-        } else if (m_CThread->getList()[i]->textStatus()==svn_wc_status_conflicted) {
+        } else if (m_CThread->getList()[i]->texttqStatus()==svn_wc_status_conflicted) {
             m_Data->m_conflictCache.insertKey(ptr,ptr->path());
         }
     }
@@ -2478,11 +2478,11 @@ void SvnActions::checkUpdateThread()
     bool newer=false;
     for (unsigned int i = 0; i < m_UThread->getList().count();++i) {
         svn::StatusPtr ptr = m_UThread->getList()[i];
-        if (ptr->validReposStatus()) {
+        if (ptr->validRepostqStatus()) {
             m_Data->m_UpdateCache.insertKey(ptr,ptr->path());
-            ptr->textStatus();
-            ptr->propStatus();
-            if (!(ptr->validLocalStatus())) {
+            ptr->texttqStatus();
+            ptr->proptqStatus();
+            if (!(ptr->validLocaltqStatus())) {
                 newer = true;
             }
         }
@@ -2514,7 +2514,7 @@ bool SvnActions::checkUpdatesRunning()
 
 void SvnActions::addModifiedCache(const svn::StatusPtr&what)
 {
-    if (what->textStatus()==svn_wc_status_conflicted) {
+    if (what->texttqStatus()==svn_wc_status_conflicted) {
         m_Data->m_conflictCache.insertKey(what,what->path());
     } else {
         m_Data->m_Cache.insertKey(what,what->path());
@@ -2539,9 +2539,9 @@ bool SvnActions::checkReposLockCache(const TQString&path)
     return m_Data->m_repoLockCache.findSingleValid(path,false);
 }
 
-bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::Status>&t)
+bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::tqStatus>&t)
 {
-    /// @todo create a method where svn::Status* will be a parameter so no copy is needed but just reading content
+    /// @todo create a method where svn::tqStatus* will be a parameter so no copy is needed but just reading content
     return m_Data->m_repoLockCache.findSingleValid(path,t);
 }
 
@@ -2599,7 +2599,7 @@ void SvnActions::customEvent(TQCustomEvent * e)
         return;
     } else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) {
         FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e;
-        emit sigCacheStatus(fev->current(),fev->max());
+        emit sigCachetqStatus(fev->current(),fev->max());
     }
 }
 
@@ -2638,11 +2638,11 @@ void SvnActions::removeFromUpdateCache(const TQStringList&what,bool exact_only)
 
 bool SvnActions::isUpdated(const TQString&path)const
 {
-    svn::SharedPointer<svn::Status> d;
+    svn::SharedPointer<svn::tqStatus> d;
     return m_Data->m_UpdateCache.findSingleValid(path,d);
 }
 
-bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::Status>&d)const
+bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::tqStatus>&d)const
 {
     return m_Data->m_UpdateCache.findSingleValid(path,d);
 }
diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h
index dc7645a..02f0bcb 100644
--- a/src/svnfrontend/svnactions.h
+++ b/src/svnfrontend/svnactions.h
@@ -95,15 +95,15 @@ public:
     void makeLock(const TQStringList&,const TQString&,bool);
     void makeUnlock(const TQStringList&,bool);
 
-    bool makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true);
-    bool makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false);
+    bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true);
+    bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false);
     bool makeList(const TQString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec=false);
 
     bool createModifiedCache(const TQString&base);
     bool checkModifiedCache(const TQString&path);
     bool checkConflictedCache(const TQString&path);
     bool checkReposLockCache(const TQString&path);
-    bool checkReposLockCache(const TQString&path,svn::SharedPointer<svn::Status>&t);
+    bool checkReposLockCache(const TQString&path,svn::SharedPointer<svn::tqStatus>&t);
     void addModifiedCache(const svn::StatusPtr&what);
     void deleteFromModifiedCache(const TQString&what);
 
@@ -152,7 +152,7 @@ public:
     bool createUpdateCache(const TQString&what);
     bool checkUpdateCache(const TQString&path)const;
     bool isUpdated(const TQString&path)const;
-    bool getUpdated(const TQString&path,svn::SharedPointer<svn::Status>&d)const;
+    bool getUpdated(const TQString&path,svn::SharedPointer<svn::tqStatus>&d)const;
     void clearUpdateCache();
     void removeFromUpdateCache(const TQStringList&what,bool exact_only);
     void stopCheckModThread();
@@ -242,7 +242,7 @@ signals:
     void sigRefreshIcons(bool);
     void sigExtraLogMsg(const TQString&);
     void sigGotourl(const TQString&);
-    void sigCacheStatus(TQ_LONG,TQ_LONG);
+    void sigCachetqStatus(TQ_LONG,TQ_LONG);
 
 protected slots:
     virtual void wroteStdin(KProcess*);
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index bf772e8..3619f7e 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -28,7 +28,7 @@
 
 #include <tqlabel.h>
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqscrollview.h>
 #include <tqtimer.h>
@@ -46,12 +46,12 @@ SvnFileTip::SvnFileTip(TQScrollView*parent)
 {
     m_iconLabel = new TQLabel(this);
     m_textLabel = new TQLabel(this);
-    m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop);
+    m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
 
-    TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
-    layout->addWidget(m_iconLabel, 0, 0);
-    layout->addWidget(m_textLabel, 0, 1);
-    layout->setResizeMode(TQLayout::Fixed);
+    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0);
+    tqlayout->addWidget(m_iconLabel, 0, 0);
+    tqlayout->addWidget(m_textLabel, 0, 1);
+    tqlayout->setResizeMode(TQLayout::Fixed);
 
     setPalette( TQToolTip::palette() );
     setMargin( 1 );
@@ -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" ).arg( names[m_corner] ) ) );
+        m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) );
 
     TQPixmap &pix = m_corners[m_corner];
 
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index dee0435..55015a3 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -68,7 +68,7 @@ protected:
 };
 
 SvnItem_p::SvnItem_p()
-    :ref_count(),m_Stat(new svn::Status())
+    :ref_count(),m_Stat(new svn::tqStatus())
 {
     init();
 }
@@ -238,11 +238,11 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
         SvnActions*wrap = getWrapper();
         bool mod = false;
         TQPixmap p2 = TQPixmap();
-        if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) {
+        if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) {
             m_bgColor = CONFLICT;
             if (overlay)
                 p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size);
-        } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) {
+        } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) {
             m_bgColor = MISSING;
         } else if (isLocked()||wrap->checkReposLockCache(fullName())) {
             if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size);
@@ -253,10 +253,10 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
         } else if (wrap->isUpdated(p_Item->m_Stat->path())) {
             if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size);
             m_bgColor = UPDATES;
-        } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) {
+        } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) {
             if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",KIcon::Desktop,size);
             m_bgColor = DELETED;
-        } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) {
+        } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) {
             if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",KIcon::Desktop,size);
             m_bgColor = ADDED;
         } else if (isModified()) {
@@ -358,26 +358,26 @@ bool SvnItem::isRealVersioned()const
 
 bool SvnItem::isIgnored()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_ignored;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_ignored;
 }
 
 bool SvnItem::isRemoteAdded()const
 {
     return getWrapper()->isUpdated(p_Item->m_Stat->path()) &&
-            p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus();
+            p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus();
 }
 
 TQString SvnItem::infoText()const
 {
     TQString info_text = "";
     if (getWrapper()->isUpdated(p_Item->m_Stat->path())) {
-        if (p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus()) {
+        if (p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus()) {
             info_text = i18n("Added in repository");
         } else {
             info_text = i18n("Needs update");
         }
     } else {
-    switch(p_Item->m_Stat->textStatus ()) {
+    switch(p_Item->m_Stat->texttqStatus ()) {
     case svn_wc_status_modified:
         info_text = i18n("Locally modified");
         break;
@@ -412,7 +412,7 @@ TQString SvnItem::infoText()const
         break;
     }
     if (info_text.isEmpty()) {
-        switch (p_Item->m_Stat->propStatus ()) {
+        switch (p_Item->m_Stat->proptqStatus ()) {
         case svn_wc_status_modified:
             info_text = i18n("Property modified");
             break;
@@ -444,7 +444,7 @@ TQString SvnItem::lockOwner()const
     if (p_Item->m_Stat->entry().lockEntry().Locked()) {
         return p_Item->m_Stat->entry().lockEntry().Owner();
     }
-    svn::SharedPointer<svn::Status> tmp;
+    svn::SharedPointer<svn::tqStatus> tmp;
     if (getWrapper()->checkReposLockCache(fullName(),tmp) && tmp) {
         return tmp->lockEntry().Owner();
     }
@@ -457,8 +457,8 @@ TQString SvnItem::lockOwner()const
  */
 bool SvnItem::isModified()const
 {
-    return p_Item->m_Stat->textStatus ()==svn_wc_status_modified||p_Item->m_Stat->propStatus()==svn_wc_status_modified
-            ||p_Item->m_Stat->textStatus ()==svn_wc_status_replaced;
+    return p_Item->m_Stat->texttqStatus ()==svn_wc_status_modified||p_Item->m_Stat->proptqStatus()==svn_wc_status_modified
+            ||p_Item->m_Stat->texttqStatus ()==svn_wc_status_replaced;
 }
 
 const svn::StatusPtr& SvnItem::stat()const
@@ -472,22 +472,22 @@ const svn::StatusPtr& SvnItem::stat()const
  */
 bool SvnItem::isNormal()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_normal;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_normal;
 }
 
 bool SvnItem::isMissing()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_missing;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_missing;
 }
 
 bool SvnItem::isDeleted()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_deleted;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted;
 }
 
 bool SvnItem::isConflicted()const
 {
-    return p_Item->m_Stat->textStatus()==svn_wc_status_conflicted;
+    return p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted;
 }
 
 /*!
diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h
index 76c2533..11458fa 100644
--- a/src/svnfrontend/svnitem.h
+++ b/src/svnfrontend/svnitem.h
@@ -68,7 +68,7 @@ public:
     virtual TQString getParentDir()const=0;
     virtual SvnItem* getParentItem()const=0;
     virtual const svn::Revision&correctPeg()const=0;
-    virtual void refreshStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false)=0;
+    virtual void refreshtqStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false)=0;
 
     TQPixmap getPixmap(int size,bool overlay=true);
     TQPixmap getPixmap(const TQPixmap&,int size,bool overlay=true);
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index 5b1ca1e..1c139cb 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -81,7 +81,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>107</width>
                             <height>20</height>
@@ -246,7 +246,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>42</width>
                             <height>20</height>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index fb14366..a81ce18 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -38,7 +38,7 @@
 #include <tqdatetime.h>
 #include <tqheader.h>
 #include <tqsplitter.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpopupmenu.h>
 
 #include <list>
@@ -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").arg(_revision));
+    setText(COL_REV,TQString("%1").tqarg(_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").arg(e.copyFromPath).arg(e.copyFromRevision));
+        setText(2,i18n("%1 at revision %2").tqarg(e.copyFromPath).tqarg(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").arg(what));
+        setCaption(i18n("SVN Log of %1").tqarg(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").arg( desk.width()),
+    Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()),
         TQString::number( sizeToSave.width()), true, false);
-    Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
+    Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()),
         TQString::number( sizeToSave.height()), true, false);
 }
 
@@ -455,11 +455,11 @@ TQSize SvnLogDlgImp::dialogSize()
     int w, h;
     int scnum = TQApplication::desktop()->screenNumber(parentWidget());
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
-    w = sizeHint().width();
-    h = sizeHint().height();
+    w = tqsizeHint().width();
+    h = tqsizeHint().height();
     KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
-    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 );
+    w = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()), w );
+    h = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()), h );
     return( TQSize( w, h ) );
 }
 
diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp
index 486af86..53d7892 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.").arg(s1).arg(s2);
+        msg = i18n("%1 of %2 transferred.").tqarg(s1).tqarg(s2);
     } else {
-        msg = i18n("%1 transferred.").arg(s1);
+        msg = i18n("%1 transferred.").tqarg(s1);
     }
     _notify->msg = msg;
     ev->setData((void*)_notify);
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 23563fd..131ea18 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -65,7 +65,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqregexp.h>
@@ -235,7 +235,7 @@ tdesvnfilelist::tdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons
             this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)));
     connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&)));
 
-    connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)));
+    connect(m_SvnWrapper,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)));
     connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions()));
 
     m_pList->connectDirTimer(TQT_TQOBJECT(this));
@@ -655,7 +655,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
     }
     // prevent this from checking unversioned folder. FIXME: what happen when we do open url on a non-working-copy folder??
     if (!isWorkingCopy()|| (!_parent) || ((_parent) && (_parent->isVersioned()))) {
-        if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision) ) {
+        if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) {
             kdDebug() << "unable makeStatus" <<endl;
             return false;
         }
@@ -682,7 +682,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
 
         // current item is not versioned
         if (!(*it)->isVersioned() && !filterOut((*it))) {
-            // if empty, we may want to create a default svn::Status for each folder inside this _parent
+            // if empty, we may want to create a default svn::tqStatus for each folder inside this _parent
             // iterate over TQDir and create new filelistviewitem
             checkUnversionedDirs(_parent);
         }
@@ -706,7 +706,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
     if (ownupdates) {
         kdDebug()<<"Enable update"<<endl;
         viewport()->setUpdatesEnabled(true);
-        viewport()->repaint();
+        viewport()->tqrepaint();
     }
     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()->repaint();
+            viewport()->tqrepaint();
             viewport()->setUpdatesEnabled(false);
             _t.restart();
         }*/
@@ -756,7 +756,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl
 void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k)
 {
     if (k) {
-        k->refreshStatus();
+        k->refreshtqStatus();
     }
     if (!isWorkingCopy()) {
         if (k) {
@@ -779,7 +779,7 @@ void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k)
     }
     svn::StatusPtr stat;
     try {
-        stat = m_SvnWrapper->svnclient()->singleStatus(newdir);
+        stat = m_SvnWrapper->svnclient()->singletqStatus(newdir);
     } catch (const svn::ClientException&e) {
         m_LastException = e.msg();
         kdDebug()<<"Catched on singlestatus"<< endl;
@@ -1051,7 +1051,7 @@ void tdesvnfilelist::slotClientException(const TQString&what)
 void tdesvnfilelist::slotNotifyMessage(const TQString&what)
 {
     emit sigLogMessage(what);
-    kapp->processEvents(20);
+    kapp->tqprocessEvents(20);
 }
 
 void tdesvnfilelist::slotChangeToRepository()
@@ -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").arg(feditor).arg(fki->fullName()));
+            KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName()));
         }
     }
 }
@@ -1115,7 +1115,7 @@ void tdesvnfilelist::slotCleanupAction()
     if (!which) which = static_cast<FileListViewItem*>(firstChild());
     if (!which||!which->isDir()) return;
     if (m_SvnWrapper->makeCleanup(which->fullName())) {
-        which->refreshStatus(true);
+        which->refreshtqStatus(true);
     }
 }
 
@@ -1126,7 +1126,7 @@ void tdesvnfilelist::slotResolved()
     if (!which) which = static_cast<FileListViewItem*>(firstChild());
     if (!which) return;
     m_SvnWrapper->slotResolved(which->fullName());
-    which->refreshStatus(true);
+    which->refreshtqStatus(true);
     slotRescanIcons(false);
 }
 
@@ -1273,7 +1273,7 @@ void tdesvnfilelist::refreshCurrentTree()
     if (item->fullName()==baseUri()) {
         if (!refreshItem(item)) {
             setUpdatesEnabled(true);
-            viewport()->repaint();
+            viewport()->tqrepaint();
             return;
         } else {
             refreshRecursive(item);
@@ -1286,7 +1286,7 @@ void tdesvnfilelist::refreshCurrentTree()
     }
     kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl;
     setUpdatesEnabled(true);
-    viewport()->repaint();
+    viewport()->tqrepaint();
     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()->repaint();
+    viewport()->tqrepaint();
 }
 
 bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
@@ -1327,7 +1327,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
     TQString what = (_parent!=0?_parent->fullName():baseUri());
     svn::StatusEntries dlist;
 
-    if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) {
+    if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) {
         kdDebug()<<"Fehler bei makestatus fuer "<<what <<endl;
         return false;
     }
@@ -1351,7 +1351,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
             ++clistIter;
             if (k->fullName()==(*it)->path()) {
                 currentSync.removeRef(k);
-                k->updateStatus(*it);
+                k->updatetqStatus(*it);
                 if (filterOut(k)) {
                     dispchanged=true;
                     delete k;
@@ -1657,7 +1657,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event)
         if (tmpRect!=m_pList->mOldDropHighlighter) {
             cleanHighLighter();
             m_pList->mOldDropHighlighter=tmpRect;
-            viewport()->repaint(tmpRect);
+            viewport()->tqrepaint(tmpRect);
             kapp->processEvents();
         }
     }
@@ -1673,7 +1673,7 @@ void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev)
     KListView::viewportPaintEvent(ev);
     if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) {
         TQPainter painter(viewport());
-        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(),
+        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, tqcolorGroup(),
                 TQStyle::Style_FocusAtBorder);
     }
 }
@@ -1683,7 +1683,7 @@ void tdesvnfilelist::cleanHighLighter()
     if (m_pList->mOldDropHighlighter.isValid()) {
         TQRect rect=m_pList->mOldDropHighlighter;
         m_pList->mOldDropHighlighter=TQRect();
-        viewport()->repaint(rect, true);
+        viewport()->tqrepaint(rect, true);
     }
 }
 
@@ -2038,7 +2038,7 @@ void tdesvnfilelist::dispDummy()
     TQLabel dummy(this,0,WStyle_NoBorder|WShowModal);
     TQSize csize = size();
     dummy.setText(i18n("Please wait until job is finished"));
-    dummy.resize(dummy.minimumSizeHint());
+    dummy.resize(dummy.tqminimumSizeHint());
     if (dummy.width()<=width()&&dummy.height()<=height()) {
         dummy.move(csize.width()/2-dummy.width()/2,csize.height()/2-dummy.height()/2);
     }
@@ -2307,7 +2307,7 @@ void tdesvnfilelist::slotMkBaseDirs()
     targets.append(parentDir+"/trunk");
     targets.append(parentDir+"/branches");
     targets.append(parentDir+"/tags");
-    TQString msg = i18n("Automatic generated base layout by tdesvn");
+    TQString msg = i18n("Automatic generated base tqlayout by tdesvn");
     isopen = m_SvnWrapper->makeMkdir(targets,msg);
     if (isopen) {
         slotDirAdded(targets[0],0);
@@ -2401,9 +2401,9 @@ bool tdesvnfilelist::refreshItem(FileListViewItem*item)
         return false;
     }
     try {
-        item->setStat(svnclient()->singleStatus(item->fullName(),false,m_pList->m_remoteRevision));
+        item->setStat(svnclient()->singletqStatus(item->fullName(),false,m_pList->m_remoteRevision));
     } catch (const svn::ClientException&e) {
-        item->setStat(new svn::Status());
+        item->setStat(new svn::tqStatus());
         return false;
     }
     return true;
@@ -2600,7 +2600,7 @@ void tdesvnfilelist::_dirwatchTimeout()
     m_pList->dirItems.clear();
     viewport()->setUpdatesEnabled(true);
     if (repaintit) {
-//        viewport()->repaint();
+//        viewport()->tqrepaint();
     }
 }
 
@@ -2683,7 +2683,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e )
             FileListViewItem*item = isExecuteArea( vp ) ? static_cast<FileListViewItem*>(itemAt( vp )) : 0L;
 
             if (item) {
-                vp.setY( itemRect( item ).y() );
+                vp.setY( tqitemRect( item ).y() );
                 TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
                 m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0));
                 m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/
@@ -2758,7 +2758,7 @@ void tdesvnfilelist::slotSettingsChanged()
     if (m_pList->reReadSettings()) {
         refreshCurrentTree();
     } else {
-        viewport()->repaint();
+        viewport()->tqrepaint();
     }
     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").arg(path),true,"relocate_dlg");
+    KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg");
     if (dlg) {
         ptr->setStartUrl(fromUrl);
         ptr->disableAppend(true);
@@ -2839,9 +2839,9 @@ void tdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent )
 //             else
 //                 entry.kind = svn_node_file;
 //
-//             svn::Status stat(fi->fileName(), &wc_stat);
+//             svn::tqStatus stat(fi->fileName(), &wc_stat);
 
-            svn::StatusPtr stat(new svn::Status(fi->absFilePath()));
+            svn::StatusPtr stat(new svn::tqStatus(fi->absFilePath()));
 
             // start copying insertDirs
             FileListViewItem * item;
@@ -2886,13 +2886,13 @@ void tdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo
     if (!_s) {
         return;
     }
-    svn::SharedPointer<svn::Status> d;
+    svn::SharedPointer<svn::tqStatus> d;
     while (_s) {
         //_s->makePixmap();
 
         if (!no_update) {
             if (m_SvnWrapper->getUpdated(_s->stat()->path(),d) && d) {
-                _s->updateStatus(d);
+                _s->updatetqStatus(d);
             } else {
                 _s->update();
             }
@@ -3077,7 +3077,7 @@ void tdesvnfilelist::slotUnfoldTree()
                 }
                 if (t.elapsed()>=200) {
                     sdlg.slotTick();
-                    kapp->processEvents(20);
+                    kapp->tqprocessEvents(20);
                     t.restart();
                 }
                 ((FileListViewItem*)item)->setOpenNoBlock(true);
@@ -3087,8 +3087,8 @@ void tdesvnfilelist::slotUnfoldTree()
     }
     setFocus();
     setUpdatesEnabled(true);
-    viewport()->repaint();
-    repaint();
+    viewport()->tqrepaint();
+    tqrepaint();
     m_SvnWrapper->slotCancel(false);
 }
 
@@ -3132,7 +3132,7 @@ void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa
     FileListViewItem* which = singleSelected();
     kdDebug()<<(which?which->fullName():"nix") << " -> " << path<<endl;
     if (which && which->fullName()==path) {
-        which->refreshStatus();
+        which->refreshtqStatus();
         refreshCurrent(which);
         _propListTimeout();
     }
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index b121138..97cb902 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -190,7 +190,7 @@ signals:
     void sigUrlChanged(const TQString&);
     void sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&);
     void sigListError();
-    void sigCacheStatus(TQ_LONG,TQ_LONG);
+    void sigCachetqStatus(TQ_LONG,TQ_LONG);
 
 public slots:
     virtual void refreshCurrentTree();