rename the following methods:

tqparent parent
tqmask mask


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

18 files changed, 88 insertions, 88 deletions

diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index 14a78a4..2c4fa51 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -67,8 +67,8 @@
  * \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated
  *     by the constructors of the items.
  */
-K3bDataDoc::K3bDataDoc( TQObject* tqparent )
-  : K3bDoc( tqparent )
+K3bDataDoc::K3bDataDoc( TQObject* parent )
+  : K3bDoc( parent )
 {
   m_root = 0;
 
@@ -219,9 +219,9 @@ bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir )
 }
 
 
-K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent )
+K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* parent )
 {
-  K3bDirItem* item = new K3bDirItem( name, this, tqparent );
+  K3bDirItem* item = new K3bDirItem( name, this, parent );
 
   setModified( true );
 
@@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem )
   // file we create a default one here.
   //
   if( !m_bootImages.isEmpty() && !m_bootCataloge )
-    createBootCatalogeItem( m_bootImages.first()->tqparent() );
+    createBootCatalogeItem( m_bootImages.first()->parent() );
 
 
   informAboutNotFoundFiles();
@@ -511,7 +511,7 @@ bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem )
 }
 
 
-bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent )
+bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* parent )
 {
   K3bDataItem* newItem = 0;
 
@@ -535,7 +535,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent )
     else if( !elem.attribute( "bootimage" ).isEmpty() ) {
       K3bBootItem* bootItem = new K3bBootItem( urlElem.text(),
 					       this,
-					       tqparent,
+					       parent,
 					       elem.attributeNode( "name" ).value() );
       if( elem.attribute( "bootimage" ) == "floppy" )
 	bootItem->setImageType( K3bBootItem::FLOPPY );
@@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent )
     else {
       newItem = new K3bFileItem( urlElem.text(),
 				 this,
-				 tqparent,
+				 parent,
 				 elem.attributeNode( "name" ).value() );
     }
   }
   else if( elem.nodeName() == "special" ) {
     if( elem.attributeNode( "type" ).value() == "boot cataloge" )
-      createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() );
+      createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() );
   }
   else if( elem.nodeName() == "directory" ) {
     // This is for the VideoDVD project which already contains the *_TS folders
     K3bDirItem* newDirItem = 0;
-    if( K3bDataItem* item = tqparent->find( elem.attributeNode( "name" ).value() ) ) {
+    if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) {
       if( item->isDir() ) {
 	newDirItem = static_cast<K3bDirItem*>(item);
       }
@@ -576,7 +576,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent )
     }
 
     if( !newDirItem )
-      newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent );
+      newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent );
     TQDomNodeList childNodes = elem.childNodes();
     for( uint i = 0; i < childNodes.count(); i++ ) {
 
@@ -835,7 +835,7 @@ void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem )
 }
 
 
-void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent )
+void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent )
 {
   if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>( item ) ) {
     if( m_oldSession.contains( fileItem ) ) {
@@ -851,7 +851,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme
       if( item->sortWeight() != 0 )
 	topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) );
 
-      tqparent->appendChild( topElem );
+      parent->appendChild( topElem );
 
       // add boot options as attributes to preserve compatibility to older K3b versions
       if( K3bBootItem* bootItem = dynamic_cast<K3bBootItem*>( fileItem ) ) {
@@ -874,7 +874,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme
     topElem.setAttribute( "name", m_bootCataloge->k3bName() );
     topElem.setAttribute( "type", "boot cataloge" );
 
-    tqparent->appendChild( topElem );
+    parent->appendChild( topElem );
   }
   else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ) ) {
     TQDomElement topElem = doc->createElement( "directory" );
@@ -888,7 +888,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme
       saveDataItem( it.current(), doc, &topElem );
     }
 
-    tqparent->appendChild( topElem );
+    parent->appendChild( topElem );
   }
 }
 
@@ -979,9 +979,9 @@ void K3bDataDoc::moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newPare
 }
 
 
-K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
+K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent )
 {
-  return new K3bDataJob( this, hdl, tqparent );
+  return new K3bDataJob( this, hdl, parent );
 }
 
 
@@ -1211,7 +1211,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
 }
 
 
-void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent )
+void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent )
 {
   Q_ASSERT(importDir);
   TQStringList entries = importDir->entries();
@@ -1220,7 +1220,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir,
   for( TQStringList::const_iterator it = entries.begin();
        it != entries.end(); ++it ) {
     const K3bIso9660Entry* entry = importDir->entry( *it );
-    K3bDataItem* oldItem = tqparent->find( entry->name() );
+    K3bDataItem* oldItem = parent->find( entry->name() );
     if( entry->isDirectory() ) {
       K3bDirItem* dir = 0;
       if( oldItem && oldItem->isDir() ) {
@@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir,
 	// we overwrite without warning!
 	if( oldItem )
 	  removeItem( oldItem );
-	dir = new K3bDirItem( entry->name(), this, tqparent );
+	dir = new K3bDirItem( entry->name(), this, parent );
       }
 
       dir->setRemoveable(false);
@@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir,
       if( oldItem )
 	removeItem( oldItem );
 
-      K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent );
+      K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent );
       item->setExtraInfo( i18n("From previous session") );
       m_oldSession.append( item );
     }
diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index eccbde9..ebb6507 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -64,7 +64,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
   TQ_OBJECT
 
  public:
-  K3bDataDoc( TQObject* tqparent = 0 );
+  K3bDataDoc( TQObject* parent = 0 );
   virtual ~K3bDataDoc();
 
   virtual int type() const { return DATA; }
@@ -111,11 +111,11 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
   void moveItem( K3bDataItem* item, K3bDirItem* newParent );
   void moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent );
 
-  K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent );
+  K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* parent );
 	
   TQString treatWhitespace( const TQString& );
 	
-  virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 );
+  virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent = 0 );
 	
   MultiSessionMode multiSessionMode() const { return m_multisessionMode; }
   void setMultiSessionMode( MultiSessionMode mode );
@@ -246,22 +246,22 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
 
  private:
   void prepareFilenamesInDir( K3bDirItem* dir );
-  void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent );
+  void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent );
 
   /**
    * used by K3bDirItem to inform about removed items.
    */
-  void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem );
-  void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem );
+  void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem );
+  void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem );
 
   /**
    * load recursivly
    */
-  bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent );
+  bool loadDataItem( TQDomElement& e, K3bDirItem* parent );
   /**
    * save recursivly
    */
-  void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent );
+  void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent );
 
   void informAboutNotFoundFiles();
 
diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp
index b2df008..f5ce21d 100644
--- a/libk3b/projects/datacd/k3bdataitem.cpp
+++ b/libk3b/projects/datacd/k3bdataitem.cpp
@@ -29,7 +29,7 @@ public:
 };
 
 
-K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags )
+K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags )
   : m_bHideOnRockRidge(false),
     m_bHideOnJoliet(false),
     m_bRemoveable(true),
@@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags )
   m_doc = doc;
   m_bHideOnRockRidge = m_bHideOnJoliet = false;
 
-  if( tqparent )
-    m_parentDir = tqparent->getDirItem();
+  if( parent )
+    m_parentDir = parent->getDirItem();
   else
     m_parentDir = 0;
 }
@@ -121,8 +121,8 @@ void K3bDataItem::setK3bName( const TQString& name ) {
     return;
   }
    
-  if( tqparent() ) {
-    K3bDataItem* item = tqparent()->find( name );
+  if( parent() ) {
+    K3bDataItem* item = parent()->find( name );
     if( item && item != this ) {
       kdDebug() << "(K3bDataItem) item with that name already exists." << endl;
       return;
@@ -143,8 +143,8 @@ const TQString& K3bDataItem::k3bName() const
 
 K3bDataItem* K3bDataItem::take()
 {
-  if( tqparent() )
-    tqparent()->takeDataItem( this );
+  if( parent() )
+    parent()->takeDataItem( this );
 
   return this;
 }
@@ -153,7 +153,7 @@ K3bDataItem* K3bDataItem::take()
 TQString K3bDataItem::k3bPath() const
 {
   if( !getParent() )
-    return TQString();  // the root item is the only one not having a tqparent
+    return TQString();  // the root item is the only one not having a parent
   else if( isDir() )
     return getParent()->k3bPath() + k3bName() + "/";
   else
@@ -164,7 +164,7 @@ TQString K3bDataItem::k3bPath() const
 TQString K3bDataItem::writtenPath() const
 {
   if( !getParent() )
-    return TQString();  // the root item is the only one not having a tqparent
+    return TQString();  // the root item is the only one not having a parent
   else if( isDir() )
     return getParent()->writtenPath() + writtenName() + "/";
   else
@@ -175,7 +175,7 @@ TQString K3bDataItem::writtenPath() const
 TQString K3bDataItem::iso9660Path() const
 {
   if( !getParent() )
-    return TQString();  // the root item is the only one not having a tqparent
+    return TQString();  // the root item is the only one not having a parent
   else if( isDir() )
     return getParent()->iso9660Path() + iso9660Name() + "/";
   else
@@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const
 void K3bDataItem::setHideOnRockRidge( bool b )
 {
   // there is no use in changing the value if 
-  // it is already set by the tqparent
+  // it is already set by the parent
     if( ( !getParent() || !getParent()->hideOnRockRidge() ) &&
         b != m_bHideOnRockRidge ) {
     m_bHideOnRockRidge = b;
@@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b )
 void K3bDataItem::setHideOnJoliet( bool b ) 
 { 
   // there is no use in changing the value if 
-  // it is already set by the tqparent
+  // it is already set by the parent
     if( ( !getParent() || !getParent()->hideOnJoliet() ) &&
         b != m_bHideOnJoliet ) {
     m_bHideOnJoliet = b;
diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h
index db7452b..043a0d5 100644
--- a/libk3b/projects/datacd/k3bdataitem.h
+++ b/libk3b/projects/datacd/k3bdataitem.h
@@ -35,12 +35,12 @@ class K3bDataDoc;
 class LIBK3B_EXPORT K3bDataItem
 {
  public: 
-  K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 );
+  K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 );
 
   /**
    * Default copy constructor.
    *
-   * The result is an exact copy except that no tqparent dir it set and, thus, also no doc.
+   * The result is an exact copy except that no parent dir it set and, thus, also no doc.
    */
   K3bDataItem( const K3bDataItem& );
 
@@ -49,17 +49,17 @@ class LIBK3B_EXPORT K3bDataItem
   /**
    * Return an exact copy of this data item.
    *
-   * The result is an exact copy except that no tqparent dir it set and, thus, also no doc.
+   * The result is an exact copy except that no parent dir it set and, thus, also no doc.
    *
    * Implementations should use the default constructor.
    */
   virtual K3bDataItem* copy() const = 0;
 	
-  K3bDirItem* tqparent() { return m_parentDir; }
+  K3bDirItem* parent() { return m_parentDir; }
   K3bDirItem* getParent() const { return m_parentDir; }
 
   /**
-   * Remove this item from it's tqparent and return a pointer to it.
+   * Remove this item from it's parent and return a pointer to it.
    */
   K3bDataItem* take();
 	
@@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem
   virtual void reparent( K3bDirItem* );
 
   // FIXME: use all these flags and make the isXXX methods
-  // non-virtual. Then move the tqparent()->addDataItem call
+  // non-virtual. Then move the parent()->addDataItem call
   // to the K3bDataItem constructor
   enum ItemFlags {
     DIR = 0x1,
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index abceb3a..0295e27 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -83,8 +83,8 @@ public:
 };
 
 
-K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
-  : K3bBurnJob( hdl, tqparent )
+K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent )
+  : K3bBurnJob( hdl, parent )
 {
   d = new Private;
 
diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h
index a55e2d9..2604f47 100644
--- a/libk3b/projects/datacd/k3bdatajob.h
+++ b/libk3b/projects/datacd/k3bdatajob.h
@@ -43,7 +43,7 @@ class K3bDataJob : public K3bBurnJob
   TQ_OBJECT
 	
  public:
-  K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
+  K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0 );
   virtual ~K3bDataJob();
 	
   K3bDoc* doc() const;
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index d9d4893..e562541 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
@@ -149,8 +149,8 @@ static TQString createItemsString( const TQValueList<K3bDataItem*>& items, unsig
 }
 
 
-K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
-  : K3bJob( hdl, tqparent )
+K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent )
+  : K3bJob( hdl, parent )
 {
   d = new Private( doc );
   d->threadJob = new K3bThreadJob( d, this, this );
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h
index 3ac7d7d..e705d06 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.h
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.h
@@ -32,7 +32,7 @@ class K3bDataPreparationJob : public K3bJob
   TQ_OBJECT
 
  public:
-  K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent );
+  K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent );
   ~K3bDataPreparationJob();
 
   bool hasBeenCanceled() const;
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp
index 16627c7..72af70b 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* parent
   m_k3bName = name;
 
   // add automagically like a qlistviewitem
-  if( tqparent() )
-    tqparent()->addDataItem( this );
+  if( parent() )
+    parent()->addDataItem( this );
 }
 
 
@@ -106,7 +106,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
       int cnt = 1;
       while( K3bDataItem* oldItem = find( name ) ) {
 	if( !oldItem->isDir() && oldItem->isFromOldSession() ) {
-	  // in this case we remove this item from it's tqparent and save it in the new one
+	  // in this case we remove this item from it's parent and save it in the new one
 	  // to be able to recover it
 	  oldItem->take();
 	  static_cast<K3bSessionImportItem*>(oldItem)->setReplaceItem( static_cast<K3bFileItem*>(item) );
@@ -238,8 +238,8 @@ bool K3bDirItem::mkdir( const TQString& dirPath )
   // An absolut path always starts at the root item
   //
   if( dirPath[0] == '/' ) {
-    if( tqparent() )
-      return tqparent()->mkdir( dirPath );
+    if( parent() )
+      return parent()->mkdir( dirPath );
     else
       return mkdir( dirPath.mid( 1 ) );
   }
@@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const
   if( dynamic_cast<K3bDirItem*>(item) == this )
     return true;
 
-  K3bDirItem* d = item->tqparent();
+  K3bDirItem* d = item->parent();
   while( d ) {
     if( d == this ) {
       return true;
     }
-    d = d->tqparent();
+    d = d->parent();
   }
 
   return false;
@@ -349,16 +349,16 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed )
         }
     }
 
-    if( tqparent() )
-        tqparent()->updateSize( item, removed );
+    if( parent() )
+        parent()->updateSize( item, removed );
 }
 
 void K3bDirItem::updateFiles( long files, long dirs )
 {
   m_files += files;
   m_dirs += dirs;
-  if( tqparent() )
-    tqparent()->updateFiles( files, dirs );
+  if( parent() )
+    parent()->updateFiles( files, dirs );
 }
 
 
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index 7ec0fba..304cf1a 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
 
   /**
    * Default copy constructor. Copies the dir including all tqchildren. However, none of the
-   * tqchildren will have set a doc and the copy dir will not have set a tqparent dir.
+   * tqchildren will have set a doc and the copy dir will not have set a parent dir.
    */
   K3bDirItem( const K3bDirItem& );
 
@@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
  private:
   /**
    * this recursivly updates the size of the directories.
-   * The size of this dir and the tqparent dir is updated.
+   * The size of this dir and the parent dir is updated.
    * These values are just used for user information.
    */
   void updateSize( K3bDataItem*, bool removed = false );
diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp
index c6c7bb4..7cabec8 100644
--- a/libk3b/projects/datacd/k3bfileitem.cpp
+++ b/libk3b/projects/datacd/k3bfileitem.cpp
@@ -113,8 +113,8 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem*
   }
 
   // add automagically like a qlistviewitem
-  if( tqparent() )
-    tqparent()->addDataItem( this );
+  if( parent() )
+    parent()->addDataItem( this );
 }
 
 
@@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
     m_sizeFollowed = m_size;
   }
 
-  if( tqparent() )
-    tqparent()->addDataItem( this );
+  if( parent() )
+    parent()->addDataItem( this );
 }
 
 
@@ -267,7 +267,7 @@ bool K3bFileItem::isValid() const
       }
       else if( tokens[i] == ".." ) {
 	// change the directory
-	dir = dir->tqparent();
+	dir = dir->parent();
 	if( dir == 0 )
 	  return false;
       }
diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h
index e758d95..46e2930 100644
--- a/libk3b/projects/datacd/k3bfileitem.h
+++ b/libk3b/projects/datacd/k3bfileitem.h
@@ -53,7 +53,7 @@ public:
   /**
    * Default copy constructor
    * Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item.
-   * The copy does not have a tqparent dir set and any old session items are set to 0.
+   * The copy does not have a parent dir set and any old session items are set to 0.
    */
   K3bFileItem( const K3bFileItem& );
 
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index e511a30..1db1997 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -85,8 +85,8 @@ public:
 };
 
 
-K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name )
-  : K3bJob( hdl, tqparent, name ),
+K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent, const char* name )
+  : K3bJob( hdl, parent, name ),
     m_pathSpecFile(0),
     m_rrHideFile(0),
     m_jolietHideFile(0),
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 446fef8..1208be3 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -39,7 +39,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
   TQ_OBJECT
 
  public:
-  K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
+  K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 );
   virtual ~K3bIsoImager();
 
   virtual bool active() const;
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index a799374..e6d07e8 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -30,8 +30,8 @@
 #include <tqstringlist.h>
 
 
-K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name )
-  : K3bJob( jh, tqparent, name ),
+K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* parent, const char* name )
+  : K3bJob( jh, parent, name ),
     m_process(0),
     m_device(0),
     m_dvd(false)
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index da609cb..7a56f9f 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -30,7 +30,7 @@ class K3bMsInfoFetcher : public K3bJob
   TQ_OBJECT
 
  public:
-  K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
+  K3bMsInfoFetcher( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 );
   ~K3bMsInfoFetcher();
 
   const TQString& msInfo() const { return m_msInfo; }
diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp
index 92b52e4..35f7936 100644
--- a/libk3b/projects/datacd/k3bsessionimportitem.cpp
+++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp
@@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD
   setK3bName( isoF->name() );
 
   // add automagically like a qlistviewitem
-  if( tqparent() )
-    tqparent()->addDataItem( this );
+  if( parent() )
+    parent()->addDataItem( this );
 }
 
 
@@ -48,8 +48,8 @@ K3bSessionImportItem::~K3bSessionImportItem()
     m_replaceItem->setReplacedItemFromOldSession(0);
 
   // remove this from parentdir
-  if( tqparent() )
-    tqparent()->takeDataItem( this );
+  if( parent() )
+    parent()->takeDataItem( this );
 }
 
 
diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h
index c8b7937..1dc3bb7 100644
--- a/libk3b/projects/datacd/k3bspecialdataitem.h
+++ b/libk3b/projects/datacd/k3bspecialdataitem.h
@@ -29,15 +29,15 @@
 class K3bSpecialDataItem : public K3bDataItem
 {
  public:
-  K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() )
-    : K3bDataItem( doc, tqparent ),
+  K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() )
+    : K3bDataItem( doc, parent ),
     m_size( size )
     {
       setK3bName( k3bName );
 
       // add automagically like a qlistviewitem
-      if( tqparent )
-	tqparent->addDataItem( this );
+      if( parent )
+	parent->addDataItem( this );
     }
 
     K3bSpecialDataItem( const K3bSpecialDataItem& item )
@@ -48,8 +48,8 @@ class K3bSpecialDataItem : public K3bDataItem
 
   ~K3bSpecialDataItem() {
     // remove this from parentdir
-    if( tqparent() )
-      tqparent()->takeDataItem( this );
+    if( parent() )
+      parent()->takeDataItem( this );
   }
 
   K3bDataItem* copy() const {