TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp
index cbfc726f..9eb57fcf 100644
--- a/vcs/cvsservice/cvsfileinfoprovider.cpp
+++ b/vcs/cvsservice/cvsfileinfoprovider.cpp
@@ -31,8 +31,8 @@
 // class CVSFileInfoProvider
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService )
-    : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ),
+CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *tqparent, CvsService_stub *cvsService )
+    : KDevVCSFileInfoProvider( tqparent, "cvsfileinfoprovider" ),
     m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 )
 {
     connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&)));
@@ -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.cacheableDirStatus();
+        m_cachedDirEntries = cvsdir.cacheableDirtqStatus();
     }
     return m_cachedDirEntries;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
+bool CVSFileInfoProvider::requesttqStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos )
 {
     m_savedCallerData = callerData;
     if (m_requestStatusJob)
@@ -131,13 +131,13 @@ void CVSFileInfoProvider::propagateUpdate()
 
 void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir)
 {
-    m_cachedDirEntries = dir.cacheableDirStatus();
+    m_cachedDirEntries = dir.cacheableDirtqStatus();
     printOutFileInfoMap( *m_cachedDirEntries );
 
-    /* FileTree will call requestStatus() everytime the user expands a directory
-     * Unfortunatly requestStatus() will be called before the 
+    /* FileTree will call requesttqStatus() everytime the user expands a directory
+     * Unfortunatly requesttqStatus() 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
+     * it tqcontains. Meaning, m_savedCallerData contains no childs at that
      * time. When a dcop call is made to run "cvs status" this is no problem.
      * The dcop call takes quit long, and so FileTree has enough time the fill
      * in the childs before we report the status back.
@@ -196,7 +196,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 {
     TQRegExp rx_recordStart( "^=+$" );
     TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" );
-    TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" );
+    TQRegExp rx_filetqStatus( "tqStatus: (\\.|-|\\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,
-        fileStatus,
+        filetqStatus,
         workingRevision,
         repositoryRevision,
         stickyTag,
@@ -224,16 +224,16 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
 
         if (rx_recordStart.exactMatch( s ))
             state = 1;
-        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_fileStatus.search( s ) >= 0)    // FileName
+        else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0)    // FileName
         {
-            fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace();
-            fileStatus = rx_fileStatus.cap().replace( "Status:", "" ).stripWhiteSpace();
+            fileName = rx_fileName.cap().tqreplace( "File:", "" ).stripWhiteSpace();
+            filetqStatus = rx_filetqStatus.cap().tqreplace( "tqStatus:", "" ).stripWhiteSpace();
             ++state; // Next state
-            kdDebug(9006) << ">> " << fileName << ", " << fileStatus << endl;
+            kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl;
         }
         else if (state == 2 && rx_fileWorkRev.search( s ) >= 0)
         {
-            workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace();
+            workingRevision = s.tqreplace( "Working revision:", "" ).stripWhiteSpace();
 
             TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" );
             if (rx_revision.search( workingRevision ) >= 0)
@@ -245,7 +245,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream )
         }
         else if (state == 3 && rx_fileRepoRev.search( s ) >= 0)
         {
-            repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace();
+            repositoryRevision = s.tqreplace( "Repository revision:", "" ).stripWhiteSpace();
 
             TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" );
             if (rx_revision.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( fileStatus ) );
+                String2EnumState( filetqStatus ) );
             kdDebug(9006) << "== Inserting: " << vcsInfo.toString() << endl;
             vcsStates->insert( fileName, vcsInfo );
         }
@@ -311,4 +311,4 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map )
 }
 
 #include "cvsfileinfoprovider.moc"
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;