Rename old tq methods that no longer need a unique name

(cherry picked from commit c3b301575a98e4c3505ad95534d6192b65539dab)

40 files changed, 123 insertions, 123 deletions

diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp
index d4733285..1e18f8e1 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.cpp
+++ b/vcs/clearcase/clearcasefileinfoprovider.cpp
@@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath
     return vcsInfo_;
 }
 
-bool ClearcaseFileinfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
+bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos  ) {
  	
     VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath);
 
diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h
index dcb1d26f..714212db 100644
--- a/vcs/clearcase/clearcasefileinfoprovider.h
+++ b/vcs/clearcase/clearcasefileinfoprovider.h
@@ -32,7 +32,7 @@ public:
     const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
     // -- Async interface for requesting data
-    bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 
 private:
diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp
index 5355b3f0..a7f90ff7 100644
--- a/vcs/clearcase/commentdlg.cpp
+++ b/vcs/clearcase/commentdlg.cpp
@@ -28,7 +28,7 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
   TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
   TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
-  messagelabel->setMinimumSize(messagelabel->tqsizeHint());
+  messagelabel->setMinimumSize(messagelabel->sizeHint());
   tqlayout->addWidget(messagelabel, 0);
 
   _edit = new TQMultiLineEdit(this);
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index c8b7100c..35182376 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>437</height>
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 597415f1..bd8014d8 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -170,7 +170,7 @@ void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date,
 }
 
 
-TQSize AnnotateView::tqsizeHint() const
+TQSize AnnotateView::sizeHint() const
 {
     TQFontMetrics fm(fontMetrics());
     return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing());
@@ -189,7 +189,7 @@ void AnnotateView::maybeTip( const TQPoint & p )
         return;
     }
 
-    TQRect r = tqitemRect( item );
+    TQRect r = itemRect( item );
     //get the dimension of the author + the date column
     TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn);
     headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn));
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index 956c0251..7586616e 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -42,7 +42,7 @@ public:
     void addLine(TQString rev, TQString author, TQDateTime date, TQString content, 
             TQString comment, bool odd);
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     void maybeTip( const TQPoint & p );
 
 private:
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 18deee0f..1e676f43 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry()
     authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress );
     authorName = emailConfig.getSetting( KEMailSettings::RealName );
 
-    TQDate currDate = TQDate::tqcurrentDate();
+    TQDate currDate = TQDate::currentDate();
     date = currDate.toString( "yyyy-MM-dd" );
 }
 
diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui
index 0639364d..06172a80 100644
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@@ -122,7 +122,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>156</width>
                                     <height>20</height>
@@ -254,7 +254,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>421</width>
                                     <height>20</height>
diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui
index eabd9c57..d11b0b70 100644
--- a/vcs/cvsservice/commitdialogbase.ui
+++ b/vcs/cvsservice/commitdialogbase.ui
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>350</width>
                             <height>20</height>
diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index bd06767b..28b28e5b 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const
 
 bool CVSDir::isRegistered( const TQString fileName ) const
 {
-    CVSEntry entry = filetqStatus( fileName );
+    CVSEntry entry = fileStatus( fileName );
     return entry.isValid() && entry.fileName() == fileName;
 }
 
@@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
 {
     if (refreshCache)
         refreshEntriesCache();
@@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap CVSDir::dirtqStatus() const
+VCSFileInfoMap CVSDir::dirStatus() const
 {
     VCSFileInfoMap vcsInfo;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = filetqStatus( fileName );
+        const CVSEntry entry = fileStatus( fileName );
 
         vcsInfo.insert( fileName, entry.toVCSFileInfo() );
     }
@@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirtqStatus() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
+VCSFileInfoMap *CVSDir::cacheableDirStatus() const
 {
     VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = filetqStatus( fileName );
+        const CVSEntry entry = fileStatus( fileName );
 
         vcsInfo->insert( fileName, entry.toVCSFileInfo() );
     }
diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h
index dc7cb53a..1d3f7d85 100644
--- a/vcs/cvsservice/cvsdir.h
+++ b/vcs/cvsservice/cvsdir.h
@@ -46,11 +46,11 @@ public:
     * @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries"
     * @return an empty CVSEntry if the file is not present
     */
-    CVSEntry filetqStatus( const TQString &fileName, bool refreshCache = false ) const;
+    CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const;
     /**
     */
-    VCSFileInfoMap dirtqStatus() const;
-    VCSFileInfoMap *cacheableDirtqStatus() const;
+    VCSFileInfoMap dirStatus() const;
+    VCSFileInfoMap *cacheableDirStatus() const;
     /**
     * @return true if the file is registered into repository, false otherwise
     */
diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index 2ed764f4..cbfc726f 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -59,14 +59,14 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath )
         delete m_cachedDirEntries;
         CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath );
         m_previousDirPath = dirPath;
-        m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
+        m_cachedDirEntries = cvsdir.cacheableDirStatus();
     }
     return m_cachedDirEntries;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
 {
     m_savedCallerData = callerData;
     if (m_requestStatusJob)
@@ -131,11 +131,11 @@ void CVSFileInfoProvider::propagateUpdate()
 
 void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
 {
-    m_cachedDirEntries = dir.cacheableDirtqStatus();
+    m_cachedDirEntries = dir.cacheableDirStatus();
     printOutFileInfoMap( *m_cachedDirEntries );
 
-    /* FileTree will call requesttqStatus() everytime the user expands a directory
-     * Unfortunatly requesttqStatus() will be called before the 
+    /* FileTree will call requestStatus() everytime the user expands a directory
+     * Unfortunatly requestStatus() will be called before the 
      * VCSFileTreeViewItem of the directory will be filled with the files
      * it contains. Meaning, m_savedCallerData contains no childs at that
      * time. When a dcop call is made to run "cvs status" this is no problem.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 {
     TQRegExp rx_recordStart( "^=+$" );
     TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
-    TQRegExp rx_filetqStatus( "Status: (\\.|-|\\s|\\w)+" );
+    TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
     TQRegExp rx_fileWorkRev( "\\bWorking revision:" );
     TQRegExp rx_fileRepoRev( "\\bRepository revision:" );
     //TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" );
@@ -204,7 +204,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
     //TQRegExp rx_stickyOptions( "" ); //@todo
 
     TQString fileName,
-        filetqStatus,
+        fileStatus,
         workingRevision,
         repositoryRevision,
         stickyTag,
@@ -224,12 +224,12 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 
         if (rx_recordStart.exactMatch( s ))
             state = 1;
-        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0)    // FileName
+        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0)    // FileName
         {
             fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
-            filetqStatus = rx_filetqStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+            fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
             ++state; // Next state
-            kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
+            kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
         }
         else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
         {
@@ -266,7 +266,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
         {
             // Package stuff, put into map and get ready for a new record
             VCSFileInfo vcsInfo( fileName, workingRevision, repositoryRevision,
-                String2EnumState( filetqStatus ) );
+                String2EnumState( fileStatus ) );
             kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
             vcsStates->insert( fileName, vcsInfo );
         }
diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h
index ead2d113..0a3d8887 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.h
+++ b/vcs/cvsservice/cvsfileinfoprovider.h
@@ -40,7 +40,7 @@ public:
     virtual const VCSFileInfoMap *status( const TQString &dirPath ) ;
 
 // -- Async interface for requesting data
-    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true  );
+    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true  );
 
 public slots:
     void updateStatusFor( const CVSDir& );
diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui
index 62abbfd5..875bac49 100644
--- a/vcs/cvsservice/cvsformbase.ui
+++ b/vcs/cvsservice/cvsformbase.ui
@@ -197,7 +197,7 @@ Most of the thime you'll just reuse the project name</string>
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>51</width>
                     <height>20</height>
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 6f2894e6..43add3be 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -24,9 +24,9 @@
 // Macros
 ///////////////////////////////////////////////////////////////////////////////
 
-#define default_revert          TQString::tqfromLatin1("-C")
-#define default_diff            TQString::tqfromLatin1("-p")
-#define default_rsh             TQString::tqfromLatin1("")
+#define default_revert          TQString::fromLatin1("-C")
+#define default_diff            TQString::fromLatin1("-p")
+#define default_rsh             TQString::fromLatin1("")
 #define default_contextLines    3
 #define default_compression     0
 
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 17eb8998..30a8a700 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -321,45 +321,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context )
             popup->insertSeparator();
 
         int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+        subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
         // CvsService let to do log and diff operations only on one file (or directory) at time
         if (m_urls.count() == 1)
         {
             id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
-            subMenu->tqsetWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
+            subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases."));
             id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
-            subMenu->tqsetWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
+            subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file."));
             id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) );
-            subMenu->tqsetWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
+            subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file."));
         }
         id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
+        subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files."));
         id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
+        subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited."));
         id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
+        subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files."));
         id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository."));
         id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
+        subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option)."));
         id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
 
         subMenu->insertSeparator();
         id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s)."));
         id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s)."));
         id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
+        subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release."));
         id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."));
 
         subMenu->insertSeparator();
         id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
+        subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file."));
         id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
+        subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file."));
 
         // Now insert in parent menu
         popup->insertItem( i18n("CvsService"), subMenu );
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index f038ac56..8fa5f775 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -211,7 +211,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirect
             kdDebug(9006) << k_funcinfo << " Error: " << cvsdir.path() << " is not a valid CVS directory " << endl;
             return false;
         }
-        CVSEntry entry = cvsdir.filetqStatus( url.fileName() );
+        CVSEntry entry = cvsdir.fileStatus( url.fileName() );
         return entry.isValid();
     }
 }
@@ -639,7 +639,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList )
         return;
     
     CVSDir cvsdir = CVSDir( urlList[0].directory() );
-    CVSEntry entry = cvsdir.filetqStatus( urlList[0].fileName() );
+    CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() );
 
     DiffDialog dlg(entry);
     if (dlg.exec() != TQDialog::Accepted)
diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui
index b4995cb4..6e79b54a 100644
--- a/vcs/cvsservice/diffdialogbase.ui
+++ b/vcs/cvsservice/diffdialogbase.ui
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui
index 933d477f..37af7c1b 100644
--- a/vcs/cvsservice/editorsdialogbase.ui
+++ b/vcs/cvsservice/editorsdialogbase.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui
index 398af4cf..9028b325 100644
--- a/vcs/cvsservice/integrator/fetcherdlgbase.ui
+++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui
@@ -134,7 +134,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui
index 6e5b76f1..82e26c55 100644
--- a/vcs/cvsservice/integrator/initdlg.ui
+++ b/vcs/cvsservice/integrator/initdlg.ui
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui
index 8e7cc979..150ac9bc 100644
--- a/vcs/cvsservice/integrator/integratordlgbase.ui
+++ b/vcs/cvsservice/integrator/integratordlgbase.ui
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui
index f9bea3e9..2d950e5f 100644
--- a/vcs/cvsservice/releaseinputdialogbase.ui
+++ b/vcs/cvsservice/releaseinputdialogbase.ui
@@ -174,7 +174,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>140</width>
                             <height>20</height>
diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui
index 2ac067b3..b4b9ecce 100644
--- a/vcs/cvsservice/tagdialogbase.ui
+++ b/vcs/cvsservice/tagdialogbase.ui
@@ -99,7 +99,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>200</width>
                             <height>20</height>
diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui
index 8d1c3530..f798e42a 100644
--- a/vcs/perforce/integrator/pfintegratordlgbase.ui
+++ b/vcs/perforce/integrator/pfintegratordlgbase.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>435</height>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index dd950121..81252366 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -98,26 +98,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context)
 
         int id = sub->insertItem( i18n("Edit"),
                            this, TQT_SLOT(slotEdit()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
+        sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit."));
         id = sub->insertItem( i18n("Revert"),
                            this, TQT_SLOT(slotRevert()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
+        sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files."));
         id = sub->insertItem( i18n("Submit"),
                            this, TQT_SLOT(slotCommit()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
+        sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot."));
         id = sub->insertItem( i18n("Sync"),
                            this, TQT_SLOT(slotUpdate()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
+        sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace."));
         sub->insertSeparator();
         id = sub->insertItem( i18n("Diff Against Repository"),
                           this, TQT_SLOT(slotDiff()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
+        sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot."));
         id = sub->insertItem( i18n("Add to Repository"),
                            this, TQT_SLOT(slotAdd()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
+        sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot."));
         id = sub->insertItem( i18n("Remove From Repository"),
                            this, TQT_SLOT(slotRemove()) );
-        sub->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
+        sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot."));
         id = popup->insertItem(i18n("Perforce"), sub);
     }
 }
diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui
index d557aa91..d472c8f1 100644
--- a/vcs/subversion/commitdlgbase.ui
+++ b/vcs/subversion/commitdlgbase.ui
@@ -58,7 +58,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui
index 1d03d651..a1818437 100644
--- a/vcs/subversion/integrator/svnintegratordlgbase.ui
+++ b/vcs/subversion/integrator/svnintegratordlgbase.ui
@@ -156,7 +156,7 @@ http://localhost/svn/projectname/trunk</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>131</height>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index c5c341a5..5e2ec8d9 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -239,7 +239,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // 	return false;
 // }
 //
-// int KSvnd::gettqStatus( const KURL::List& list ) {
+// int KSvnd::getStatus( const KURL::List& list ) {
 // 	int result = 0;
 // 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
 // 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -299,18 +299,18 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listtqStatus = gettqStatus( list );
+// 	int listStatus = getStatus( list );
 //
-// 	if ( !(listtqStatus & SomeAreInParentsEntries) &&
-// 	     !(listtqStatus & SomeAreExternalToParent) &&
-// 	     !(listtqStatus & SomeHaveSvn)) {
-// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// 	if ( !(listStatus & SomeAreInParentsEntries) &&
+// 	     !(listStatus & SomeAreExternalToParent) &&
+// 	     !(listStatus & SomeHaveSvn)) {
+// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
 // 			result << "Checkout";
 // 			result << "Export";
 // //			result << "CreateRepository";
 // 			result << "Import";
 // 		}
-// 	} else if ( (listtqStatus & AllAreInParentsEntries) ) {
+// 	} else if ( (listStatus & AllAreInParentsEntries) ) {
 // 		result << "Diff";
 // 		//In SVN
 // //		result << "ShowLog";
@@ -320,7 +320,7 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "Update to revision..."
 // 		result << "Rename";
 // 		result << "Delete";
-// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 // 			result << "Revert";
 // //			result << "Cleanup";
 // 		}
@@ -328,19 +328,19 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 // //		result << "BranchTag";
 // 		result << "Switch";
 // 		result << "Merge";
-// 		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+// 		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 // //			result << "Export";
 // //			result << "Relocate";
 // 			result << "_SEPARATOR_";
 // 			result << "Add";
 // 		}
 // 		result << "_SEPARATOR_";
-// 		if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+// 		if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
 // 			result << "Blame";
 // 		}
 // 		result << "CreatePatch";
 //
-// 		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+// 		if( list.size() == 1 && listStatus & SomeAreFolders) {
 // //			result << "ApplyPatchToFolder";
 // 		}
 // 	}
@@ -349,12 +349,12 @@ TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg)
 //
 // TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
 // 	TQStringList result;
-// 	int listtqStatus = gettqStatus( list );
+// 	int listStatus = getStatus( list );
 //
 //
-// 	if ( ( listtqStatus & AllParentsHaveSvn &&
-// 			( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
-// 				|| ( listtqStatus & SomeHaveSvn ) )
+// 	if ( ( listStatus & AllParentsHaveSvn &&
+// 			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+// 				|| ( listStatus & SomeHaveSvn ) )
 // 		) {
 // 		result << "Update";
 // 		result << "Commit";
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 8ea4e4d5..be0a4411 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -123,14 +123,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
 				if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 				curIdx = rx.cap( 1 ).toInt();
 			}
-			slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+			slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 		}
 	}
 	kdDebug(9036) << " Returning VcsFileInfoMap. provider::status() finished " << endl;
     return m_cachedDirEntries;
 }
 
-bool SVNFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
+bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) {
 	kdDebug(9036) << "##################################################################################### svn provider : request status" << endl;
     m_savedCallerData = callerData;
     // Flush old cache
@@ -210,14 +210,14 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
 			if ( rx.search( *it ) == -1 ) break; // something is wrong ! :)
 			curIdx = rx.cap( 1 ).toInt();
 		}
-		slottqStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
+		slotStatus(path, text_status, prop_status, repos_text_status, repos_prop_status, rev);
 	}
 
 	if ( m_cachedDirEntries )
 		emit statusReady(*m_cachedDirEntries, m_savedCallerData);
 }
 
-void SVNFileInfoProvider::slottqStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
+void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) {
 // 	kdDebug(9036) << "##################################################################################### svn provider : slotstatus"
 // 		<< " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status
 // 		<< " repos_prop_status " << repos_prop_status << " rev " << rev
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index dc1bfe1e..4729c35b 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -51,12 +51,12 @@ public:
 	void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ;
 	
 // -- Async interface for requesting data
-    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
+    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true );
 
 	TQString projectDirectory() const;
 
 k_dcop:
-	void slottqStatus( const TQString& , int, int, int, int, long int ) ;
+	void slotStatus( const TQString& , int, int, int, int, long int ) ;
 
 public slots:
 	void slotResult( KIO::Job * );
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index a98f2298..af58f7c8 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -220,42 +220,42 @@ if(!project())
 							subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) );
 							subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
 							}*/
-        subMenu->tqsetWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
+        subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified."));
 		id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository."));
 		id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository."));
 		id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
+		subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs"));
 		id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
+		subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate"));
 		
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
+		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk."));
 
 		id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
+		subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository."));
 
 		id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
+        subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository."));
 		id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
+		subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") );
 		id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
+		subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") );
 		id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
+		subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") );
 		id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
+		subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") );
 		id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) );
-		subMenu->tqsetWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
+		subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") );
 
 		/*
 		subMenu->insertSeparator();
 		id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s)."));
 		id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) );
-        subMenu->tqsetWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
+        subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s)."));
 */
 		// Now insert in parent menu
 		popup->insertItem( i18n("Subversion"), subMenu );
diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/vcs/subversion/subversiondiff.ui
+++ b/vcs/subversion/subversiondiff.ui
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui
index 73bc66b5..64bd3ed6 100644
--- a/vcs/subversion/svn_co.ui
+++ b/vcs/subversion/svn_co.ui
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>191</width>
                             <height>20</height>
diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui
index d6ebee02..ea572fc6 100644
--- a/vcs/subversion/svn_commitdlgbase.ui
+++ b/vcs/subversion/svn_commitdlgbase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>335</width>
                     <height>30</height>
diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui
index 4361afe2..e874206a 100644
--- a/vcs/subversion/svn_copydlgwidget.ui
+++ b/vcs/subversion/svn_copydlgwidget.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>110</width>
                     <height>31</height>
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index 25149483..0c014a9d 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -86,17 +86,17 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart
 				vcsInfo = it.data();
 //				TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() );
 				TQString absPathStr( fileInfo.filePath() + "/" + it.key() );
-				KURL urlFromtqStatus( absPathStr );
+				KURL urlFromStatus( absPathStr );
 				if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified ||
                     vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){
 
-					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromtqStatus );
+					this->insertItem( VCSFileInfo::state2String( vcsInfo.state ), urlFromStatus );
 					
-// 					tobeCommittedUrls.push_back( urlFromtqStatus );
-// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromtqStatus.prettyURL() << endl;
+// 					tobeCommittedUrls.push_back( urlFromStatus );
+// 					kdDebug(9036) << "slotCommit() @ DirCase adding " << urlFromStatus.prettyURL() << endl;
 				}
 				else{
-					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromtqStatus.prettyURL() << endl;
+					kdDebug(9036) << "slotCommit() @ DirCase ignoring " << urlFromStatus.prettyURL() << endl;
 				}
 				
 			}
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 541d1674..eaed9c12 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -52,7 +52,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->addColumn( i18n( "Date" ) );
     listView1->addColumn( i18n( "Author" ) );
     listView1->addColumn( i18n( "Comment" ) );
-    listView1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+    listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
     TQFont listView1_font(  listView1->font() );
     listView1_font.setPointSize( 9 );
     listView1->setFont( listView1_font );
@@ -60,7 +60,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     listView1->setShowSortIndicator( TRUE );
 
     textEdit1 = new KTextEdit( splitter1, "textEdit1" );
-    textEdit1->resize( TQSize(1, 1).expandedTo(tqminimumSizeHint()) );
+    textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) );
     TQFont textEdit1_font(  textEdit1->font() );
     textEdit1_font.setPointSize( 9 );
     textEdit1->setFont( textEdit1_font );
@@ -70,7 +70,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent)
     m_layout->addWidget( splitter1, 0, 0 );
     m_layout->setMargin(1);
 
-    resize( TQSize(692, 343).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(692, 343).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
     
 	connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) );
diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index d42a2707..b54ead45 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>171</width>
                     <height>31</height>
diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui
index 3c640661..af1d5898 100644
--- a/vcs/subversion/svn_switchdlgbase.ui
+++ b/vcs/subversion/svn_switchdlgbase.ui
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>150</width>
                             <height>30</height>