Rename a number of old tq methods that are no longer tq specific

23 files changed, 94 insertions, 94 deletions

diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index a5f81e3..34615e3 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -68,13 +68,13 @@ void K3bBusyWidget::animateBusy()
 }
 
 
-TQSize K3bBusyWidget::tqsizeHint() const
+TQSize K3bBusyWidget::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 
-TQSize K3bBusyWidget::tqminimumSizeHint() const
+TQSize K3bBusyWidget::minimumSizeHint() const
 {
   return TQSize( 2*frameWidth() + 62, 10 );
 }
diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h
index 7eb927e..bbaddc0 100644
--- a/libk3b/tools/k3bbusywidget.h
+++ b/libk3b/tools/k3bbusywidget.h
@@ -35,8 +35,8 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame
 
   void showBusy( bool b );
 
-  TQSize tqsizeHint() const;
-  TQSize tqminimumSizeHint() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
 
  protected:
   void drawContents( TQPainter* p );
diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h
index bbeb19e..ff4a09a 100644
--- a/libk3b/tools/k3bcdparanoialib.h
+++ b/libk3b/tools/k3bcdparanoialib.h
@@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib
    */
   int status() const;
 
-  enum tqStatus {
+  enum Status {
     S_OK,
     S_ERROR
     // to be extended with Jitter and stuff...
diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp
index 3536c24..089e27e 100644
--- a/libk3b/tools/k3bcutcombobox.cpp
+++ b/libk3b/tools/k3bcutcombobox.cpp
@@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name )
   : KComboBox( parent, name )
 {
   d = new Private();
-  //  tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
+  //  setSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
 }
 
 
@@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m )
 }
 
 
-TQSize K3bCutComboBox::tqsizeHint() const
+TQSize K3bCutComboBox::sizeHint() const
 {
-//   TQSize s(KComboBox::tqsizeHint());
+//   TQSize s(KComboBox::sizeHint());
 
 //   for( int i = 0; i < count(); i++ ) {
 //     int w = fontMetrics().width(d->originalItems[i]) + 
@@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const
 //       s.setWidth( w );
 //   }
 
-  return KComboBox::tqsizeHint();
+  return KComboBox::sizeHint();
 }
 
-TQSize K3bCutComboBox::tqminimumSizeHint() const
+TQSize K3bCutComboBox::minimumSizeHint() const
 {
-  return KComboBox::tqminimumSizeHint();
+  return KComboBox::minimumSizeHint();
 }
 
 
@@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e )
 
 void K3bCutComboBox::cutText()
 {
-  d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
+  d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
 								TQStyle::SC_ComboBoxEditField), this ).width();
 
   for( int i = 0; i < (int)d->originalItems.count(); ++i ) {
diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h
index 7bc8f70..6fdf18e 100644
--- a/libk3b/tools/k3bcutcombobox.h
+++ b/libk3b/tools/k3bcutcombobox.h
@@ -54,10 +54,10 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
   void setMethod( int );
 
   /** reimplemeted */
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
   /** reimplemeted */
-  TQSize tqminimumSizeHint() const;
+  TQSize minimumSizeHint() const;
 
   /** reimplemeted */
   virtual void setCurrentText( const TQString& );
diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp
index 0c6c3f4..0c8a3b3 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.cpp
+++ b/libk3b/tools/k3bdeviceselectiondialog.cpp
@@ -22,7 +22,7 @@
 #include <k3bdevicemanager.h>
 
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqstring.h>
 #include <tqframe.h>
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index fb3be4b..f59ca38 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -33,7 +33,7 @@
 #include <tqevent.h>
 #include <tqvalidator.h>
 #include <tqfont.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqstyle.h>
 #include <tqapplication.h>
 #include <tqprogressbar.h>
@@ -272,7 +272,7 @@ void K3bListViewItem::setBackgroundColor( int col, const TQColor& c )
   ColumnInfo* info = getColumnInfo( col );
   info->backgroundColorSet = true;
   info->backgroundColor = c;
-  tqrepaint();
+  repaint();
 }
 
 
@@ -281,7 +281,7 @@ void K3bListViewItem::setForegroundColor( int col, const TQColor& c )
  ColumnInfo* info = getColumnInfo( col );
  info->foregroundColorSet = true;
  info->foregroundColor = c;
- tqrepaint();
+ repaint();
 }
 
 
@@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p )
     setDisplayProgressBar( col, true );
   if( info->progressValue != p ) {
     info->progressValue = p;
-    tqrepaint();
+    repaint();
   }
 }
 
@@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps )
   ColumnInfo* info = getColumnInfo( col );
   info->totalProgressSteps = steps;
 
-  tqrepaint();
+  repaint();
 }
 
 
@@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin )
   ColumnInfo* info = getColumnInfo( col );
   info->margin = margin;
 
-  tqrepaint();
+  repaint();
 }
 
 
 void K3bListViewItem::setMarginVertical( int margin )
 {
   m_vMargin = margin;
-  tqrepaint();
+  repaint();
 }
 
 
@@ -364,7 +364,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col,
   if( info->backgroundColorSet )
     cgh.setColor( TQColorGroup::Base, info->backgroundColor );
 
-  // in case this is the selected row has a margin we need to tqrepaint the selection bar
+  // in case this is the selected row has a margin we need to repaint the selection bar
   if( isSelected() &&
       (col == 0 || listView()->allColumnsShowFocus()) &&
       info->margin > 0 ) {
@@ -445,11 +445,11 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i
   s_dummyProgressBar->setTotalSteps( info->totalProgressSteps );
   s_dummyProgressBar->setProgress( info->progressValue );
 
-  // some styles use the widget's tqgeometry
+  // some styles use the widget's geometry
   s_dummyProgressBar->setGeometry( r );
 
-  listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
-  listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+  listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+  listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
 
   // now we really paint the progress in the listview
   p->drawPixmap( 0, 0, *doubleBuffer );
@@ -498,7 +498,7 @@ bool K3bCheckListViewItem::isChecked() const
 void K3bCheckListViewItem::setChecked( bool checked )
 {
   m_checked = checked;
-  tqrepaint();
+  repaint();
 }
 
 
@@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
 
   if( col == 0 ) {
     if( m_checked ) {
-      TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
+      TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
 
       TQStyle::SFlags flags = TQStyle::Style_Default;
       if( listView()->isEnabled() )
@@ -666,7 +666,7 @@ void K3bListView::showEditor( K3bListViewItem* item, int col )
 void K3bListView::placeEditor( K3bListViewItem* item, int col )
 {
   ensureItemVisible( item );
-  TQRect r = tqitemRect( item );
+  TQRect r = itemRect( item );
 
   r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() );
   r.setWidth( header()->sectionSize( col ) - 1 );
@@ -699,7 +699,7 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col )
 
   if( TQWidget* editor = prepareEditor( item, col ) ) {
     editor->resize( r.size() );
-    //    editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) );
+    //    editor->resize( TQSize( r.width(), editor->minimumSizeHint().height() ) );
     moveChild( editor, r.x(), r.y() );
   }
 }
@@ -1142,8 +1142,8 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
 	TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
 	TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
 	TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
-      // make sure we did not lose the focus to one of the edit widgets' tqchildren
-      if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
+      // make sure we did not lose the focus to one of the edit widgets' children
+      if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
 	doRename();
 	hideEditor();
       }
@@ -1170,7 +1170,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
     TQPixmap bgPix( size );
 
     // FIXME: let the user specify the color
-    bgPix.fill( tqcolorGroup().base() );
+    bgPix.fill( colorGroup().base() );
 
     if( bgPix.width() < m_backgroundPixmap.width() ||
 	bgPix.height() < m_backgroundPixmap.height() ) {
@@ -1227,7 +1227,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
   int width = header()->width();
   int height = 0;
   for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) {
-    TQRect r = tqitemRect( *it );
+    TQRect r = itemRect( *it );
 
     if( r.isValid() ) {
       height += ( *it )->height();
@@ -1256,13 +1256,13 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
     // FIXME: items on other than the top level have a smaller first column
     //        the same goes for all items if root is decorated
     bool alreadyDrawing = false;
-    TQRect r = tqitemRect( item );
+    TQRect r = itemRect( item );
     if( r.isValid() ) {
       if( items.containsRef( item ) ) {
 	// paint all columns
 	int x = 0;
 	for( int i = 0; i < columns(); ++i ) {
-	  item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) );
+	  item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) );
 	  p.translate( columnWidth( i ), 0 );
 	  x += columnWidth( i );
 	}
@@ -1274,7 +1274,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
       else if( alreadyDrawing )
 	p.translate( 0, item->height() );
 
-      if( p.tqworldMatrix().dy() >= pix.height() )
+      if( p.worldMatrix().dy() >= pix.height() )
 	break;
     }
   }
diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp
index eef276e..8bb5f69 100644
--- a/libk3b/tools/k3blistviewitemanimator.cpp
+++ b/libk3b/tools/k3blistviewitemanimator.cpp
@@ -80,7 +80,7 @@ void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col )
   m_item = item;
   m_column = col;
   m_pixmap = *item->pixmap(col);
-  m_fadeColor = item->listView()->tqcolorGroup().base();
+  m_fadeColor = item->listView()->colorGroup().base();
   start();
 }
 
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index a04c9a0..7c20a05 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -97,14 +97,14 @@ void K3bMd5Job::start()
   }
   else if( !d->filename.isEmpty() ) {
     if( !TQFile::exists( d->filename ) ) {
-      emit infoMessage( i18n("Could not find file %1").tqarg(d->filename), ERROR );
+      emit infoMessage( i18n("Could not find file %1").arg(d->filename), ERROR );
       jobFinished(false);
       return;
     }
 
     d->file.setName( d->filename );
     if( !d->file.open( IO_ReadOnly ) ) {
-      emit infoMessage( i18n("Could not open file %1").tqarg(d->filename), ERROR );
+      emit infoMessage( i18n("Could not open file %1").arg(d->filename), ERROR );
       jobFinished(false);
       return;
     }
@@ -204,7 +204,7 @@ void K3bMd5Job::slotUpdate()
 
     if( readSize <= 0 ) {
       //      kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl;
-      emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").tqarg(d->maxSize).tqarg(d->readData) );
+      emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").arg(d->maxSize).arg(d->readData) );
       stopAll();
       emit percent( 100 );
       jobFinished(true);
@@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate()
       }
 
       if( read < 0 ) {
-	emit infoMessage( i18n("Error while reading from file %1").tqarg(d->filename), ERROR );
+	emit infoMessage( i18n("Error while reading from file %1").arg(d->filename), ERROR );
 	stopAll();
 	jobFinished(false);
       }
       else if( read == 0 ) {
 	//	kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl;
-	emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").tqarg(d->readData) );
+	emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").arg(d->readData) );
 	stopAll();
 	emit percent( 100 );
 	jobFinished(true);
@@ -303,7 +303,7 @@ TQCString K3bMd5Job::base64Digest()
 
 void K3bMd5Job::stop()
 {
-  emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").tqarg(d->readData) );
+  emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").arg(d->readData) );
   stopAll();
   jobFinished( true );
 }
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 2266be8..e3d3a70 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -50,16 +50,16 @@ K3bMsfEdit::~K3bMsfEdit()
 {}
 
 
-TQSize K3bMsfEdit::tqsizeHint() const
+TQSize K3bMsfEdit::sizeHint() const
 {
   // more or less copied from TQSpinBox
   constPolish();
-  TQSize sz = editor()->tqsizeHint();
+  TQSize sz = editor()->sizeHint();
   int h = sz.height();
   TQFontMetrics fm( font() );
   int w = fm.width( "00:00:00" );
   int wx = fm.width( ' ' )*2;
-  int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth );
+  int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
   return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
 				  TQSize( w + wx + downRect().width() + frame*2,
 					 h + frame*2).
diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h
index d3e75ec..347b6ad 100644
--- a/libk3b/tools/k3bmsfedit.h
+++ b/libk3b/tools/k3bmsfedit.h
@@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox
   K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 );
   ~K3bMsfEdit();
 
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
   void setFrameStyle( int style );
   void setLineWidth(int);
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 01f64cd..af73154 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsignalmapper.h>
 #include <tqptrlist.h>
 #include <tqlabel.h>
diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp
index fe7b2af..b0e39a8 100644
--- a/libk3b/tools/k3bprogressdialog.cpp
+++ b/libk3b/tools/k3bprogressdialog.cpp
@@ -19,7 +19,7 @@
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqwidgetstack.h>
 
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index a4c58bd..69c6ed5 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -125,10 +125,10 @@ void K3bPushButton::slotDelayedPopup()
   if( isDown() ) {
     // popup the menu.
     // this has been taken from the TQPushButton code
-    if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() )
+    if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= tqApp->desktop()->height() )
       popup()->exec( mapToGlobal( rect().bottomLeft() ) );
     else
-      popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) );
+      popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->sizeHint().height() ) ) );
     setDown( false );
   }
 }
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 02878c2..92d5877 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -16,7 +16,7 @@
 #include "k3brichtextlabel.h"
 
 #include <tqtooltip.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqsimplerichtext.h>
 
 #include <kglobalsettings.h>
@@ -38,14 +38,14 @@ static TQString qrichtextify( const TQString& text )
 K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
 }
 
 void K3bRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -59,7 +59,7 @@ TQSizePolicy K3bRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize K3bRichTextLabel::tqminimumSizeHint() const
+TQSize K3bRichTextLabel::minimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -94,9 +94,9 @@ TQSize K3bRichTextLabel::tqminimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize K3bRichTextLabel::tqsizeHint() const
+TQSize K3bRichTextLabel::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 void K3bRichTextLabel::setText( const TQString &text ) {
diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h
index cf1bc79..d2c7250 100644
--- a/libk3b/tools/k3brichtextlabel.h
+++ b/libk3b/tools/k3brichtextlabel.h
@@ -21,7 +21,7 @@
 #include <k3b_export.h>
 
 /**
- * @short A replacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
@@ -43,8 +43,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots:
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index c8fee1b..3b33a18 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -20,7 +20,7 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 #include <tqframe.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <klocale.h>
 
diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp
index 21476b0..0d4f37b 100644
--- a/libk3b/tools/k3btitlelabel.cpp
+++ b/libk3b/tools/k3btitlelabel.cpp
@@ -30,7 +30,7 @@ public:
   Private() {
     titleLength = subTitleLength = 0;
     margin = 2;
-    tqalignment = TQt::AlignLeft;
+    alignment = TQt::AlignLeft;
     cachedMinimumWidth = 0;
     titleBaseLine = 0;
   }
@@ -41,7 +41,7 @@ public:
   TQString displayTitle;
   TQString displaySubTitle;
 
-  int tqalignment;
+  int alignment;
 
   int titleLength;
   int subTitleLength;
@@ -71,9 +71,9 @@ public:
       neededWidth += m_label->d->displaySubTitleLength + 5;
 
     int startPos = 0;
-    if( m_label->d->tqalignment & TQt::AlignHCenter )
+    if( m_label->d->alignment & TQt::AlignHCenter )
       startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2;
-    else if( m_label->d->tqalignment & TQt::AlignRight )
+    else if( m_label->d->alignment & TQt::AlignRight )
       startPos = r.right() - m_label->d->margin - neededWidth;
     else
       startPos = r.left() + m_label->d->margin;
@@ -126,19 +126,19 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle )
 }
 
 
-void K3bTitleLabel::tqsetAlignment( int align )
+void K3bTitleLabel::setAlignment( int align )
 {
-  d->tqalignment = align;
+  d->alignment = align;
   update();
 }
 
 
-TQSize K3bTitleLabel::tqsizeHint() const
+TQSize K3bTitleLabel::sizeHint() const
 {
   return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine );
 }
 
-TQSize K3bTitleLabel::tqminimumSizeHint() const
+TQSize K3bTitleLabel::minimumSizeHint() const
 {
   return TQSize( d->cachedMinimumWidth, d->titleBaseLine );
 }
@@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( TQPainter* p )
     neededWidth += d->displaySubTitleLength + 5;
 
   int startPos = 0;
-  if( d->tqalignment & TQt::AlignHCenter )
+  if( d->alignment & TQt::AlignHCenter )
     startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2;
-  else if( d->tqalignment & TQt::AlignRight )
+  else if( d->alignment & TQt::AlignRight )
     startPos = r.right() - d->margin - neededWidth;
   else
     startPos = r.left() + d->margin;
diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h
index b850b12..5e99e59 100644
--- a/libk3b/tools/k3btitlelabel.h
+++ b/libk3b/tools/k3btitlelabel.h
@@ -32,8 +32,8 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
   K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 );
   ~K3bTitleLabel();
 
-  TQSize tqsizeHint() const;
-  TQSize tqminimumSizeHint() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
 
  public slots:
    /**
@@ -47,10 +47,10 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
   /**
    * The title label only supports alignments left, hcenter, and right
    *
-   * Default tqalignment is left.
+   * Default alignment is left.
    */
   // FIXME: honor right-to-left languages
-  void tqsetAlignment( int align );
+  void setAlignment( int align );
 
  protected:
   void resizeEvent( TQResizeEvent* );
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index cf72a3b..216e681 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -22,7 +22,7 @@
 
 #include <tqtoolbutton.h>
 #include <tqsizepolicy.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
@@ -44,7 +44,7 @@ class K3bToolBoxSeparator : public TQWidget
  public:
   K3bToolBoxSeparator( K3bToolBox* parent );
   
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
   
  protected:
   void paintEvent( TQPaintEvent * );
@@ -54,13 +54,13 @@ class K3bToolBoxSeparator : public TQWidget
 K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent )
   : TQWidget( parent )
 {
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 }
 
 
-TQSize K3bToolBoxSeparator::tqsizeHint() const
+TQSize K3bToolBoxSeparator::sizeHint() const
 {
-  int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+  int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				    this );
   return TQSize( extent, 0 );
 }
@@ -72,7 +72,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
   TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
 
   tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
-			 tqcolorGroup(), flags );
+			 colorGroup(), flags );
 }
 
 
@@ -81,7 +81,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent )
   : TQToolButton( parent ),
     m_popupMenu(0)
 {
-  tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
+  setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
   setAutoRaise( true );
 
   setIconSet( action->iconSet() );
@@ -127,7 +127,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon,
   : TQToolButton( parent ),
     m_popupMenu(0)
 {
-  tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
+  setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
   setAutoRaise( true );
 
   setTextLabel( text );
@@ -171,7 +171,7 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e )
 K3bToolBox::K3bToolBox( TQWidget* parent, const char* name )
   : TQFrame( parent, name )
 {
-  tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
+  setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
 
   m_mainLayout = new TQGridLayout( this );
   m_mainLayout->setMargin( 1 );
@@ -243,7 +243,7 @@ void K3bToolBox::addStretch()
 void K3bToolBox::addLabel( const TQString& text )
 {
   TQLabel* label = new TQLabel( text, this );
-  label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
+  label->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
 
   addWidget( label );
 }
@@ -257,7 +257,7 @@ void K3bToolBox::addWidget( TQWidget* w )
 
   m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 );
 
-  if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum )
+  if( w->sizePolicy().horData() == TQSizePolicy::Fixed || w->sizePolicy().horData() == TQSizePolicy::Maximum )
     m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 );
   else {
     m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 );
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 8f2a20e..5b80907 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -69,7 +69,7 @@ void K3bToolButton::drawButton( TQPainter* p )
       arrowFlags |= TQStyle::Style_Enabled;
     
     tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
-			  TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+			  TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 			  arrowFlags, TQStyleOption() );
   }
 }
diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp
index fd806ba..1ef08ad 100644
--- a/libk3b/tools/kcutlabel.cpp
+++ b/libk3b/tools/kcutlabel.cpp
@@ -27,7 +27,7 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name
  : TQLabel ( parent, name ),
    m_minChars(1) {
   TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
-  tqsetSizePolicy(myLabelSizePolicy);
+  setSizePolicy(myLabelSizePolicy);
   m_fullText = text;
   cutTextToLabel();
 }
@@ -36,12 +36,12 @@ KCutLabel::KCutLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ),
    m_minChars(1) {
   TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
-  tqsetSizePolicy(myLabelSizePolicy);
+  setSizePolicy(myLabelSizePolicy);
 }
 
-TQSize KCutLabel::tqminimumSizeHint() const
+TQSize KCutLabel::minimumSizeHint() const
 {
-  TQSize sh = TQLabel::tqminimumSizeHint();
+  TQSize sh = TQLabel::minimumSizeHint();
   if( m_minChars == 0 )
     sh.setWidth(-1);
   else if( m_minChars < (int)m_fullText.length() )
diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h
index 7b96fe2..86c226e 100644
--- a/libk3b/tools/kcutlabel.h
+++ b/libk3b/tools/kcutlabel.h
@@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel
   KCutLabel( TQWidget *parent = 0, const char *name = 0);
   KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 );
 
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
   /**
    * \return the full text while text() returns the cut text