Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit dd6db75d8ab2821740e4ce6c66c9de91252138ea)

2 files changed, 14 insertions, 14 deletions

diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index a0c2180d..4f5b0537 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -64,8 +64,8 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
 			for ( TQValueList<KRecBuffer*>::iterator it = _file->_buffers.begin(); it != _file->_buffers.end(); ++it ) {
 				newBuffer( ( *it ) );
 			}
-			connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) );
-			connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+			connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) );
+			connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
 			//kdDebug( 60005 ) << _file->_currentBuffer << endl;
 		}
 	}
@@ -98,7 +98,7 @@ void KRecFileWidget::mouseReleaseEvent( TQMouseEvent* qme ) {
 void KRecFileWidget::newBuffer( KRecBuffer* buffer ) {
 	//kdDebug( 60005 ) << k_funcinfo << buffer << endl;
 	KRecBufferWidget *tmp = new KRecBufferWidget( buffer, this );
-	connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), TQT_TQOBJECT(this), TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
+	connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
 	bufferwidgets.append( tmp );
 	tmp->show();
 	resizeEvent();
@@ -119,12 +119,12 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) {
 
 void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
 	TDEPopupMenu tmp( this );
-	TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), TQT_TQOBJECT(this) );
+	TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), this );
 	_activeaction->setChecked( bw->buffer()->active() );
 	connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) );
-	TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) );
-	TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) );
-	TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) );
+	TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), this );
+	TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), bw, TQT_SLOT( changeTitle() ), this );
+	TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), bw, TQT_SLOT( changeComment() ), this );
 	_activeaction->plug( &tmp );
 	_changetitle->plug( &tmp );
 	_changecomment->plug( &tmp );
@@ -147,7 +147,7 @@ KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char*
   , _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 )
   , alreadyreadsize( 0 )
 {
-	connect( _buffer, TQT_SIGNAL( somethingChanged() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) );
+	connect( _buffer, TQT_SIGNAL( somethingChanged() ), this, TQT_SLOT( update() ) );
 	kdDebug( 60005 ) << k_funcinfo << endl;
 }
 KRecBufferWidget::~KRecBufferWidget() {
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 324d1d01..f9a79891 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -164,7 +164,7 @@ void KRecPrivate::exportFile() {
 				if ( _exportitem->initialize( filename ) ) {
 					connect( _exportitem, TQT_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) );
 					connect( _currentFile, TQT_SIGNAL( endReached() ), _exportitem, TQT_SLOT( stop() ) );
-					connect( _currentFile, TQT_SIGNAL( endReached() ), TQT_TQOBJECT(this), TQT_SLOT( endExportFile() ) );
+					connect( _currentFile, TQT_SIGNAL( endReached() ), this, TQT_SLOT( endExportFile() ) );
 					_exportitem->start();
 				}
 			} else
@@ -185,7 +185,7 @@ void KRecPrivate::exportFile() {
 	} else KRecGlobal::the()->message( i18n( "There is nothing to export." ) );
 	checkActions();
 }
-void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); }
+void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQT_SLOT( endExportFile2() ) ); }
 void KRecPrivate::endExportFile2() {
 	_exportitem->finalize();
 	disconnect( _currentFile, 0, _exportitem, 0 );
@@ -290,7 +290,7 @@ KRecord::KRecord(TQWidget *parent, const char *name )
 	KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() );
 	KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() );
 	KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() );
-	KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+	KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
 
 	KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() );
 
@@ -298,11 +298,11 @@ KRecord::KRecord(TQWidget *parent, const char *name )
 	                              d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" );
 
 	d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
-	                          TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" );
+	                          this, TQT_SLOT( startRec() ), actionCollection(), "player_record" );
 	d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
-	                        TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
+	                        this, TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
 	d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
-	                        TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
+	                        this, TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
 	d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" );
 	connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) );