From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: 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
---
 vcs/cvsservice/cvsdir.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'vcs/cvsservice/cvsdir.cpp')

diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp
index 28a4b566..80dabbe5 100644
--- a/vcs/cvsservice/cvsdir.cpp
+++ b/vcs/cvsservice/cvsdir.cpp
@@ -110,7 +110,7 @@ TQString CVSDir::repository() const
     TQString content;
 
     if (!isValid())
-        return TQString::null;
+        return TQString();
 
     TQByteArray bytes = cacheFile( repoFileName() );
     TQTextStream t( bytes, IO_ReadOnly );
@@ -129,7 +129,7 @@ TQString CVSDir::root() const
     TQString content;
 
     if (!isValid())
-        return TQString::null;
+        return TQString();
 
     TQByteArray bytes = cacheFile( repoFileName() );
     TQTextStream t( bytes, IO_ReadOnly );
@@ -173,7 +173,7 @@ TQStringList CVSDir::registeredEntryList() const
 
 bool CVSDir::isRegistered( const TQString fileName ) const
 {
-    CVSEntry entry = fileStatus( fileName );
+    CVSEntry entry = filetqStatus( fileName );
     return entry.isValid() && entry.fileName() == fileName;
 }
 
@@ -197,12 +197,12 @@ void CVSDir::refreshEntriesCache() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const
+CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) const
 {
     if (refreshCache)
         refreshEntriesCache();
 
-    if (m_cachedEntries.contains( fileName ))
+    if (m_cachedEntries.tqcontains( fileName ))
     {
         return m_cachedEntries[ fileName ];
     }
@@ -284,7 +284,7 @@ void CVSDir::doNotIgnoreFile( const TQString &fileName )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap CVSDir::dirStatus() const
+VCSFileInfoMap CVSDir::dirtqStatus() const
 {
     VCSFileInfoMap vcsInfo;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -293,7 +293,7 @@ VCSFileInfoMap CVSDir::dirStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = fileStatus( fileName );
+        const CVSEntry entry = filetqStatus( fileName );
 
         vcsInfo.insert( fileName, entry.toVCSFileInfo() );
     }
@@ -303,7 +303,7 @@ VCSFileInfoMap CVSDir::dirStatus() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-VCSFileInfoMap *CVSDir::cacheableDirStatus() const
+VCSFileInfoMap *CVSDir::cacheableDirtqStatus() const
 {
     VCSFileInfoMap *vcsInfo = new VCSFileInfoMap;
     /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here?
@@ -312,7 +312,7 @@ VCSFileInfoMap *CVSDir::cacheableDirStatus() const
     for ( ; it != end; ++it)
     {
         const TQString &fileName = (*it);
-        const CVSEntry entry = fileStatus( fileName );
+        const CVSEntry entry = filetqStatus( fileName );
 
         vcsInfo->insert( fileName, entry.toVCSFileInfo() );
     }
-- 
cgit v1.2.1