4 files changed, 10 insertions, 10 deletions
diff --git a/kresources/slox/sloxfolder.cpp b/kresources/slox/sloxfolder.cpp
index 0430f8eeb..fbfb9f051 100644
--- a/kresources/slox/sloxfolder.cpp
+++ b/kresources/slox/sloxfolder.cpp
@@ -21,10 +21,10 @@
 
 #include "sloxfolder.h"
 
-SloxFolder::SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def ) :
+SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) :
   item( 0 ),
   mId( id ),
-  mParentId( tqparentId ),
+  mParentId( parentId ),
   mName( name ),
   mDefault( def )
 {
diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h
index 967f83eda..e27399a66 100644
--- a/kresources/slox/sloxfolder.h
+++ b/kresources/slox/sloxfolder.h
@@ -35,10 +35,10 @@ enum FolderType {
 class KDE_EXPORT SloxFolder
 {
   public:
-    SloxFolder( const TQString &id, const TQString &tqparentId, const TQString &type, const TQString &name, bool def = false );
+    SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false );
 
     TQString id() const { return mId; }
-    TQString tqparentId() const { return mParentId; }
+    TQString parentId() const { return mParentId; }
     FolderType type() const { return mType; }
     TQString name() const;
     bool isDefault() const { return mDefault; }
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index acf871b2f..d58a18e1d 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -70,8 +70,8 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
     return;
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
-  if( mManager->folders().tqcontains( folder->tqparentId() ) ) {
-    SloxFolder *tqparent = mManager->folders()[folder->tqparentId()];
+  if( mManager->folders().tqcontains( folder->parentId() ) ) {
+    SloxFolder *tqparent = mManager->folders()[folder->parentId()];
     createFolderViewItem( tqparent );
     if ( tqparent->item )
       folder->item = new KListViewItem( tqparent->item );
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index b5fd39585..7894ec93a 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -136,7 +136,7 @@ void SloxFolderManager::readFolders()
   TQDomNodeList nodes = doc.elementsByTagName( "D:prop" );
   for( uint i = 0; i < nodes.count(); ++i ) {
     TQDomElement element = nodes.item(i).toElement();
-    TQString id = "-1", tqparentId = "-1"; // OX default folder
+    TQString id = "-1", parentId = "-1"; // OX default folder
     bool def = false;
     TQString name, type;
     TQDomNode n;
@@ -145,13 +145,13 @@ void SloxFolderManager::readFolders()
       TQString tag = e.tagName();
       TQString value = e.text();
       if ( tag == "ox:object_id" ) id = value;
-      else if ( tag == "ox:folder_id" ) tqparentId = value;
+      else if ( tag == "ox:folder_id" ) parentId = value;
       else if ( tag == "ox:title" ) name = value;
       else if ( tag == "ox:module" ) type = value;
       else if ( tag == "ox:defaultfolder" ) def = (value == "true");
     }
-    if ( id != "-1" && tqparentId != "-1" ) {
-      SloxFolder *folder = new SloxFolder( id, tqparentId, type, name, def );
+    if ( id != "-1" && parentId != "-1" ) {
+      SloxFolder *folder = new SloxFolder( id, parentId, type, name, def );
       mFolders[id] = folder;
       kdDebug() << k_funcinfo << "Found folder: " << folder->name() << endl;
     }