diff options
Diffstat (limited to 'krec')
-rw-r--r-- | krec/krecconfig_files.h | 1 | ||||
-rw-r--r-- | krec/krecconfig_fileswidget.cpp | 18 | ||||
-rw-r--r-- | krec/krecconfig_fileswidget.h | 1 | ||||
-rw-r--r-- | krec/krecconfigure.cpp | 24 | ||||
-rw-r--r-- | krec/krecconfigure.h | 1 | ||||
-rw-r--r-- | krec/krecexport_template.cpp | 8 | ||||
-rw-r--r-- | krec/krecexport_template.h | 7 | ||||
-rw-r--r-- | krec/krecexport_wave.h | 1 | ||||
-rw-r--r-- | krec/krecfile.cpp | 24 | ||||
-rw-r--r-- | krec/krecfile.h | 2 | ||||
-rw-r--r-- | krec/krecfileview.cpp | 2 | ||||
-rw-r--r-- | krec/krecfileview.h | 1 | ||||
-rw-r--r-- | krec/krecfileviewhelpers.cpp | 24 | ||||
-rw-r--r-- | krec/krecfileviewhelpers.h | 3 | ||||
-rw-r--r-- | krec/krecfilewidgets.cpp | 34 | ||||
-rw-r--r-- | krec/krecfilewidgets.h | 3 | ||||
-rw-r--r-- | krec/krecglobal.cpp | 4 | ||||
-rw-r--r-- | krec/krecglobal.h | 3 | ||||
-rw-r--r-- | krec/krecnewproperties.cpp | 8 | ||||
-rw-r--r-- | krec/krecnewproperties.h | 1 | ||||
-rw-r--r-- | krec/krecord.cpp | 28 | ||||
-rw-r--r-- | krec/krecord.h | 3 | ||||
-rw-r--r-- | krec/krecord_private.h | 2 | ||||
-rw-r--r-- | krec/mp3_export/krecexport_mp3.h | 1 | ||||
-rw-r--r-- | krec/ogg_export/krecexport_ogg.cpp | 2 | ||||
-rw-r--r-- | krec/ogg_export/krecexport_ogg.h | 1 |
26 files changed, 114 insertions, 93 deletions
diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h index f8f78691..0d610aab 100644 --- a/krec/krecconfig_files.h +++ b/krec/krecconfig_files.h @@ -29,6 +29,7 @@ class KRecConfigFilesWidget; class KRecConfigFiles : public KCModule { Q_OBJECT + TQ_OBJECT public: KRecConfigFiles( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); ~KRecConfigFiles(); diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 206eda1b..36e4521b 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -119,12 +119,12 @@ void KRecConfigFilesWidget::defaults() { } void KRecConfigFilesWidget::ratechanged( int index ) { - if ( _ratebox->find( index ) == _rateother ) _rateotherbox->setEnabled( true ); + if ( _ratebox->tqfind( index ) == _rateother ) _rateotherbox->setEnabled( true ); else _rateotherbox->setEnabled( false ); - if ( _ratebox->find( index ) == _rate48 ) _samplingRate = 48000; - if ( _ratebox->find( index ) == _rate44 ) _samplingRate = 44100; - if ( _ratebox->find( index ) == _rate22 ) _samplingRate = 22050; - if ( _ratebox->find( index ) == _rate11 ) _samplingRate = 11025; + if ( _ratebox->tqfind( index ) == _rate48 ) _samplingRate = 48000; + if ( _ratebox->tqfind( index ) == _rate44 ) _samplingRate = 44100; + if ( _ratebox->tqfind( index ) == _rate22 ) _samplingRate = 22050; + if ( _ratebox->tqfind( index ) == _rate11 ) _samplingRate = 11025; emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { @@ -132,13 +132,13 @@ void KRecConfigFilesWidget::rateotherchanged( const TQString& text ) { emit sRateChanged( _samplingRate ); } void KRecConfigFilesWidget::channelschanged( int index ) { - if ( _channelsbox->find( index ) == _channels2 ) _channels = 2; - if ( _channelsbox->find( index ) == _channels1 ) _channels = 1; + if ( _channelsbox->tqfind( index ) == _channels2 ) _channels = 2; + if ( _channelsbox->tqfind( index ) == _channels1 ) _channels = 1; emit sChannelsChanged( _channels ); } void KRecConfigFilesWidget::bitschanged( int index ) { - if ( _bitsbox->find( index ) == _bits16 ) _bits = 16; - if ( _bitsbox->find( index ) == _bits8 ) _bits = 8; + if ( _bitsbox->tqfind( index ) == _bits16 ) _bits = 16; + if ( _bitsbox->tqfind( index ) == _bits8 ) _bits = 8; emit sBitsChanged( _bits ); } diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h index 458f0395..53064846 100644 --- a/krec/krecconfig_fileswidget.h +++ b/krec/krecconfig_fileswidget.h @@ -29,6 +29,7 @@ class TQLabel; class KRecConfigFilesWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: KRecConfigFilesWidget( TQWidget*, const char* =0 ); ~KRecConfigFilesWidget(); diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index c29d6b4a..65cb7497 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -87,13 +87,13 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this ); connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) ); _layout->addWidget( _tipofday ); - TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + TQBoxLayout* _tmptqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this ); connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) ); - _tmplayout->addWidget( _enableAllMessages ); + _tmptqlayout->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 ); - _layout->addLayout( _tmplayout ); + _tmptqlayout->addWidget( _tmplbl ); + _layout->addLayout( _tmptqlayout ); _layout->addStretch( 100 ); @@ -151,17 +151,17 @@ void KRecConfigGeneral::defaults() { void KRecConfigGeneral::displaychanged( int index ) { int verbose = _displaymode / 100; - if ( _displaybox->find( index ) == _display0 ) _displaymode = 0 + verbose * 100; - if ( _displaybox->find( index ) == _display1 ) _displaymode = 1 + verbose * 100; - if ( _displaybox->find( index ) == _display2 ) _displaymode = 2 + verbose * 100; - if ( _displaybox->find( index ) == _display3 ) _displaymode = 3 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display0 ) _displaymode = 0 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display1 ) _displaymode = 1 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display2 ) _displaymode = 2 + verbose * 100; + if ( _displaybox->tqfind( index ) == _display3 ) _displaymode = 3 + verbose * 100; emit changed( true ); } void KRecConfigGeneral::framebasechanged( int index ) { - if ( _framebasebox->find( index ) == _framebase30 ) _framebase = 30; - if ( _framebasebox->find( index ) == _framebase25 ) _framebase = 25; - if ( _framebasebox->find( index ) == _framebase75 ) _framebase = 75; - if ( _framebasebox->find( index ) == _framebaseother ) { + if ( _framebasebox->tqfind( index ) == _framebase30 ) _framebase = 30; + if ( _framebasebox->tqfind( index ) == _framebase25 ) _framebase = 25; + if ( _framebasebox->tqfind( index ) == _framebase75 ) _framebase = 75; + if ( _framebasebox->tqfind( index ) == _framebaseother ) { _framebaseotherbox->setEnabled( true ); _framebase = _framebaseotherline->text().toInt(); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h index db061f2b..97c43fce 100644 --- a/krec/krecconfigure.h +++ b/krec/krecconfigure.h @@ -29,6 +29,7 @@ class KPushButton; class KRecConfigGeneral : public KCModule { Q_OBJECT + TQ_OBJECT public: KRecConfigGeneral( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); ~KRecConfigGeneral(); diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp index 3569268d..cfd5388c 100644 --- a/krec/krecexport_template.cpp +++ b/krec/krecexport_template.cpp @@ -70,17 +70,17 @@ kdDebug( 60005 ) << k_funcinfo << endl; emit running( running() ); } -Q_INT16 KRecExportItem::read16( char* array, int index ) { - Q_INT16 tmp; +TQ_INT16 KRecExportItem::read16( char* array, int index ) { + TQ_INT16 tmp; tmp = array[ index ] + ( array[ index + 1 ] << 8 ) & 0xff; return tmp; } /// Helper: writes an integer into an char* formated for wave-files -void KRecExportItem::write16( char* array, Q_INT16 value, int index ) { +void KRecExportItem::write16( char* array, TQ_INT16 value, int index ) { array[ index ] = ( value >> 0 ) & 0xff; array[ index + 1 ] = ( value >> 8 ) & 0xff; } -void KRecExportItem::write32( char* array, Q_INT32 value, int index ) { +void KRecExportItem::write32( char* array, TQ_INT32 value, int index ) { write16( array, value, index ); array[ index + 2 ] = ( value >> 16 ) & 0xff; array[ index + 3 ] = ( value >> 24 ) & 0xff; diff --git a/krec/krecexport_template.h b/krec/krecexport_template.h index aac9dac2..e41b7d85 100644 --- a/krec/krecexport_template.h +++ b/krec/krecexport_template.h @@ -31,6 +31,7 @@ */ class KRecExportItem : public TQObject { Q_OBJECT + TQ_OBJECT private: /// Controls wether an export is running, or not... bool _running; @@ -48,9 +49,9 @@ protected: int channels() const; /// Helpers for reading and writing to an char-array - Q_INT16 read16( char* array, int index ); - void write16( char* array, Q_INT16 value, int index ); - void write32( char* array, Q_INT32 value, int index ); + TQ_INT16 read16( char* array, int index ); + void write16( char* array, TQ_INT16 value, int index ); + void write32( char* array, TQ_INT32 value, int index ); public: ~KRecExportItem(); diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h index 6390eb48..3fc4b865 100644 --- a/krec/krecexport_wave.h +++ b/krec/krecexport_wave.h @@ -21,6 +21,7 @@ class TQFile; class KRecExport_Wave : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_Wave( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_Wave(); diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index a588d126..9004b211 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -37,7 +37,7 @@ void KRecFile::init() { _pos = 0; _size = 0; - _filename = TQString::null; + _filename = TQString(); _currentBuffer = 0; _dir = new KTempDir(); _config = new KSimpleConfig( _dir->name()+"project.rc", false ); @@ -76,7 +76,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) KTar *tar = new KTar( _filename, "application/x-gzip" ); tar->open( IO_ReadOnly ); - int i=0; while ( _filename.find( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( _filename.tqfind( '/', i ) != -1 ) i++; // Find last '/' TQString basename = _filename.right( _filename.length()-i ); basename = basename.left( basename.length()-5 ); @@ -94,7 +94,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) _config->setGroup( "File-" + TQString::number( i ) ); newBuffer( KRecBuffer::fromConfig( _config, _dir->qDir(), this ) ); } - KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).arg( filename ) ); + KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).tqarg( filename ) ); delete tar; @@ -155,7 +155,7 @@ void KRecFile::save( const TQString &fname ) { KTar *tar = new KTar( tmpname, "application/x-gzip" ); tar->open( IO_WriteOnly ); - int i=0; while ( fname.find( '/', i ) != -1 ) i++; // Find last '/' + int i=0; while ( fname.tqfind( '/', i ) != -1 ) i++; // Find last '/' TQString basename = fname.right( fname.length()-i ); if ( basename.endsWith( ".krec" ) ) basename = basename.left( basename.length()-5 ); @@ -168,7 +168,7 @@ void KRecFile::save( const TQString &fname ) { delete tar; KIO::file_move( tmpname, filetosave, -1, true, false, true ); - KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) ); + KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).tqarg( filename() ) ); _saved = true; } @@ -263,7 +263,7 @@ void KRecFile::newBuffer( KRecBuffer* buffer ) { connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) ); _buffers.append( buffer ); newSize( buffer, buffer->size() ); - _currentBuffer = _buffers.findIndex( buffer ); + _currentBuffer = _buffers.tqfindIndex( buffer ); emit sNewBuffer( buffer ); _saved = false; } @@ -295,7 +295,7 @@ KRecBuffer* KRecFile::getTopBuffer_buffer( int pos ) { return out; } int KRecFile::getTopBuffer_int( int pos ) { - return _buffers.findIndex( getTopBuffer_buffer( pos ) ); + return _buffers.tqfindIndex( getTopBuffer_buffer( pos ) ); } @@ -309,7 +309,7 @@ KRecBuffer::KRecBuffer( const TQString &filename, int startpos, bool a, KRecFile , _active( a ) , _pos( 0 ), _start( startpos ) , _title( _fileinfo->fileName() ) - , _comment( TQString::null ) + , _comment( TQString() ) { kdDebug( 60005 ) << k_funcinfo << filename << " " << startpos << endl; _open = _file->open( IO_Raw | IO_ReadWrite ); @@ -343,7 +343,7 @@ KRecBuffer* KRecBuffer::fromConfig( KConfig* config, TQDir* dir, KRecFile* p, co config->readBoolEntry( "Activated", true ), p, n ); tmp->setTitle( config->readEntry( "Title", tmp->filename() ) ); - tmp->setComment( config->readEntry( "Comment", TQString::null ) ); + tmp->setComment( config->readEntry( "Comment", TQString() ) ); return tmp; } @@ -429,13 +429,13 @@ void KRecBuffer::setActive( bool n ) { } void KRecBuffer::deleteBuffer() { - if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).arg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).tqarg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue ) _krecfile->deleteBuffer( this ); } float KRecBuffer::getSample( int pos, int /*channel*/ ) { - Q_INT16 tmp16; - Q_INT8 tmp8; + TQ_INT16 tmp16; + TQ_INT8 tmp8; float out; _file->at( _krecfile->samplesToOffset( pos ) ); if ( _krecfile->bits() == 16 ) { diff --git a/krec/krecfile.h b/krec/krecfile.h index 895a6a6d..b9b9bb64 100644 --- a/krec/krecfile.h +++ b/krec/krecfile.h @@ -28,6 +28,7 @@ class KRecFileViewWidget; class KRecFile : virtual public TQObject { Q_OBJECT + TQ_OBJECT friend class KRecFileWidget; public: KRecFile( TQObject*, const char* =0 ); @@ -125,6 +126,7 @@ class TQDataStream; class KRecBuffer : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =0 ); ~KRecBuffer(); diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index 42911620..a5a989d8 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -77,7 +77,7 @@ kdDebug( 60005 ) << k_funcinfo << file << endl; } else { disconnect( this, TQT_SLOT( setPos( TQIODevice::Offset ) ) ); _filename->setText( i18n( "<no file>" ) ); - _timedisplay->newFilename( TQString::null ); + _timedisplay->newFilename( TQString() ); } } } diff --git a/krec/krecfileview.h b/krec/krecfileview.h index de47d0f4..bd2c39da 100644 --- a/krec/krecfileview.h +++ b/krec/krecfileview.h @@ -29,6 +29,7 @@ class KRecTimeDisplay; class KRecFileView : virtual public TQWidget { Q_OBJECT + TQ_OBJECT public: KRecFileView( TQWidget*, const char* =0 ); ~KRecFileView(); diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index a064dfea..26acdb2a 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -64,12 +64,12 @@ void KRecTimeBar::mouseReleaseEvent( TQMouseEvent* qme ) { void KRecTimeBar::newPos( int n ) { _pos = n; - repaint(); + tqrepaint(); } void KRecTimeBar::newSize( int n ) { _size = n; - repaint(); + tqrepaint(); } @@ -216,10 +216,10 @@ TQString KRecTimeDisplay::formatTime( const int mode, const int sample ) const { void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _posvalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _posvalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Position" ) ); menu->insertItem( tmp, -1, 0 ); @@ -235,10 +235,10 @@ void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) { void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) { if ( !_filename.isNull() ) { menu->insertSeparator( 0 ); - menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 ); - menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _sizevalue ) ), -1, 0 ); + menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _sizevalue ) ), -1, 0 ); KPopupTitle *tmp = new KPopupTitle( menu ); tmp->setTitle( i18n( "Size" ) ); menu->insertItem( tmp, -1, 0 ); @@ -255,10 +255,10 @@ void KRecTimeDisplay::jumpToTime() { } TQString KRecTimeDisplay::positionText( int m, int n ) { - return i18n( "Position: %1" ).arg( formatTime( m,n ) ); + return i18n( "Position: %1" ).tqarg( formatTime( m,n ) ); } TQString KRecTimeDisplay::sizeText( int m, int n ) { - return i18n( "Size: %1" ).arg( formatTime( m,n ) ); + return i18n( "Size: %1" ).tqarg( formatTime( m,n ) ); } void AKLabel::mousePressEvent( TQMouseEvent* qme ) { diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index bd78c4d6..865d96fd 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -27,6 +27,7 @@ class KPopupMenu; class KRecTimeBar : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecTimeBar( TQWidget*, const char* =0 ); ~KRecTimeBar(); @@ -56,6 +57,7 @@ private: class KRecTimeDisplay : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecTimeDisplay( TQWidget*, const char* =0 ); ~KRecTimeDisplay(); @@ -92,6 +94,7 @@ private: class AKLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: AKLabel( TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( p, n, f ) { init(); } AKLabel( const TQString& s, TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( s, p, n, f ) { init(); } diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 16f2db93..075a2151 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, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) ); + connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(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 ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) ); + connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), TQT_TQOBJECT(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 ) { KPopupMenu tmp( this ); - KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), this ); + KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), TQT_TQOBJECT(this) ); _activeaction->setChecked( bw->buffer()->active() ); connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) ); - KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), this ); - KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), bw, TQT_SLOT( changeTitle() ), this ); - KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), bw, TQT_SLOT( changeComment() ), this ); + KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) ); + KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) ); + KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(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, TQT_SIGNAL( somethingChanged() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) ); kdDebug( 60005 ) << k_funcinfo << endl; } KRecBufferWidget::~KRecBufferWidget() { @@ -189,19 +189,19 @@ void KRecBufferWidget::initLayout() { void KRecBufferWidget::drawFrame( TQPainter* p ) { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _buffer->active() ) - p->setBrush( colorGroup().highlight() ); + p->setBrush( tqcolorGroup().highlight() ); else - p->setBrush( colorGroup().highlight().dark() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setBrush( tqcolorGroup().highlight().dark() ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _title_region->boundingRect() ); p->drawRect( _fileend_region->boundingRect() ); p->setBrush( TQBrush() ); - p->setPen( TQPen( colorGroup().dark(), 1 ) ); + p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); p->drawRect( _main_region->boundingRect() ); - p->setPen( TQPen( colorGroup().highlightedText() ) ); - p->drawText( _title_region->boundingRect(), Qt::AlignCenter, _buffer->title() ); + p->setPen( TQPen( tqcolorGroup().highlightedText() ) ); + p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() ); } void KRecBufferWidget::drawContents( TQPainter* p ) { @@ -220,7 +220,7 @@ void KRecBufferWidget::drawContents( TQPainter* p ) { p->setPen( TQPen( TQColor( 0,0,0 ) ) ); TQString comment = _buffer->comment(); if ( comment.isNull() ) comment = i18n( "Lots of Data" ); - p->drawText( _main_region->boundingRect(), Qt::AlignCenter, comment ); + p->drawText( _main_region->boundingRect(), TQt::AlignCenter, comment ); } void KRecBufferWidget::paintEvent( TQPaintEvent* ) { initLayout(); @@ -232,12 +232,12 @@ void KRecBufferWidget::paintEvent( TQPaintEvent* ) { void KRecBufferWidget::mousePressEvent( TQMouseEvent* qme ) { kdDebug( 60005 ) << k_funcinfo << endl; - if ( _main_region->contains( qme->pos() ) || _title_region->contains( qme->pos() ) ) + if ( _main_region->tqcontains( qme->pos() ) || _title_region->tqcontains( qme->pos() ) ) if ( qme->button() == Qt::RightButton ) emit popupMenu( this, qme->globalPos() ); } void KRecBufferWidget::mouseDoubleClickEvent( TQMouseEvent* qme ) { - if ( _title_region->contains( qme->pos() ) ) + if ( _title_region->tqcontains( qme->pos() ) ) _buffer->setActive( !_buffer->active() ); } diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h index e183474b..9be59d50 100644 --- a/krec/krecfilewidgets.h +++ b/krec/krecfilewidgets.h @@ -37,6 +37,7 @@ class KToggleAction; class KRecFileWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecFileWidget( KRecFile*, TQWidget*, const char* =0 ); ~KRecFileWidget(); @@ -57,6 +58,7 @@ private: class Sample : public TQObject { Q_OBJECT + TQ_OBJECT public: Sample() : _values( 0 ), _min( 0 ), _max( 0 ) {} @@ -75,6 +77,7 @@ private: class KRecBufferWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =0 ); ~KRecBufferWidget(); diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 58822f50..e3d8c71b 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -58,7 +58,7 @@ void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar- bool KRecGlobal::registerExport( KRecExportItem* item ) { //kdDebug( 60005 ) << k_funcinfo << "About to register ExportItem for \"" << item->exportFormat() << "\" extensions:\"" << item->extensions() << "\"" << endl; - if ( !the()->_exports->find( item->exportFormat() ) ) { + if ( !the()->_exports->tqfind( item->exportFormat() ) ) { the()->_exports->insert( item->exportFormat(), item ); the()->_exportformats << item->exportFormat(); } @@ -66,7 +66,7 @@ bool KRecGlobal::registerExport( KRecExportItem* item ) { } KRecExportItem* KRecGlobal::getExportItem( const TQString &exportFormat ) { - KRecExportItem *tmp = _exports->find( exportFormat ); + KRecExportItem *tmp = _exports->tqfind( exportFormat ); return tmp->newItem(); } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 102dc3f8..698ab0a0 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -27,6 +27,7 @@ class KRecExportItem; class KRecGlobal : public TQObject { Q_OBJECT + TQ_OBJECT private: KRecGlobal( TQObject* =0, const char* =0 ); ~KRecGlobal(); @@ -45,7 +46,7 @@ public: /** * Returns a pointer to the mainwidget. * Usefull to display Messageboxes, etc correctly without beeing a - * TQWidget or knowing about a parent TQWidget. + * TQWidget or knowing about a tqparent TQWidget. */ TQWidget* mainWidget(); diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index 12d386ed..56ec7228 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -34,8 +34,8 @@ #include <klocale.h> KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n ) - : TQDialog( p,n, 0, Qt::WType_Dialog|Qt::WStyle_Customize|Qt::WStyle_DialogBorder ) - , _filename( TQString::null ) + : TQDialog( p,n, 0, TQt::WType_Dialog|TQt::WStyle_Customize|TQt::WStyle_DialogBorder ) + , _filename( TQString() ) , _samplerate( 44100 ), _channels( 2 ), _bits( 16 ) { kdDebug( 60005 ) << k_funcinfo << endl; @@ -53,7 +53,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; labelfont.setPointSize( labelfont.pointSize()*3/2 ); captionlabel->setFont( labelfont ); captionlabel->setText( i18n( "Properties for the new File" ) ); - captionlabel->setAlignment( AlignCenter ); + captionlabel->tqsetAlignment( AlignCenter ); _layout->addWidget( captionlabel ); _filewidget = new KRecConfigFilesWidget( this ); @@ -74,7 +74,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout->addWidget( new KSeparator( KSeparator::HLine, this ) ); _layout->addWidget( _btnWidget ); - setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); } KRecNewProperties::~KRecNewProperties() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h index 886ffdef..2bd6cc06 100644 --- a/krec/krecnewproperties.h +++ b/krec/krecnewproperties.h @@ -28,6 +28,7 @@ class KRecConfigFilesWidget; class KRecNewProperties : public TQDialog { Q_OBJECT + TQ_OBJECT public: KRecNewProperties( TQWidget*, const char* =0 ); ~KRecNewProperties(); diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 3bd18c72..2ff21e34 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -119,7 +119,7 @@ void KRecPrivate::saveFile() { } void KRecPrivate::saveAsFile() { //kdDebug( 60005 ) << k_funcinfo << endl; - if ( _currentFile ) pSaveFile( TQString::null ); + if ( _currentFile ) pSaveFile( TQString() ); } void KRecPrivate::pSaveFile( const TQString &filename ) { if ( !_currentFile ) @@ -138,7 +138,7 @@ bool KRecPrivate::closeFile() { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _currentFile ) { if ( !_currentFile->saved() ) { - int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).arg( _currentFile->filename() ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).tqarg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if ( choice == KMessageBox::Yes ) saveFile(); if ( choice == KMessageBox::Cancel ) return false; // go on if KMessageBox::No @@ -156,7 +156,7 @@ void KRecPrivate::exportFile() { if ( _currentFile ) { TQString filename = KFileDialog::getSaveFileName( "", KRecGlobal::the()->exportFormatEndings(), _impl, "Export File As" ); if ( !filename.isNull() ) { - int lastdot = filename.find( '.', -5 ); + int lastdot = filename.tqfind( '.', -5 ); TQString ending = filename.right( filename.length()-lastdot-1 ); _exportitem = KRecGlobal::the()->getExportItemForEnding( ending ); if ( _exportitem ) { @@ -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() ), this, TQT_SLOT( endExportFile() ) ); + connect( _currentFile, TQT_SIGNAL( endReached() ), TQT_TQOBJECT(this), TQT_SLOT( endExportFile() ) ); _exportitem->start(); } } else @@ -179,13 +179,13 @@ void KRecPrivate::exportFile() { "you did everything right, please file a bugreport saying what " \ "you where about to do and please quote the following line:<br />" \ "%1</li>" \ - "</ul></qt>" ).arg( KRecGlobal::the()->exportFormatEndings() ), + "</ul></qt>" ).tqarg( KRecGlobal::the()->exportFormatEndings() ), i18n( "Could not determine encodingmethod" ) ); } } 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, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); } void KRecPrivate::endExportFile2() { _exportitem->finalize(); disconnect( _currentFile, 0, _exportitem, 0 ); @@ -248,7 +248,7 @@ void KRecPrivate::toEnd() { } void KRecPrivate::forceTipOfDay() { - KTipDialog::showTip( _impl, TQString::null, true ); + KTipDialog::showTip( _impl, TQString(), true ); } void KRecPrivate::execaRtsControl() { @@ -264,12 +264,12 @@ void KRecPrivate::execKMix() { */ -KRecord::KRecord(TQWidget *parent, const char *name ) - : KMainWindow(parent,name) +KRecord::KRecord(TQWidget *tqparent, const char *name ) + : KMainWindow(tqparent,name) , d( new KRecPrivate( this ) ) { kdDebug( 60005 ) << k_funcinfo << endl; - //kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<parent<<", const char* "<<name<<" )"<<endl; // (DEBUG) + //kdDebug( 60005 )<<"KRecord::KRecord( TQWidget *"<<tqparent<<", const char* "<<name<<" )"<<endl; // (DEBUG) KRecGlobal::the()->setMainWidget( this ); KRecGlobal::the()->setStatusBar( statusBar() ); @@ -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( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(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 KAction( i18n( "&Record" ), KShortcut( Key_R ), - this, TQT_SLOT( startRec() ), actionCollection(), "player_record" ); + TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" ); d->aPlay = new KAction( i18n( "&Play" ), KShortcut( Key_P ), - this, TQT_SLOT( startPlay() ), actionCollection(), "player_play" ); + TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "player_play" ); d->aStop = new KAction( i18n( "&Stop" ), KShortcut( Key_S ), - this, TQT_SLOT( stopRec() ), actionCollection(), "player_stop" ); + TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "player_stop" ); d->aThru = new KToggleAction( i18n( "Play Through" ), KShortcut( CTRL + Key_P), actionCollection(), "play_thru" ); connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) ); diff --git a/krec/krecord.h b/krec/krecord.h index 034f0557..1fd4e08f 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -31,9 +31,10 @@ class KRecPrivate; class KRecord : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /// Constructor - KRecord( TQWidget* /*parent*/=0, const char* /*name*/=0 ); + KRecord( TQWidget* /*tqparent*/=0, const char* /*name*/=0 ); /// Destructor ~KRecord(); public slots: diff --git a/krec/krecord_private.h b/krec/krecord_private.h index 407f3f0a..ab1debde 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -45,6 +45,7 @@ namespace KSettings { class Dialog; } class KRecPrivate : public TQObject { Q_OBJECT + TQ_OBJECT public: /// Constructor KRecPrivate( KRecord*, const char* =0 ); @@ -129,6 +130,7 @@ public: class KRecMainWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KRecMainWidget( TQWidget* p, const char* n=0 ) : TQWidget( p,n ) { _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 2 ); diff --git a/krec/mp3_export/krecexport_mp3.h b/krec/mp3_export/krecexport_mp3.h index e6481309..0eeae152 100644 --- a/krec/mp3_export/krecexport_mp3.h +++ b/krec/mp3_export/krecexport_mp3.h @@ -23,6 +23,7 @@ class TQFile; class KRecExport_MP3 : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_MP3( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_MP3(); diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index e2b495dd..61b18265 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -95,7 +95,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; vorbis_comment_add_tag ( &vc, const_cast<char *>( "kde-encoder" ), const_cast<char *>( "KRec" ) ); if ( write_vorbis_comments ) { - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); vorbis_comment_add_tag ( &vc, const_cast<char *>( "title" ), const_cast<char *>( "" ) ); vorbis_comment_add_tag ( &vc, const_cast<char *>( "artist" ), diff --git a/krec/ogg_export/krecexport_ogg.h b/krec/ogg_export/krecexport_ogg.h index 787f8e34..93036990 100644 --- a/krec/ogg_export/krecexport_ogg.h +++ b/krec/ogg_export/krecexport_ogg.h @@ -27,6 +27,7 @@ class TQFile; class KRecExport_OGG : public KRecExportItem { Q_OBJECT + TQ_OBJECT public: KRecExport_OGG( TQObject*, const char* =0, const TQStringList& =0 ); ~KRecExport_OGG(); |