Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 766478630b5e0f435d8aef9ee7ba44651e4e431d)

1 files changed, 19 insertions, 19 deletions

diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index a6efede..8ae7ee1 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -129,7 +129,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
   TQPixmap buffer( size() );
   buffer.fill( colorGroup().base() );
   TQPainter p;
-  p.begin( &buffer, TQT_TQOBJECT(this) );
+  p.begin( &buffer, this );
   p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color)
 
   long long docSize;
@@ -344,7 +344,7 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const
 //   d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") );
 //   d->buttonMenu->setAutoRaise(true);
 //   TQToolTip::add( d->buttonMenu, i18n("Fill display properties") );
-//   connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) );
+//   connect( d->buttonMenu, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMenuButtonClicked()) );
 
   TQGridLayout* layout = new TQGridLayout( this );
   layout->setSpacing(5);
@@ -357,8 +357,8 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const
 
   showDvdSizes( false );
 
-  connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) );
-  connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) );
+  connect( d->doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotDocChanged()) );
+  connect( &d->updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateDisplay()) );
   connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)),
 	   this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) );
 }
@@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu()
   d->popup = new TDEPopupMenu( this, "popup" );
   d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" );
 
-  d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()),
+  d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, this, TQT_SLOT(showTime()),
 					   d->actionCollection, "fillstatus_show_minutes" );
-  d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()),
+  d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, this, TQT_SLOT(showSize()),
 					d->actionCollection, "fillstatus_show_megabytes" );
 
   d->actionShowMegs->setExclusiveGroup( "show_size_in" );
   d->actionShowMinutes->setExclusiveGroup( "show_size_in" );
 
-  d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()),
+  d->actionAuto = new TDERadioAction( i18n("Auto"), 0, this, TQT_SLOT(slotAutoSize()),
 				    d->actionCollection, "fillstatus_auto" );
-  d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
+  d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, this, TQT_SLOT(slot74Minutes()),
 				     d->actionCollection, "fillstatus_74minutes" );
-  d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
+  d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, this, TQT_SLOT(slot80Minutes()),
 				     d->actionCollection, "fillstatus_80minutes" );
-  d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
+  d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, this, TQT_SLOT(slot100Minutes()),
 				      d->actionCollection, "fillstatus_100minutes" );
-  d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
+  d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, TQT_SLOT(slotDvd4_7GB()),
 					d->actionCollection, "fillstatus_dvd_4_7gb" );
   d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)),
-					      0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()),
+					      0, this, TQT_SLOT(slotDvdDoubleLayer()),
 					      d->actionCollection, "fillstatus_dvd_double_layer" );
-  d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()),
+  d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, TQT_SLOT(slotCustomSize()),
 					    d->actionCollection, "fillstatus_custom_size" );
   d->actionCustomSize->setAlwaysEmitActivated(true);
   d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0,
-					       TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()),
+					       this, TQT_SLOT(slotDetermineSize()),
 					       d->actionCollection, "fillstatus_size_from_disk" );
   d->actionDetermineSize->setAlwaysEmitActivated(true);
 
@@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu()
   d->actionDetermineSize->setExclusiveGroup( "cd_size" );
 
   d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0,
-					   TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()),
+					   this, TQT_SLOT(slotLoadUserDefaults()),
 					   d->actionCollection, "load_user_defaults" );
   d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0,
-					   TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()),
+					   this, TQT_SLOT(slotSaveUserDefaults()),
 					   d->actionCollection, "save_user_defaults" );
 
   TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0,
-					    TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()),
+					    this, TQT_SLOT(slotWhy44()),
 					    d->actionCollection, "why_44_gb" );
 
   d->popup->insertTitle( i18n("Show Size In") );
@@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu()
   d->actionLoadUserDefaults->plug( d->dvdPopup );
   d->actionSaveUserDefaults->plug( d->dvdPopup );
 
-  connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) );
+  connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), this, TQT_SLOT(slotPopupMenu(const TQPoint&)) );
 }
 
 
@@ -551,7 +551,7 @@ void K3bFillStatusDisplay::slotCustomSize()
 					d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) :
 					(d->showTime ? TQString("74")+minS : TQString("650")+mbS),
 					&ok, this, (const char*)0,
-					new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );
+					new TQRegExpValidator( rx, this ) );
   if( ok ) {
     // determine size
     if( rx.exactMatch( size ) ) {