Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

42 files changed, 84 insertions, 84 deletions

diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index 9fc0f06..a361994 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -337,7 +337,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
 
 	if( formatWithoutAsking ||
 	    !hasIso ||
-	    KMessageBox::warningContinueCancel( tqparentWidgetToUse(),
+	    KMessageBox::warningContinueCancel( parentWidgetToUse(),
 						i18n("Found %1 media in %2 - %3. "
 						     "Should it be overwritten?")
 						.tqarg("DVD+RW")
@@ -407,7 +407,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
 
 	if( formatWithoutAsking ||
 	    !hasIso ||
-	    KMessageBox::warningContinueCancel( tqparentWidgetToUse(),
+	    KMessageBox::warningContinueCancel( parentWidgetToUse(),
 						i18n("Found %1 media in %2 - %3. "
 						     "Should it be overwritten?")
 						.tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
@@ -464,7 +464,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
       kdDebug() << "(K3bEmptyDiscWaiter) ------ DVD-RW needs to be formated." << endl;
 
       if( formatWithoutAsking ||
-	  KMessageBox::warningContinueCancel( tqparentWidgetToUse(),
+	  KMessageBox::warningContinueCancel( parentWidgetToUse(),
 					      i18n("Found %1 media in %2 - %3. "
 						   "Should it be formatted?")
 					      .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
@@ -540,7 +540,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
 	   medium.diskInfo().rewritable() ) {
 
     if( formatWithoutAsking ||
-	KMessageBox::questionYesNo( tqparentWidgetToUse(),
+	KMessageBox::questionYesNo( parentWidgetToUse(),
 				    i18n("Found rewritable media in %1 - %2. "
 					 "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()),
 				    i18n("Found Rewritable Disk"),
@@ -707,7 +707,7 @@ void K3bEmptyDiscWaiter::prepareErasingDialog()
 {
   // we hide the emptydiskwaiter so the info dialog needs to have the same tqparent
   if( !d->erasingInfoDialog )
-    d->erasingInfoDialog = new K3bProgressDialog( TQString(), tqparentWidget() );
+    d->erasingInfoDialog = new K3bProgressDialog( TQString(), parentWidget() );
 
   //
   // hide the dialog
@@ -719,13 +719,13 @@ void K3bEmptyDiscWaiter::prepareErasingDialog()
 }
 
 
-TQWidget* K3bEmptyDiscWaiter::tqparentWidgetToUse()
+TQWidget* K3bEmptyDiscWaiter::parentWidgetToUse()
 {
   // we might also show dialogs if the discwaiter widget is not visible yet
   if( d->dialogVisible )
     return this;
   else
-    return tqparentWidget();
+    return parentWidget();
 }
 
 
@@ -744,7 +744,7 @@ bool K3bEmptyDiscWaiter::questionYesNo( const TQString& text,
 					const TQString& yesText,
 					const TQString& noText )
 {
-  return ( KMessageBox::questionYesNo( tqparentWidgetToUse(),
+  return ( KMessageBox::questionYesNo( parentWidgetToUse(),
 				       text,
 				       caption,
 				       yesText.isEmpty() ? KStdGuiItem::yes() : KGuiItem(yesText),
diff --git a/src/k3bemptydiscwaiter.h b/src/k3bemptydiscwaiter.h
index 79a8674..3d3f55c 100644
--- a/src/k3bemptydiscwaiter.h
+++ b/src/k3bemptydiscwaiter.h
@@ -130,7 +130,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler
   void finishWaiting( int );
   void prepareErasingDialog();
 
-  TQWidget* tqparentWidgetToUse();
+  TQWidget* parentWidgetToUse();
 
   class Private;
   Private* d;
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index ce91619..855b296 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -319,7 +319,7 @@ K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView*
 
 void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
 {
-  if( !tqparentWidget() || !m_view )
+  if( !parentWidget() || !m_view )
     return;
 
   K3bDeviceBranchViewItem* item = dynamic_cast<K3bDeviceBranchViewItem*>( m_view->itemAt( pos ) );
@@ -328,7 +328,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
 
   K3bDevice::Device* dev = static_cast<K3bDeviceBranch*>( item->branch() )->device();
 
-  TQFrame* tooltip = new TQFrame( tqparentWidget() );
+  TQFrame* tooltip = new TQFrame( parentWidget() );
   tooltip->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
   tooltip->setFrameShape( TQFrame::StyledPanel );
   TQGridLayout* lay = new TQGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ );
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index 9200114..b30104e 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -154,11 +154,11 @@ void K3bFlatButton::drawContents( TQPainter* p )
 
 //   if( m_hover )
 //     p->fillRect( rect, m_foreColor );
-//   else if( tqparentWidget() ) {
+//   else if( parentWidget() ) {
 //     TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ), 
 // 	     mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) );
     
-//     tqparentWidget()->tqrepaint( r );
+//     parentWidget()->tqrepaint( r );
 //   }
 
   p->save();
diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp
index 2a2671a..d23c85a 100644
--- a/src/k3bmediacontentsview.cpp
+++ b/src/k3bmediacontentsview.cpp
@@ -133,7 +133,7 @@ void K3bMediaContentsView::slotMediumChanged( K3bDevice::Device* dev )
 {
   // FIXME: derive a K3bContentsStack from TQWidgetStack and let it set an active flag
   // to replace this hack
-  if( TQWidgetStack* stack = dynamic_cast<TQWidgetStack*>( tqparentWidget() ) )
+  if( TQWidgetStack* stack = dynamic_cast<TQWidgetStack*>( parentWidget() ) )
     if( stack->visibleWidget() != this )
       return;
 
diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp
index f9a398f..4dd5fde 100644
--- a/src/k3bmediaselectioncombobox.cpp
+++ b/src/k3bmediaselectioncombobox.cpp
@@ -54,7 +54,7 @@ K3bMediaSelectionComboBox::ToolTip::ToolTip( K3bMediaSelectionComboBox* box )
 
 void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos )
 {
-  if( !tqparentWidget() || !m_box )
+  if( !parentWidget() || !m_box )
     return;
 
   TQListBoxItem* item = m_box->listBox()->itemAt( pos );
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 9d6bb36..7eabfd7 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -112,9 +112,9 @@ void K3bStatusBarManager::update()
   else
     m_labelFreeTemp->setText(i18n("No info"));
 
-  if( path != TQToolTip::textFor( m_labelFreeTemp->tqparentWidget() ) ) {
-    TQToolTip::remove( m_labelFreeTemp->tqparentWidget() );
-    TQToolTip::add( m_labelFreeTemp->tqparentWidget(), path );
+  if( path != TQToolTip::textFor( m_labelFreeTemp->parentWidget() ) ) {
+    TQToolTip::remove( m_labelFreeTemp->parentWidget() );
+    TQToolTip::add( m_labelFreeTemp->parentWidget(), path );
   }
 }
 
@@ -153,7 +153,7 @@ void K3bStatusBarManager::clearActionStatusText()
 bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
 {
   if( e->type() == TQEvent::MouseButtonDblClick ) {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->tqparentWidget()) )
+    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) )
       m_mainWindow->showOptionDialog( 0 );  // FIXME: use an enumeration for the option pages
     else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) )
       if( KAction* a = m_mainWindow->action( "help_about_app" ) )
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 5f97c7f..ee44875 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -210,7 +210,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent,
       // Since kernel 2.6.8 older cdrecord versions are not able to use the SCSI subsystem when running suid root anymore
       // So far we ignore the suid root issue with kernel >= 2.6.8 and cdrecord < 2.01.01a02
       //
-      // Kernel 2.6.16.something seems to introduce another problem which was aptqparently worked around in cdrecord 2.01.01a05
+      // Kernel 2.6.16.something seems to introduce another problem which was apparently worked around in cdrecord 2.01.01a05
       //
       if( K3b::simpleKernelVersion() >= K3bVersion( 2, 6, 8 ) &&
 	  k3bcore->externalBinManager()->binObject( "cdrecord" )->version < K3bVersion( 2, 1, 1, "a05" ) &&
diff --git a/src/k3btooltip.cpp b/src/k3btooltip.cpp
index 63ea037..a28c5c2 100644
--- a/src/k3btooltip.cpp
+++ b/src/k3btooltip.cpp
@@ -47,7 +47,7 @@ K3bToolTip::~K3bToolTip()
 
 void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect )
 {
-  TQLabel* label = new TQLabel( text, tqparentWidget() );
+  TQLabel* label = new TQLabel( text, parentWidget() );
   label->setMargin( 6 );
   if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
     label->setPaletteBackgroundColor( theme->backgroundColor() );
@@ -59,7 +59,7 @@ void K3bToolTip::tip( const TQRect& rect, const TQString& text, int effect )
 
 void K3bToolTip::tip( const TQRect& rect, const TQPixmap& pix, int effect )
 {
-  TQLabel* label = new TQLabel( tqparentWidget() );
+  TQLabel* label = new TQLabel( parentWidget() );
   label->setMargin( 6 );
   if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
     label->setPaletteBackgroundColor( theme->backgroundColor() );
@@ -134,7 +134,7 @@ void K3bToolTip::hideTip()
 
 bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e )
 {
-  if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqparentWidget()) ) {
+  if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(parentWidget()) ) {
     switch( e->type() ) {
     case TQEvent::MouseButtonPress:
     case TQEvent::MouseButtonRelease:
diff --git a/src/k3btooltip.h b/src/k3btooltip.h
index e7b4207..3f05c22 100644
--- a/src/k3btooltip.h
+++ b/src/k3btooltip.h
@@ -35,7 +35,7 @@ class K3bToolTip : public TQObject
   K3bToolTip( TQWidget* widget );
   ~K3bToolTip();
 
-  TQWidget* tqparentWidget() const { return m_parentWidget; }
+  TQWidget* parentWidget() const { return m_parentWidget; }
 
  public slots:
   /**
diff --git a/src/k3bwidgetshoweffect.cpp b/src/k3bwidgetshoweffect.cpp
index fb4dc62..2292c19 100644
--- a/src/k3bwidgetshoweffect.cpp
+++ b/src/k3bwidgetshoweffect.cpp
@@ -70,7 +70,7 @@ void K3bWidgetShowEffect::show( bool effectOnly )
     m_timerId = startTimer( 1000 / 30 );
   }
   else {
-    m_widget->move( 0, m_widget->tqparentWidget()->height() );
+    m_widget->move( 0, m_widget->parentWidget()->height() );
     m_timerId = startTimer( 6 );
   }
   
@@ -97,18 +97,18 @@ void K3bWidgetShowEffect::dissolveMask()
 {
   if( m_bShow ) {
     m_widget->tqrepaint( false );
-    TQPainter tqmaskPainter(&m_tqmask);
+    TQPainter maskPainter(&m_tqmask);
 
     m_tqmask.fill(TQt::black);
 
-    tqmaskPainter.setBrush(TQt::white);
-    tqmaskPainter.setPen(TQt::white);
-    tqmaskPainter.drawRect( m_tqmask.rect() );
+    maskPainter.setBrush(TQt::white);
+    maskPainter.setPen(TQt::white);
+    maskPainter.drawRect( m_tqmask.rect() );
     
     m_dissolveSize += m_dissolveDelta;
 
     if( m_dissolveSize > 0 ) {
-      tqmaskPainter.setRasterOp( TQt::EraseROP );
+      maskPainter.setRasterOp( TQt::EraseROP );
 
       int x, y, s;
       const int size = 16;
@@ -121,7 +121,7 @@ void K3bWidgetShowEffect::dissolveMask()
 	  if( s < 0 )
 	    break;
 
-	  tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
+	  maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
 	}
       }
     }
@@ -153,7 +153,7 @@ void K3bWidgetShowEffect::dissolveMask()
 void K3bWidgetShowEffect::slideMask()
 {
   if( m_bShow ) {
-    m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset );
+    m_widget->move( 0, m_widget->parentWidget()->height() - m_offset );
     
     m_offset++;
     if( m_offset > m_widget->height() ) {
@@ -167,7 +167,7 @@ void K3bWidgetShowEffect::slideMask()
   }
   else {
     m_offset--;
-    m_widget->move( 0, m_widget->tqparentWidget()->height() - m_offset );
+    m_widget->move( 0, m_widget->parentWidget()->height() - m_offset );
     
     if( m_offset < 0 ) {
       // finally hide the widget
diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui
index 26bbf9e..6af30c6 100644
--- a/src/option/base_k3bcddboptiontab.ui
+++ b/src/option/base_k3bcddboptiontab.ui
@@ -551,7 +551,7 @@
     <tabstop>m_checkManualCgiPath</tabstop>
     <tabstop>m_editManualCgiPath</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui
index 4c20c88..f6a7114 100644
--- a/src/option/base_k3bmiscoptiontab.ui
+++ b/src/option/base_k3bmiscoptiontab.ui
@@ -273,7 +273,7 @@
         <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui
index 110c2e2..3d34bad 100644
--- a/src/option/base_k3bpluginoptiontab.ui
+++ b/src/option/base_k3bpluginoptiontab.ui
@@ -83,7 +83,7 @@
         <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>k3blistview.h</includehint>
 </includehints>
diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui
index 5908518..78d9333 100644
--- a/src/option/base_k3bthemeoptiontab.ui
+++ b/src/option/base_k3bthemeoptiontab.ui
@@ -201,7 +201,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 32b8814..a9d5129 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -259,7 +259,7 @@ void K3bExternalBinWidget::save()
   while( progIt.current() ) {
     if( K3bExternalBinViewItem* bV = dynamic_cast<K3bExternalBinViewItem*>( progIt.current() ) ) {
       if( bV->isDefault() )
-	bV->tqparentProgramItem()->program()->setDefault( bV->bin() );
+	bV->parentProgramItem()->program()->setDefault( bV->bin() );
     }
 
     ++progIt;
@@ -290,9 +290,9 @@ void K3bExternalBinWidget::slotSetDefaultButtonClicked()
   K3bExternalBinViewItem* item = dynamic_cast<K3bExternalBinViewItem*>( m_programView->selectedItem() );
   if( item ) {
     // remove all default flags
-    K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->tqparentProgramItem()->firstChild();
+    K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->parentProgramItem()->firstChild();
     TQListViewItemIterator it( bi );
-    while( it.current() && it.current()->tqparent() == item->tqparentProgramItem() ) {
+    while( it.current() && it.current()->tqparent() == item->parentProgramItem() ) {
       ((K3bExternalBinViewItem*)it.current())->setDefault(false);
       ++it;
     }
diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h
index 14fab6a..cc0a9a8 100644
--- a/src/option/k3bexternalbinwidget.h
+++ b/src/option/k3bexternalbinwidget.h
@@ -88,7 +88,7 @@ class K3bExternalBinWidget::K3bExternalBinViewItem : public K3bListViewItem
   K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent );
 
   K3bExternalBin* bin() const { return m_bin; }
-  K3bExternalProgramViewItem* tqparentProgramItem() const { return m_parent; }
+  K3bExternalProgramViewItem* parentProgramItem() const { return m_parent; }
 
   bool isDefault() const { return m_default; }
   void setDefault( bool b );
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index c236ab8..5961ea3 100644
--- a/src/projects/base_k3badvanceddataimagesettings.ui
+++ b/src/projects/base_k3badvanceddataimagesettings.ui
@@ -184,7 +184,7 @@
     <tabstop>m_checkRockRidge</tabstop>
     <tabstop>m_checkJoliet</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui
index c8d647d..ba6cff3 100644
--- a/src/projects/base_k3baudiocdtextallfieldswidget.ui
+++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui
@@ -261,7 +261,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui
index 7478a3e..5c0cbaa 100644
--- a/src/projects/base_k3baudiocdtextwidget.ui
+++ b/src/projects/base_k3baudiocdtextwidget.ui
@@ -214,7 +214,7 @@
     <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot>
     <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui
index 4641369..6c72962 100644
--- a/src/projects/base_k3baudiotrackwidget.ui
+++ b/src/projects/base_k3baudiotrackwidget.ui
@@ -322,7 +322,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
     <tabstop>m_checkPreemphasis</tabstop>
     <tabstop>m_checkCopyPermitted</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui
index f7fab2e..b78f7dc 100644
--- a/src/projects/base_k3bbootimageview.ui
+++ b/src/projects/base_k3bbootimageview.ui
@@ -387,7 +387,7 @@
 <Q_SLOTS>
     <slot access="protected">slotOptionsChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui
index 2b0e7f3..2688f4f 100644
--- a/src/projects/base_k3bdataimagesettings.ui
+++ b/src/projects/base_k3bdataimagesettings.ui
@@ -270,5 +270,5 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string>
 <tabstops>
     <tabstop>m_editReplace</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui
index 74b9681..000a552 100644
--- a/src/projects/base_k3bdatavolumedescwidget.ui
+++ b/src/projects/base_k3bdatavolumedescwidget.ui
@@ -366,5 +366,5 @@
     <tabstop>m_editSystem</tabstop>
     <tabstop>m_editApplication</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui
index 28b093d..c0bb2fe 100644
--- a/src/projects/base_k3bmovixoptionswidget.ui
+++ b/src/projects/base_k3bmovixoptionswidget.ui
@@ -326,7 +326,7 @@
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp
index 1e540e2..6894732 100644
--- a/src/projects/k3baudiotrackaddingdialog.cpp
+++ b/src/projects/k3baudiotrackaddingdialog.cpp
@@ -91,7 +91,7 @@ K3bAudioTrackAddingDialog::~K3bAudioTrackAddingDialog()
 int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, 
 					K3bAudioDoc* doc,
 					K3bAudioTrack* afterTrack,
-					K3bAudioTrack* tqparentTrack,
+					K3bAudioTrack* parentTrack,
 					K3bAudioDataSource* afterSource,
 					TQWidget* tqparent )
 {
@@ -102,7 +102,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
   dlg.m_urls = extractUrlList( urls );
   dlg.m_doc = doc;
   dlg.m_trackAfter = afterTrack;
-  dlg.m_parentTrack = tqparentTrack;
+  dlg.m_parentTrack = parentTrack;
   dlg.m_sourceAfter = afterSource;
   dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) );
 
diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h
index 3482771..9fa5485 100644
--- a/src/projects/k3baudiotrackaddingdialog.h
+++ b/src/projects/k3baudiotrackaddingdialog.h
@@ -66,7 +66,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler
   static int addUrls( const KURL::List& urls, 
 		      K3bAudioDoc* doc,
 		      K3bAudioTrack* afterTrack = 0,
-		      K3bAudioTrack* tqparentTrack = 0,
+		      K3bAudioTrack* parentTrack = 0,
 		      K3bAudioDataSource* afterSource = 0,
 		      TQWidget* tqparent = 0 );
 
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index fcf546c..8f6c475 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -208,8 +208,8 @@ TQDragObject* K3bAudioTrackView::dragObject()
     TQListViewItem* item = *it;
     // we simply ignore open track items to not include files twice
     // we also don't want the invisible source items
-    TQListViewItem* tqparentItem = K3bListView::tqparentItem(item);
-    if( !item->isOpen() && ( !tqparentItem || tqparentItem->isOpen() ) ) {
+    TQListViewItem* parentItem = K3bListView::parentItem(item);
+    if( !item->isOpen() && ( !parentItem || parentItem->isOpen() ) ) {
       if( K3bAudioDataSourceViewItem* sourceItem = dynamic_cast<K3bAudioDataSourceViewItem*>( item ) ) {
 	if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( sourceItem->source() ) )
 	  urls.append( KURL::fromPathOrURL(file->filename()) );
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index 558e0cf..1ec11e6 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -231,8 +231,8 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item )
     // should only be emitted once for every item
     //
     K3bDirItem* dirItem = static_cast<K3bDirItem*>( item );
-    K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()];
-    K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem );
+    K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()];
+    K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem );
     m_itemMap.insert( dirItem, newDirItem );
   }
 }
@@ -456,18 +456,18 @@ void K3bDataDirTreeView::checkForNewItems()
 
 	  TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem );
 	  if( itDirItem == m_itemMap.end() ) {
-	    K3bDataDirViewItem* tqparentViewItem = m_itemMap[dirItem->tqparent()];
-	    K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, tqparentViewItem );
+	    K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()];
+	    K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem );
 	    m_itemMap.insert( dirItem, newDirItem );
 	  }
 	  else {
 	    // check if tqparent still correct (to get moved items)
 	    K3bDataDirViewItem* dirViewItem = itDirItem.data();
-	    K3bDataDirViewItem* tqparentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent();
+	    K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent();
 	    K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()];
-	    if( dirParentViewItem != tqparentViewItem ) {
+	    if( dirParentViewItem != parentViewItem ) {
 	      // reparent it
-	      tqparentViewItem->takeItem( dirViewItem );
+	      parentViewItem->takeItem( dirViewItem );
 	      dirParentViewItem->insertItem( dirViewItem );
 	    }
 	  }
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index 9030759..3777ac7 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -330,7 +330,7 @@ void K3bDataFileView::setupActions()
   m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()),
 				actionCollection(), "rename" );
   m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()),
-				   actionCollection(), "tqparent_dir" );
+				   actionCollection(), "parent_dir" );
   m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()),
 				   actionCollection(), "open" );
 
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 1a645ff..772c13c 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -763,7 +763,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles()
 {
   if( m_iAddHiddenFiles == 0 ) {
     // FIXME: the isVisible() stuff makes the static addUrls method not return (same below)
-    if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/,
+    if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/,
 				    i18n("Do you also want to add hidden files?"),
 				    i18n("Hidden Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes )
       m_iAddHiddenFiles = 1;
@@ -778,7 +778,7 @@ bool K3bDataUrlAddingDialog::addHiddenFiles()
 bool K3bDataUrlAddingDialog::addSystemFiles()
 {
   if( m_iAddSystemFiles == 0 ) {
-    if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : tqparentWidget()*/,
+    if( KMessageBox::questionYesNo( /*isVisible() ? */this/* : parentWidget()*/,
 				    i18n("Do you also want to add system files "
 					 "(FIFOs, sockets, device files, and broken symlinks)?"),
 				    i18n("System Files"), i18n("Add"), i18n("Do Not Add") ) == KMessageBox::Yes )
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index f4d9749..9aaa2b3 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -92,7 +92,7 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name )
   toolBox()->addButton( actionClearSession );
   toolBox()->addButton( actionEditBootImages );
   toolBox()->addSeparator();
-  toolBox()->addButton( m_dataFileView->actionCollection()->action("tqparent_dir") );
+  toolBox()->addButton( m_dataFileView->actionCollection()->action("parent_dir") );
   toolBox()->addSeparator();
 
   addPluginButtons( K3bProjectPlugin::DATA_CD );
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index b52782c..4d9f543 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -285,7 +285,7 @@ public:
   }
 
   void maybeTip( const TQPoint& ) {
-    tip( tqparentWidget()->rect(),
+    tip( parentWidget()->rect(),
 	 KIO::convertSize( m_doc->size() ) +
 	 " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
 	 m_doc->length().toString(false) + " " + i18n("min") +
@@ -597,7 +597,7 @@ void K3bFillStatusDisplay::slotDetermineSize()
   bool canceled = false;
   K3bDevice::Device* dev = K3bMediaSelectionDialog::selectMedium( d->showDvdSizes ? K3bDevice::MEDIA_WRITABLE_DVD : K3bDevice::MEDIA_WRITABLE_CD,
 								  K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE,
-								  tqparentWidget(),
+								  parentWidget(),
 								  TQString(), TQString(), &canceled );
 
   if( dev ) {
@@ -608,10 +608,10 @@ void K3bFillStatusDisplay::slotDetermineSize()
       update();
     }
     else
-      KMessageBox::error( tqparentWidget(), i18n("Medium is not empty.") );
+      KMessageBox::error( parentWidget(), i18n("Medium is not empty.") );
   }
   else if( !canceled )
-    KMessageBox::error( tqparentWidget(), i18n("No usable medium found.") );
+    KMessageBox::error( parentWidget(), i18n("No usable medium found.") );
 }
 
 
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index 419e3a3..5390e4c 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -223,9 +223,9 @@ void K3bProjectBurnDialog::slotStartClicked()
 
   K3bJobProgressDialog* dlg = 0;
   if( m_checkOnlyCreateImage && m_checkOnlyCreateImage->isChecked() )
-    dlg = new K3bJobProgressDialog( tqparentWidget() );
+    dlg = new K3bJobProgressDialog( parentWidget() );
   else
-    dlg = new K3bBurnProgressDialog( tqparentWidget() );
+    dlg = new K3bBurnProgressDialog( parentWidget() );
 
   m_job = m_doc->newBurnJob( dlg );
 
diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 010b10f..5a7a15b 100644
--- a/src/rip/base_k3baudiorippingoptionwidget.ui
+++ b/src/rip/base_k3baudiorippingoptionwidget.ui
@@ -274,7 +274,7 @@ file will contain all tracks one after the other.
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index b8ec09e..feff67a 100644
--- a/src/rip/base_k3bcddbpatternwidget.ui
+++ b/src/rip/base_k3bcddbpatternwidget.ui
@@ -172,7 +172,7 @@
     <tabstop>m_checkBlankReplace</tabstop>
     <tabstop>m_editBlankReplace</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
     <includehint>kurllabel.h</includehint>
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index d0fe302..7143ed3 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -194,7 +194,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked()
   if( encoder )
     thread->setFileType( m_optionWidget->extension() );
 
-  K3bJobProgressDialog progressDialog( tqparentWidget() );
+  K3bJobProgressDialog progressDialog( parentWidget() );
 
   K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) );
 
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 1592198..e669749 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -254,7 +254,7 @@ void K3bAudioRippingDialog::slotStartClicked()
     ++i;
   }
 
-  K3bJobProgressDialog ripDialog( tqparentWidget(), "Ripping" );
+  K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" );
 
   K3bAudioEncoder* encoder = m_optionWidget->encoder();
   K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) );
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index bc47c62..c8fe675 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -470,17 +470,17 @@ void K3bVideoCdView::enableInteraction( bool b )
   actionCollection()->action( "start_rip" )->setEnabled( b );
 }
 
-void K3bVideoCdView::buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname )
+void K3bVideoCdView::buildTree( TQListViewItem *parentItem, const TQDomElement &parentElement, const TQString& pname )
 {
     VideoTrackViewItem * thisItem = 0;
-    TQDomNode node = tqparentElement.firstChild();
+    TQDomNode node = parentElement.firstChild();
 
     while ( !node.isNull() ) {
         if ( node.isElement() && node.nodeName() == "folder" || node.nodeName() == "file" ) {
-            if ( tqparentItem == 0 )
+            if ( parentItem == 0 )
                 thisItem = new VideoTrackViewItem( m_trackView, thisItem );
             else
-                thisItem = new VideoTrackViewItem( tqparentItem, thisItem );
+                thisItem = new VideoTrackViewItem( parentItem, thisItem );
 
             TQString txt = node.firstChild().toElement().text();
             thisItem->setText( 0, txt);
@@ -492,10 +492,10 @@ void K3bVideoCdView::buildTree( TQListViewItem *tqparentItem, const TQDomElement
 		buildTree( thisItem, node.toElement(), pname );
             }
         } else if ( node.isElement() && node.nodeName() == "segment-item" || node.nodeName() == "sequence-item" ) {
-            if ( tqparentItem == 0 )
+            if ( parentItem == 0 )
                 thisItem = new VideoTrackViewItem( m_trackView, thisItem );
             else
-                thisItem = new VideoTrackViewItem( tqparentItem, thisItem );
+                thisItem = new VideoTrackViewItem( parentItem, thisItem );
 
             thisItem->setText( 0, node.toElement().attribute( "src" ) );
 
diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h
index 65b2f8a..da7756c 100644
--- a/src/rip/k3bvideocdview.h
+++ b/src/rip/k3bvideocdview.h
@@ -79,7 +79,7 @@ class K3bVideoCdView : public K3bMediaContentsView
         void initActions();
         void updateDisplay();
         void enableInteraction( bool );
-        void buildTree( TQListViewItem *tqparentItem, const TQDomElement &tqparentElement, const TQString& pname = TQString() );
+        void buildTree( TQListViewItem *parentItem, const TQDomElement &parentElement, const TQString& pname = TQString() );
 
         K3bDevice::Toc m_toc;
 
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 234dab5..864b798 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -706,7 +706,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 57f6426..c54bb61 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -611,7 +611,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked()
   }
 
   // start the job
-  K3bJobProgressDialog dlg( tqparentWidget() );
+  K3bJobProgressDialog dlg( parentWidget() );
   K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg );
   job->setVideoDVD( m_dvd );
   job->setTitles( titles );