Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index 1815027c0..aad26b8b3 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -453,14 +453,14 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
 
     // optinal additional headers
     mOptionalHeaders = *hdrfmt;
-    for (hdr = hdrfmt->first(); hdr; hdr = hdrfmt->next()) {
+    for (hdr = hdrfmt->first(); !hdr.isNull(); hdr = hdrfmt->next()) {
       if (!split.next())
         break;
       data = split.string();
       int pos = hdr.tqfind(':');
       hdrName = hdr.left( pos );
       // if the header format is 'full' we have to strip the header name
-      if (hdr.findRev("full") == (int)(hdr.length() - 4))
+      if (hdr.tqfindRev("full") == (int)(hdr.length() - 4))
         data = data.right( data.length() - (hdrName.length() + 2) );
 
       // add header
@@ -557,7 +557,7 @@ int KNGroup::saveStaticData(int cnt,bool ovr)
 
       // optional headers
       ts << mOptionalHeaders.count() << '\n';
-      for (TQCString hdrName = mOptionalHeaders.first(); hdrName; hdrName = mOptionalHeaders.next()) {
+      for (TQCString hdrName = mOptionalHeaders.first(); !hdrName.isNull(); hdrName = mOptionalHeaders.next()) {
         hdrName = hdrName.left( hdrName.tqfind(':') );
         KMime::Headers::Base *hdr = art->getHeaderByType( hdrName );
         if ( hdr )
@@ -701,7 +701,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
       art=at(idx);
       if(art->threadingLevel()>1) {
         oldRef=art->idRef();
-        ref=findReference(art);
+        ref=tqfindReference(art);
         if(ref) {
           // this method is called from the nntp-thread!!!
           #ifndef NDEBUG
@@ -720,7 +720,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
 
     if(art->idRef()==-1 && !art->references()->isEmpty() ){   //hdr has references
       refCnt++;
-      if(findReference(art))
+      if(tqfindReference(art))
         foundCnt++;
     }
     else {
@@ -866,7 +866,7 @@ void KNGroup::buildThreads(int cnt, KNProtocolClient *client)
 }
 
 
-KNRemoteArticle* KNGroup::findReference(KNRemoteArticle *a)
+KNRemoteArticle* KNGroup::tqfindReference(KNRemoteArticle *a)
 {
   int found=false;
   TQCString ref_mid;
@@ -1052,7 +1052,7 @@ TQString KNGroup::prepareForExecution()
   if (knGlobals.groupManager()->loadHeaders(this))
     return TQString();
   else
-    return i18n("Cannot load saved headers: %1").arg(groupname());
+    return i18n("Cannot load saved headers: %1").tqarg(groupname());
 }
 
 //***************************************************************************