1 files changed, 15 insertions, 15 deletions

diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 81f4f01a6..0044abc8b 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -41,8 +41,8 @@ KNFolder::KNFolder()
 }
 
 
-KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
-  : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true)
+KNFolder::KNFolder(int id, const TQString &name, KNFolder *tqparent)
+  : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
 {
   TQString fname=path()+TQString("custom_%1").arg(i_d);
 
@@ -51,7 +51,7 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
   i_ndexFile.setName(fname+".idx");
   i_nfoPath=fname+".info";
 
-  p_arentId=parent?parent->id():-1;
+  p_arentId=tqparent?tqparent->id():-1;
 
   if(i_ndexFile.exists())
     c_ount=i_ndexFile.size()/sizeof(DynData);
@@ -60,8 +60,8 @@ KNFolder::KNFolder(int id, const TQString &name, KNFolder *parent)
 }
 
 
-KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *parent)
-  : KNArticleCollection(parent), i_d(id), i_ndexDirty(false), w_asOpen(true)
+KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolder *tqparent)
+  : KNArticleCollection(tqparent), i_d(id), i_ndexDirty(false), w_asOpen(true)
 {
   TQString fname=path()+TQString("%1_%2").arg(prefix).arg(i_d);
 
@@ -70,7 +70,7 @@ KNFolder::KNFolder(int id, const TQString &name, const TQString &prefix, KNFolde
   i_ndexFile.setName(fname+".idx");
   i_nfoPath=fname+".info";
 
-  p_arentId=parent?parent->id():-1;
+  p_arentId=tqparent?tqparent->id():-1;
 
   if(i_ndexFile.exists())
     c_ount=i_ndexFile.size()/sizeof(DynData);
@@ -115,7 +115,7 @@ bool KNFolder::readInfo(const TQString &infoPath)
   if (!isRootFolder() && !isStandardFolder()) {
     n_ame=info.readEntry("name");
     i_d=info.readNumEntry("id", -1);
-    p_arentId=info.readNumEntry("parentId", -1);
+    p_arentId=info.readNumEntry("tqparentId", -1);
   }
   w_asOpen=info.readBoolEntry("wasOpen", true);
 
@@ -147,7 +147,7 @@ void KNFolder::saveInfo()
     if (!isRootFolder() && !isStandardFolder()) {
       info.writeEntry("name", n_ame);
       info.writeEntry("id", i_d);
-      info.writeEntry("parentId", p_arentId);
+      info.writeEntry("tqparentId", p_arentId);
     }
     if(l_istItem)
       info.writeEntry("wasOpen", l_istItem->isOpen());
@@ -187,7 +187,7 @@ bool KNFolder::loadHdrs()
   }
 
   TQCString tmp;
-  KQCStringSplitter split;
+  KTQCStringSplitter split;
   KNLocalArticle *art;
   DynData dynamic;
   int pos1=0, pos2=0, cnt=0, byteCount;
@@ -244,8 +244,8 @@ bool KNFolder::loadHdrs()
 
     //set overview
     bool end=false;
-    pos1=tmp.find(' ')+1;
-    pos2=tmp.find('\t', pos1);
+    pos1=tmp.tqfind(' ')+1;
+    pos2=tmp.tqfind('\t', pos1);
     if (pos2 == -1) {
       pos2=tmp.length();
       end=true;
@@ -254,7 +254,7 @@ bool KNFolder::loadHdrs()
 
     if (!end) {
       pos1=pos2+1;
-      pos2=tmp.find('\t', pos1);
+      pos2=tmp.tqfind('\t', pos1);
       if (pos2 == -1) {
         pos2=tmp.length();
         end=true;
@@ -264,7 +264,7 @@ bool KNFolder::loadHdrs()
 
     if (!end) {
       pos1=pos2+1;
-      pos2=tmp.find('\t', pos1);
+      pos2=tmp.tqfind('\t', pos1);
       if (pos2 == -1) {
         pos2=tmp.length();
         end=true;
@@ -284,7 +284,7 @@ bool KNFolder::loadHdrs()
       clear();
       closeFiles();
 
-      knGlobals.seStatusMsg(TQString::null);
+      knGlobals.seStatusMsg(TQString());
       knGlobals.top->setCursorBusy(false);
       return false;
     }
@@ -297,7 +297,7 @@ bool KNFolder::loadHdrs()
   c_ount=cnt;
   updateListItem();
 
-  knGlobals.seStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString());
   knGlobals.top->setCursorBusy(false);
 
   return true;