1 files changed, 10 insertions, 10 deletions

diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index e857f4bb..bdcbed4a 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -156,7 +156,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f)
 
   // find all subfolders of the folder we want to delete
   for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) {
-    p = (*it)->parent();
+    p = (*it)->tqparent();
     while ( p ) {
       if ( p == f ) {
         if ( (*it)->lockedArticles() > 0 )
@@ -164,7 +164,7 @@ bool KNFolderManager::deleteFolder(KNFolder *f)
         del.append( (*it) );
         break;
       }
-      p = p->parent();
+      p = p->tqparent();
     }
   }
 
@@ -198,15 +198,15 @@ void KNFolderManager::emptyFolder(KNFolder *f)
 
 bool KNFolderManager::moveFolder(KNFolder *f, KNFolder *p)
 {
-  if(!f || p==f->parent()) // nothing to be done
+  if(!f || p==f->tqparent()) // nothing to be done
     return true;
 
   // is "p" a child of "f" ?
-  KNCollection *p2=p?p->parent():0;
+  KNCollection *p2=p?p->tqparent():0;
   while(p2) {
     if(p2==f)
       break;
-    p2=p2->parent();
+    p2=p2->tqparent();
   }
 
   if( (p2 && p2==f) || f==p || f->isStandardFolder() || f->isRootFolder()) //  no way ;-)
@@ -366,7 +366,7 @@ void KNFolderManager::importFromMBox(KNFolder *f)
     if (!list.isEmpty())
       knGlobals.articleManager()->moveIntoFolder(list, f);
 
-    knGlobals.seStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString());
     knGlobals.top->setCursorBusy(false);
   }
 
@@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
         knGlobals.top->secureProcessEvents();
     }
 
-    knGlobals.seStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString());
     knGlobals.top->setCursorBusy(false);
   }
 }
@@ -463,11 +463,11 @@ int KNFolderManager::loadCustomFolders()
       delete f;
   }
 
-  // set parents
+  // set tqparents
   if(cnt>0) {
     for ( TQValueList<KNFolder*>::Iterator it = mFolderList.begin(); it != mFolderList.end(); ++it ) {
-      if ( !(*it)->isRootFolder() ) {   // the root folder has no parent
-        KNFolder *par = folder( (*it)->parentId() );
+      if ( !(*it)->isRootFolder() ) {   // the root folder has no tqparent
+        KNFolder *par = folder( (*it)->tqparentId() );
         if ( !par )
           par = root();
         (*it)->setParent( par );