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/cvsentry.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp
index 5db9710e..eb8ca704 100644
--- a/vcs/cvsservice/cvsentry.cpp
+++ b/vcs/cvsservice/cvsentry.cpp
@@ -91,7 +91,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir )
         m_state = Added;
     else if ( revision().length() > 3 && revision()[0] == '-' )
         m_state = Removed;
-    else if ( timeStamp().find('+') >= 0 )
+    else if ( timeStamp().tqfind('+') >= 0 )
         m_state = Conflict;
     else
     {
@@ -110,7 +110,7 @@ TQString CVSEntry::fileName() const
     if (type() != invalidEntry && m_fields.count() >= 1)
         return m_fields[0];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ TQString CVSEntry::revision() const
     if (type() != invalidEntry && m_fields.count() >= 2)
         return m_fields[1];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -130,7 +130,7 @@ TQString CVSEntry::timeStamp() const
     if (type() != invalidEntry && m_fields.count() >= 3)
         return m_fields[2];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ TQString CVSEntry::options() const
     if (type() != invalidEntry && m_fields.count() >= 4)
         return m_fields[3];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ TQString CVSEntry::tag() const
     if (type() != invalidEntry && m_fields.count() >= 5)
         return m_fields[4];
     else
-        return TQString::null;
+        return TQString();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -184,4 +184,4 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const
     return VCSFileInfo( fileName(), revision(), revision(), fileState );
 }
 
-//kate: space-indent on; indent-width 4; replace-tabs on;
+//kate: space-indent on; indent-width 4; tqreplace-tabs on;
-- 
cgit v1.2.3