Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

13 files changed, 70 insertions, 70 deletions

diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 31df79aa..6d4d58a1 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -41,10 +41,10 @@ KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList&
 	_layout->addSpacing( 10 );
 
 	_filewidget = new KRecConfigFilesWidget( this );
-	connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+	connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
 	_layout->addWidget( _filewidget );
 
 	_layout->addStretch( 100 );
diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp
index d396d41f..eae7157a 100644
--- a/krec/krecconfig_fileswidget.cpp
+++ b/krec/krecconfig_fileswidget.cpp
@@ -37,7 +37,7 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n )
  , _samplingRate( 44100 ), _channels( 2 ), _bits( 16 )
 {
 	_ratebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sampling Rate" ), _hbox );
-	connect( _ratebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
+	connect( _ratebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
 	_rate48 = new TQRadioButton( i18n( "48000 Hz" ), _ratebox );
 	_rate44 = new TQRadioButton( i18n( "44100 Hz" ), _ratebox );
 	_rate22 = new TQRadioButton( i18n( "22050 Hz" ), _ratebox );
@@ -50,18 +50,18 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n )
 	_rateotherline->setMaxLength( 10 );
 	_rateotherline->setFrame( true );
 	_rateotherbox->setEnabled( false );
-	connect( _rateotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( rateotherchanged( const TQString& ) ) );
+	connect( _rateotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( rateotherchanged( const TQString& ) ) );
 	_channelsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Channels" ), _hbox );
-	connect( _channelsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
+	connect( _channelsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
 	_channels2 = new TQRadioButton( i18n( "Stereo (2 channels)" ), _channelsbox );
 	_channels1 = new TQRadioButton( i18n( "Mono (1 channel)" ), _channelsbox );
 	_bitsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Bits" ), _hbox );
-	connect( _bitsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
+	connect( _bitsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
 	_bits16 = new TQRadioButton( i18n( "16 bit" ), _bitsbox );
 	_bits8 = new TQRadioButton( i18n( "8 bit" ), _bitsbox );
 
 	_usedefaults = new TQCheckBox( i18n( "Use defaults for creating new files" ), this );
-	connect( _usedefaults, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+	connect( _usedefaults, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
 
 	setSpacing( 5 );
 
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index 32e0dafa..34c8d0cf 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -55,14 +55,14 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
 
 	_displaybox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Timedisplay Style" ), this );
 	_layout_display->addWidget( _displaybox, 100 );
-	connect( _displaybox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( displaychanged( int ) ) );
+	connect( _displaybox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( displaychanged( int ) ) );
 	_display0 = new TQRadioButton( i18n( "Plain samples" ), _displaybox );
 	_display1 = new TQRadioButton( i18n( "[hours:]mins:secs:samples" ), _displaybox );
 	_display2 = new TQRadioButton( i18n( "[hours:]mins:secs:frames" ), _displaybox );
 	_display3 = new TQRadioButton( i18n( "MByte.KByte" ), _displaybox );
 	_framebasebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Framebase" ), this );
 	_layout_display->addWidget( _framebasebox, 100 );
-	connect( _framebasebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( framebasechanged( int ) ) );
+	connect( _framebasebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( framebasechanged( int ) ) );
 	_framebase30 = new TQRadioButton( i18n( "30 frames per second (American TV)" ), _framebasebox );
 	_framebase25 = new TQRadioButton( i18n( "25 frames per second (European TV)" ), _framebasebox );
 	_framebase75 = new TQRadioButton( i18n( "75 frames per second (CD)" ), _framebasebox );
@@ -73,11 +73,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
 	_framebaseotherline = new TQLineEdit( _framebaseotherbox );
 	_framebaseotherline->setMaxLength( 10 );
 	_framebaseotherbox->setEnabled( false );
-	connect( _framebaseotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( framebaseotherchanged( const TQString& ) ) );
+	connect( _framebaseotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( framebaseotherchanged( const TQString& ) ) );
 
 	_layout->addSpacing( 5 );
 	_verboseDisplayMode = new TQCheckBox( i18n( "Show verbose times ( XXmins:XXsecs:XXframes instead of XX:XX::XX )" ), this );
-	connect( _verboseDisplayMode, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( verboseDisplayChanged( bool ) ) );
+	connect( _verboseDisplayMode, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( verboseDisplayChanged( bool ) ) );
 	_layout->addWidget( _verboseDisplayMode );
 
 	_layout->addSpacing( 10 );
@@ -85,11 +85,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
 	_layout->addWidget( _other_title );
 
 	_tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this );
-	connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) );
+	connect( _tipofday, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( tipofdaychanged( bool ) ) );
 	_layout->addWidget( _tipofday );
 	TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
 	_enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this );
-	connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) );
+	connect( _enableAllMessages, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableallmessagesclicked() ) );
 	_tmplayout->addWidget( _enableAllMessages );
 	TQLabel* _tmplbl = new TQLabel( i18n( "<qt><i>All messages with the \"Don't show this message again\" option are shown again after selecting this button.</i></qt>" ), this );
 	_tmplayout->addWidget( _tmplbl );
diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp
index 05a19d2b..2a76cf2a 100644
--- a/krec/krecexport_template.cpp
+++ b/krec/krecexport_template.cpp
@@ -57,7 +57,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 	if ( !running() ) {
 		if ( process() ) {
 			_running = true;
-			TQTimer::singleShot( 0, this, TQT_SLOT( process() ) );
+			TQTimer::singleShot( 0, this, TQ_SLOT( process() ) );
 			emit running( running() );
 		}
 		return true;
diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp
index 6de79d3d..c7f3e18a 100644
--- a/krec/krecexport_wave.cpp
+++ b/krec/krecexport_wave.cpp
@@ -69,7 +69,7 @@ bool KRecExport_Wave::process() {
 			TQByteArray bytearray( 4096 );
 			emit getData( bytearray );
 			_file->writeBlock( bytearray );
-			TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+			TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
 		}
 		return true;
 	} else return false;
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index 864b4c43..24053d45 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -258,9 +258,9 @@ void KRecFile::newBuffer( const TQString &filename ) {
 }
 void KRecFile::newBuffer( KRecBuffer* buffer ) {
 	kdDebug( 60005 ) << k_funcinfo << endl;
-	connect( buffer, TQT_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) );
-	connect( buffer, TQT_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) );
-	connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+	connect( buffer, TQ_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) );
+	connect( buffer, TQ_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) );
+	connect( buffer, TQ_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQ_SLOT( deleteBuffer( KRecBuffer* ) ) );
 	_buffers.append( buffer );
 	newSize( buffer, buffer->size() );
 	_currentBuffer = _buffers.findIndex( buffer );
diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp
index bdf62adb..5c9f4c06 100644
--- a/krec/krecfileview.cpp
+++ b/krec/krecfileview.cpp
@@ -57,15 +57,15 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
 		if ( _file ) {
 			if ( !_file->filename().isNull() ) setFilename( _file->filename() );
 				else _filename->setText( i18n( "file with no name" ) );
-			connect( _file, TQT_SIGNAL( posChanged( int ) ), this, TQT_SLOT( setPos( int ) ) );
-			connect( _file, TQT_SIGNAL( posChanged( int ) ), _timebar, TQT_SLOT( newPos( int ) ) );
-			connect( _file, TQT_SIGNAL( posChanged( int ) ), _timedisplay, TQT_SLOT( newPos( int ) ) );
-			connect( _file, TQT_SIGNAL( sizeChanged( int ) ), this, TQT_SLOT( setSize( int ) ) );
-			connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timebar, TQT_SLOT( newSize( int ) ) );
-			connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timedisplay, TQT_SLOT( newSize( int ) ) );
-			connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), this, TQT_SLOT( setFilename( const TQString &) ) );
-			connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQT_SLOT( newFilename( const TQString &) ) );
-			connect( _timebar, TQT_SIGNAL( sNewPos( int ) ), _file, TQT_SLOT( newPos( int ) ) );
+			connect( _file, TQ_SIGNAL( posChanged( int ) ), this, TQ_SLOT( setPos( int ) ) );
+			connect( _file, TQ_SIGNAL( posChanged( int ) ), _timebar, TQ_SLOT( newPos( int ) ) );
+			connect( _file, TQ_SIGNAL( posChanged( int ) ), _timedisplay, TQ_SLOT( newPos( int ) ) );
+			connect( _file, TQ_SIGNAL( sizeChanged( int ) ), this, TQ_SLOT( setSize( int ) ) );
+			connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timebar, TQ_SLOT( newSize( int ) ) );
+			connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timedisplay, TQ_SLOT( newSize( int ) ) );
+			connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), this, TQ_SLOT( setFilename( const TQString &) ) );
+			connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQ_SLOT( newFilename( const TQString &) ) );
+			connect( _timebar, TQ_SIGNAL( sNewPos( int ) ), _file, TQ_SLOT( newPos( int ) ) );
 			_timebar->newPos( _file->position() );
 			_timebar->newSize( _file->size() );
 			_timedisplay->newSamplingRate( _file->samplerate() );
@@ -75,7 +75,7 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
 			_timedisplay->newPos( _file->position() );
 			_timedisplay->newSize( _file->size() );
 		} else {
-			disconnect( this, TQT_SLOT( setPos( TQIODevice::Offset ) ) );
+			disconnect( this, TQ_SLOT( setPos( TQIODevice::Offset ) ) );
 			_filename->setText( i18n( "<no file>" ) );
 			_timedisplay->newFilename( TQString() );
 		}
diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp
index 8a177e20..4757078f 100644
--- a/krec/krecfileviewhelpers.cpp
+++ b/krec/krecfileviewhelpers.cpp
@@ -80,9 +80,9 @@ KRecTimeDisplay::KRecTimeDisplay( TQWidget* p, const char* n )
   , _samplingRate( 44100 ), _bits( 16 ), _channels( 2 )
 {
 	_position = new AKLabel( this );
-	connect( _position, TQT_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQT_SLOT( timeContextMenu( const TQPoint &) ) );
+	connect( _position, TQ_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQ_SLOT( timeContextMenu( const TQPoint &) ) );
 	_size = new AKLabel( this );
-	connect( _size, TQT_SIGNAL( showContextMenu( const TQPoint &) ), this, TQT_SLOT( sizeContextMenu( const TQPoint &) ) );
+	connect( _size, TQ_SIGNAL( showContextMenu( const TQPoint &) ), this, TQ_SLOT( sizeContextMenu( const TQPoint &) ) );
 
 	_layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 0, 2 );
 	_layout->addStretch( 100 );
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 4f5b0537..c626a961 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* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) );
-			connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+			connect( _file, TQ_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQ_SLOT( newBuffer( KRecBuffer* ) ) );
+			connect( _file, TQ_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQ_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 ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
+	connect( tmp, TQ_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQ_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
 	bufferwidgets.append( tmp );
 	tmp->show();
 	resizeEvent();
@@ -121,10 +121,10 @@ void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
 	TDEPopupMenu tmp( 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() ), 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 );
+	connect( _activeaction, TQ_SIGNAL( toggled( bool ) ), bw->buffer(), TQ_SLOT( setActive( bool ) ) );
+	TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQ_SLOT( deleteBuffer() ), this );
+	TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), bw, TQ_SLOT( changeTitle() ), this );
+	TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), bw, TQ_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() ), this, TQT_SLOT( update() ) );
+	connect( _buffer, TQ_SIGNAL( somethingChanged() ), this, TQ_SLOT( update() ) );
 	kdDebug( 60005 ) << k_funcinfo << endl;
 }
 KRecBufferWidget::~KRecBufferWidget() {
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index 8f5f7385..ecc9bf4c 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -57,16 +57,16 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 	_layout->addWidget( captionlabel );
 
 	_filewidget = new KRecConfigFilesWidget( this );
-	connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
-	connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+	connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
+	connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
 
 	TQWidget *_btnWidget = new TQWidget( this );
 	_layoutbuttons = new TQHBoxLayout( _btnWidget );
 	_layoutbuttons->addStretch( 100 );
 	_btnok = new KPushButton( KStdGuiItem::ok(), _btnWidget );
-	connect( _btnok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
+	connect( _btnok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) );
 	_layoutbuttons->addWidget( _btnok, 0 );
 
 	_layout->addWidget( new KSeparator( KSeparator::HLine, this ) );
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index f9a79891..d1f74f54 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -107,8 +107,8 @@ void KRecPrivate::openFile() {
 }
 void KRecPrivate::pNewFile( KRecFile* file ) {
 	_currentFile = file;
-	connect( m_recStream, TQT_SIGNAL( data( TQByteArray& ) ), _currentFile, TQT_SLOT( writeData( TQByteArray& ) ) );
-	connect( m_playStream, TQT_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) );
+	connect( m_recStream, TQ_SIGNAL( data( TQByteArray& ) ), _currentFile, TQ_SLOT( writeData( TQByteArray& ) ) );
+	connect( m_playStream, TQ_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) );
 	mainwidget->_fileview->setFile( _currentFile );
 	checkActions();
 }
@@ -162,9 +162,9 @@ void KRecPrivate::exportFile() {
 			if ( _exportitem ) {
 				_exportitem->initialize( _currentFile->samplerate(), _currentFile->bits(), _currentFile->channels() );
 				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() ), this, TQT_SLOT( endExportFile() ) );
+					connect( _exportitem, TQ_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) );
+					connect( _currentFile, TQ_SIGNAL( endReached() ), _exportitem, TQ_SLOT( stop() ) );
+					connect( _currentFile, TQ_SIGNAL( endReached() ), this, TQ_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, this, TQT_SLOT( endExportFile2() ) ); }
+void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQ_SLOT( endExportFile2() ) ); }
 void KRecPrivate::endExportFile2() {
 	_exportitem->finalize();
 	disconnect( _currentFile, 0, _exportitem, 0 );
@@ -283,40 +283,40 @@ KRecord::KRecord(TQWidget *parent, const char *name )
 	// * * * Actions * * *
 	d->artsactions = new ArtsActions( d->server, actionCollection(), this );
 
-	KStdAction::preferences( d, TQT_SLOT( showConfDialog() ), actionCollection() );
+	KStdAction::preferences( d, TQ_SLOT( showConfDialog() ), actionCollection() );
 
-	KStdAction::openNew( d, TQT_SLOT( newFile() ), actionCollection() );
-	KStdAction::open( d, TQT_SLOT( openFile() ), actionCollection() );
-	KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() );
-	KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() );
-	KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() );
-	KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+	KStdAction::openNew( d, TQ_SLOT( newFile() ), actionCollection() );
+	KStdAction::open( d, TQ_SLOT( openFile() ), actionCollection() );
+	KStdAction::save( d, TQ_SLOT( saveFile() ), actionCollection() );
+	KStdAction::saveAs( d, TQ_SLOT( saveAsFile() ), actionCollection() );
+	KStdAction::close( d, TQ_SLOT( closeFile() ), actionCollection() );
+	KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
 
-	KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() );
+	KStdAction::tipOfDay( d, TQ_SLOT( forceTipOfDay() ), actionCollection() );
 
 	d->aExportFile = new TDEAction( i18n( "Export..." ), TDEShortcut(),
-	                              d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" );
+	                              d, TQ_SLOT( exportFile() ), actionCollection(), "export_file" );
 
 	d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
-	                          this, TQT_SLOT( startRec() ), actionCollection(), "player_record" );
+	                          this, TQ_SLOT( startRec() ), actionCollection(), "player_record" );
 	d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
-	                        this, TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
+	                        this, TQ_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
 	d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
-	                        this, TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
+	                        this, TQ_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 ) ) );
+	connect( d->aThru, TQ_SIGNAL( toggled( bool ) ), d, TQ_SLOT( playthru( bool ) ) );
 
 	d->aBegin = new TDEAction( i18n( "Go to &Beginning" ), TDEShortcut( SHIFT + Key_Left ),
-	                         d, TQT_SLOT( toBegin() ), actionCollection(), "player_gobegin" );
+	                         d, TQ_SLOT( toBegin() ), actionCollection(), "player_gobegin" );
 	d->aEnd = new TDEAction( i18n( "Go to &End" ), TDEShortcut( SHIFT + Key_Right ),
-	                       d, TQT_SLOT( toEnd() ), actionCollection(), "player_goend" );
+	                       d, TQ_SLOT( toEnd() ), actionCollection(), "player_goend" );
 
 	( void* ) d->artsactions->actionAudioManager();
 
 	d->aExecaRtsControl = new TDEAction( i18n( "Start aRts Control Tool" ), TDEShortcut(),
-	                                   d, TQT_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" );
+	                                   d, TQ_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" );
 	d->aExecKMix = new TDEAction( i18n( "Start KMix" ), TDEShortcut(),
-	                            d, TQT_SLOT( execKMix() ), actionCollection(), "exec_kmix" );
+	                            d, TQ_SLOT( execKMix() ), actionCollection(), "exec_kmix" );
 
 	// * * * GUI * * *
 	// TODO Fix toolbar config so this line can just be setupGUI()
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index d337dafc..a40c5b1f 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -128,7 +128,7 @@ bool KRecExport_MP3::process() {
 				                               i18n( lame_error[ code ] ) );
 				error_occurred = true;
 			}
-			TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+			TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
 		}
 		return true;
 	} else return false;
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index 2841c64b..5c957577 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -169,7 +169,7 @@ bool KRecExport_OGG::process() {
 					}
 				}
 			}
-			TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+			TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
 		}
 		return true;
 	} else return false;