diff options
Diffstat (limited to 'krec')
31 files changed, 135 insertions, 178 deletions
diff --git a/krec/CMakeLists.txt b/krec/CMakeLists.txt index c5aadced..2c867eb6 100644 --- a/krec/CMakeLists.txt +++ b/krec/CMakeLists.txt @@ -62,8 +62,8 @@ tde_add_tdeinit_executable( krec AUTOMOC tdeutils-shared tdetexteditor-shared mcop kmedia2_idl soundserver_idl artsflow_idl artsmoduleseffects-shared artscontrolsupport-shared artsgui_kde-shared - krec_common-static ${DL_LIBRARIES} artskde-shared - ${ARTSC_LIBRARIES} pthread + krec_common-static ${CMAKE_DL_LIBS} artskde-shared + ${ARTSC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) 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_files.h b/krec/krecconfig_files.h index b036268e..dcaa7b3d 100644 --- a/krec/krecconfig_files.h +++ b/krec/krecconfig_files.h @@ -28,7 +28,7 @@ class TQLabel; class KRecConfigFilesWidget; class KRecConfigFiles : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KRecConfigFiles( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); @@ -49,5 +49,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 42fcd11d..56e6a7c7 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -36,8 +36,8 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n ) , _bits16( 0 ), _bits8( 0 ) , _samplingRate( 44100 ), _channels( 2 ), _bits( 16 ) { - _ratebox = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Sampling Rate" ), _hbox ); - connect( _ratebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( ratechanged( int ) ) ); + _ratebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sampling Rate" ), _hbox ); + 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& ) ) ); - _channelsbox = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Channels" ), _hbox ); - connect( _channelsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( channelschanged( int ) ) ); + connect( _rateotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( rateotherchanged( const TQString& ) ) ); + _channelsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Channels" ), _hbox ); + 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, Qt::Horizontal, i18n( "Bits" ), _hbox ); - connect( _bitsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( bitschanged( int ) ) ); + _bitsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Bits" ), _hbox ); + 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 ); @@ -74,8 +74,8 @@ KRecConfigFilesWidget::~KRecConfigFilesWidget() { void KRecConfigFilesWidget::load() { kdDebug( 60005 ) << k_funcinfo << endl; defaults(); - kapp->config()->setGroup( "FileDefaults" ); - _samplingRate = kapp->config()->readNumEntry( "SamplingRate", 44100 ); + tdeApp->config()->setGroup( "FileDefaults" ); + _samplingRate = tdeApp->config()->readNumEntry( "SamplingRate", 44100 ); switch ( _samplingRate ) { case 48000: _rate48->setChecked( true ); break; case 44100: _rate44->setChecked( true ); break; @@ -87,29 +87,29 @@ kdDebug( 60005 ) << k_funcinfo << endl; _rateotherline->setText( TQString::number( _samplingRate ) ); break; }; - _channels = kapp->config()->readNumEntry( "Channels", 2 ); + _channels = tdeApp->config()->readNumEntry( "Channels", 2 ); switch ( _channels ) { default: case 2: _channels2->setChecked( true ); break; case 1: _channels1->setChecked( true ); break; }; - _bits = kapp->config()->readNumEntry( "Bits", 16 ); + _bits = tdeApp->config()->readNumEntry( "Bits", 16 ); switch ( _bits ) { default: case 16: _bits16->setChecked( true ); break; case 8: _bits8->setChecked( true ); break; }; - _usedefaults->setChecked( kapp->config()->readBoolEntry( "UseDefaults", false ) ); + _usedefaults->setChecked( tdeApp->config()->readBoolEntry( "UseDefaults", false ) ); } void KRecConfigFilesWidget::save() { - kapp->config()->setGroup( "FileDefaults" ); - kapp->config()->writeEntry( "SamplingRate", _samplingRate ); - kapp->config()->writeEntry( "Channels", _channels ); - kapp->config()->writeEntry( "Bits", _bits ); - kapp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); + tdeApp->config()->setGroup( "FileDefaults" ); + tdeApp->config()->writeEntry( "SamplingRate", _samplingRate ); + tdeApp->config()->writeEntry( "Channels", _channels ); + tdeApp->config()->writeEntry( "Bits", _bits ); + tdeApp->config()->writeEntry( "UseDefaults", _usedefaults->isOn() ); - kapp->config()->sync(); + tdeApp->config()->sync(); } void KRecConfigFilesWidget::defaults() { diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h index ef3ac2a7..d40cd1d3 100644 --- a/krec/krecconfig_fileswidget.h +++ b/krec/krecconfig_fileswidget.h @@ -28,7 +28,7 @@ class TQLineEdit; class TQLabel; class KRecConfigFilesWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: KRecConfigFilesWidget( TQWidget*, const char* =0 ); @@ -65,5 +65,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 5063c461..04311206 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -53,16 +53,16 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _layout_display = new TQBoxLayout( _layout, TQBoxLayout::LeftToRight ); _layout->setStretchFactor( _layout_display, -100 ); - _displaybox = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Timedisplay Style" ), this ); + _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, Qt::Horizontal, i18n( "Framebase" ), this ); + _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 ); @@ -127,8 +127,8 @@ kdDebug( 60005 ) << k_funcinfo << endl; _framebaseotherline->setText( TQString::number( _framebase ) ); break; }; - kapp->config()->setGroup( "TipOfDay" ); - _tip = kapp->config()->readBoolEntry( "RunOnStart", true ); + tdeApp->config()->setGroup( "TipOfDay" ); + _tip = tdeApp->config()->readBoolEntry( "RunOnStart", true ); _tipofday->setChecked( _tip ); } @@ -137,10 +137,10 @@ void KRecConfigGeneral::save() { KRecGlobal::the()->setFrameBase( _framebase ); kdDebug(60005) << k_funcinfo << "Framebase=" << _framebase << endl; - kapp->config()->setGroup( "TipOfDay" ); - kapp->config()->writeEntry( "RunOnStart", _tip ); + tdeApp->config()->setGroup( "TipOfDay" ); + tdeApp->config()->writeEntry( "RunOnStart", _tip ); - kapp->config()->sync(); + tdeApp->config()->sync(); emit changed( false ); } diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h index dbc8665d..51774fc5 100644 --- a/krec/krecconfigure.h +++ b/krec/krecconfigure.h @@ -28,7 +28,7 @@ class TQCheckBox; class KPushButton; class KRecConfigGeneral : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KRecConfigGeneral( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); @@ -64,5 +64,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp index cfd5388c..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; @@ -85,5 +85,3 @@ void KRecExportItem::write32( char* array, TQ_INT32 value, int index ) { array[ index + 2 ] = ( value >> 16 ) & 0xff; array[ index + 3 ] = ( value >> 24 ) & 0xff; } - -// vim:sw=4:ts=4 diff --git a/krec/krecexport_template.h b/krec/krecexport_template.h index a4e4c90f..5eb64031 100644 --- a/krec/krecexport_template.h +++ b/krec/krecexport_template.h @@ -30,7 +30,7 @@ * @author Arnold Krille <arnold@arnoldarts.de> */ class KRecExportItem : public TQObject { - Q_OBJECT + TQ_OBJECT private: /// Controls wether an export is running, or not... @@ -96,5 +96,3 @@ signals: #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp index 64e25649..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; @@ -131,5 +131,3 @@ kdDebug( 60005 ) << k_funcinfo << endl; return true; } else return false; } - -// vim:sw=4:ts=4 diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h index 242a89b5..9322211c 100644 --- a/krec/krecexport_wave.h +++ b/krec/krecexport_wave.h @@ -20,7 +20,7 @@ class KTempFile; class TQFile; class KRecExport_Wave : public KRecExportItem { - Q_OBJECT + TQ_OBJECT public: KRecExport_Wave( TQObject*, const char* =0, const TQStringList& =0 ); @@ -40,5 +40,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index 864b4c43..08faa7d2 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -25,7 +25,7 @@ #include <ktar.h> #include <tdeio/job.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <tqfileinfo.h> #include <tdemessagebox.h> @@ -40,7 +40,7 @@ void KRecFile::init() { _filename = TQString(); _currentBuffer = 0; _dir = new KTempDir(); - _config = new KSimpleConfig( _dir->name()+"project.rc", false ); + _config = new TDESimpleConfig( _dir->name()+"project.rc", false ); } KRecFile::KRecFile( TQObject* p, const char* n ) @@ -85,7 +85,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n ) dir->copyTo( _dir->name() ); delete _config; - _config = new KSimpleConfig( _dir->name()+"project.rc", false ); + _config = new TDESimpleConfig( _dir->name()+"project.rc", false ); loadProps(); int c = _config->readNumEntry( "Files" ); //kdDebug( 60005 ) << c << " Files to load" << endl; @@ -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/krecfile.h b/krec/krecfile.h index cdb9af2d..ae9e7337 100644 --- a/krec/krecfile.h +++ b/krec/krecfile.h @@ -22,12 +22,12 @@ class KRecBuffer; class KTempDir; -class KSimpleConfig; +class TDESimpleConfig; class TQFile; class KRecFileViewWidget; class KRecFile : virtual public TQObject { - Q_OBJECT + TQ_OBJECT friend class KRecFileWidget; public: @@ -112,7 +112,7 @@ private: int _currentBuffer; TQValueList<KRecBuffer*> _buffers; KTempDir *_dir; - KSimpleConfig *_config; + TDESimpleConfig *_config; int _pos, _size; void init(); @@ -125,7 +125,7 @@ class TDEConfig; class TQDataStream; class KRecBuffer : virtual public TQObject { - Q_OBJECT + TQ_OBJECT public: KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =0 ); @@ -199,5 +199,3 @@ private: }; #endif - -// vim:sw=4:ts=4 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/krecfileview.h b/krec/krecfileview.h index 53df0793..b4583467 100644 --- a/krec/krecfileview.h +++ b/krec/krecfileview.h @@ -28,7 +28,7 @@ class KRecTimeBar; class KRecTimeDisplay; class KRecFileView : virtual public TQWidget { - Q_OBJECT + TQ_OBJECT public: KRecFileView( TQWidget*, const char* =0 ); @@ -53,5 +53,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index 2ca5b582..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 ); @@ -262,7 +262,7 @@ TQString KRecTimeDisplay::sizeText( int m, int n ) { } void AKLabel::mousePressEvent( TQMouseEvent* qme ) { - if ( qme->button() == Qt::RightButton ) + if ( qme->button() == TQt::RightButton ) emit showContextMenu( qme->globalPos() ); } diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index 695b9105..8faf225e 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -26,7 +26,7 @@ class TQPopupMenu; class TDEPopupMenu; class KRecTimeBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KRecTimeBar( TQWidget*, const char* =0 ); @@ -56,7 +56,7 @@ private: */ class KRecTimeDisplay : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KRecTimeDisplay( TQWidget*, const char* =0 ); @@ -93,7 +93,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(); } @@ -109,5 +109,3 @@ private: } }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index c0b778de..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* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) ); - connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(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 ) ), TQT_TQOBJECT(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(); @@ -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) ); + 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() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) ); + connect( _buffer, TQ_SIGNAL( somethingChanged() ), this, TQ_SLOT( update() ) ); kdDebug( 60005 ) << k_funcinfo << endl; } KRecBufferWidget::~KRecBufferWidget() { @@ -233,7 +233,7 @@ 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 ( qme->button() == Qt::RightButton ) + if ( qme->button() == TQt::RightButton ) emit popupMenu( this, qme->globalPos() ); } void KRecBufferWidget::mouseDoubleClickEvent( TQMouseEvent* qme ) { diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h index daea0c41..1c3f8329 100644 --- a/krec/krecfilewidgets.h +++ b/krec/krecfilewidgets.h @@ -36,7 +36,7 @@ class TDEAction; class TDEToggleAction; class KRecFileWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KRecFileWidget( KRecFile*, TQWidget*, const char* =0 ); @@ -57,7 +57,7 @@ private: }; class Sample : public TQObject { - Q_OBJECT + TQ_OBJECT public: Sample() : _values( 0 ), _min( 0 ), _max( 0 ) {} @@ -76,7 +76,7 @@ private: }; class KRecBufferWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =0 ); @@ -109,5 +109,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 3c0191de..4e852eac 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() { void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; } TQWidget* KRecGlobal::mainWidget() { return _qwidget; } -TDEConfig* KRecGlobal::tdeconfig() { return kapp->config(); } +TDEConfig* KRecGlobal::tdeconfig() { return tdeApp->config(); } void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; } void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); } @@ -104,27 +104,27 @@ KRecExportItem* KRecGlobal::getExportItemForEnding( const TQString &ending ) { int KRecGlobal::timeFormatMode() { if ( _timeformatcache < 0 ) { - kapp->config()->setGroup( "General" ); - _timeformatcache = kapp->config()->readNumEntry( "TimeFormat", 0 ); + tdeApp->config()->setGroup( "General" ); + _timeformatcache = tdeApp->config()->readNumEntry( "TimeFormat", 0 ); } return _timeformatcache; } void KRecGlobal::setTimeFormatMode( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "TimeFormat", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "TimeFormat", n ); _timeformatcache = n; } int KRecGlobal::frameBase() { if ( _framebasecache < 0 ) { - kapp->config()->setGroup( "General" ); - _framebasecache = kapp->config()->readNumEntry( "FrameBase", 25 ); + tdeApp->config()->setGroup( "General" ); + _framebasecache = tdeApp->config()->readNumEntry( "FrameBase", 25 ); } return _framebasecache; } void KRecGlobal::setFrameBase( int n ) { - kapp->config()->setGroup( "General" ); - kapp->config()->writeEntry( "FrameBase", n ); + tdeApp->config()->setGroup( "General" ); + tdeApp->config()->writeEntry( "FrameBase", n ); _framebasecache = n; } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index e0733022..4daa3dab 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -26,7 +26,7 @@ class KStatusBar; class KRecExportItem; class KRecGlobal : public TQObject { - Q_OBJECT + TQ_OBJECT private: KRecGlobal( TQObject* =0, const char* =0 ); @@ -50,7 +50,7 @@ public: */ TQWidget* mainWidget(); - /// @return kapp->config() + /// @return tdeApp->config() static TDEConfig* tdeconfig(); /// Sets the Statusbar. @@ -94,5 +94,3 @@ private: }; #endif - -// vim:sw=4:ts=4 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/krecnewproperties.h b/krec/krecnewproperties.h index e7c14404..978af5dd 100644 --- a/krec/krecnewproperties.h +++ b/krec/krecnewproperties.h @@ -27,7 +27,7 @@ class TQVBox; class KRecConfigFilesWidget; class KRecNewProperties : public TQDialog { - Q_OBJECT + TQ_OBJECT public: KRecNewProperties( TQWidget*, const char* =0 ); @@ -57,5 +57,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 5c14882f..d4ac5413 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() ), TQT_TQOBJECT(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, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); } +void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQ_SLOT( endExportFile2() ) ); } void KRecPrivate::endExportFile2() { _exportitem->finalize(); disconnect( _currentFile, 0, _exportitem, 0 ); @@ -252,10 +252,10 @@ void KRecPrivate::forceTipOfDay() { } void KRecPrivate::execaRtsControl() { - kapp->tdeinitExec( "artscontrol" ); + tdeApp->tdeinitExec( "artscontrol" ); } void KRecPrivate::execKMix() { - kapp->tdeinitExec( "kmix" ); + tdeApp->tdeinitExec( "kmix" ); } /** @@ -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( TQT_TQOBJECT(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 ), - TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" ); + this, TQ_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, TQ_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, 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() @@ -403,5 +403,3 @@ bool KRecord::queryClose() { #include "krecord.moc" #include "krecord_private.moc" - -// vim:sw=4:ts=4 diff --git a/krec/krecord.h b/krec/krecord.h index 6b9dc438..73628926 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -30,7 +30,7 @@ class KRecPrivate; */ class KRecord : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /// Constructor @@ -57,5 +57,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/krecord_private.h b/krec/krecord_private.h index bf68bfb9..3be786c3 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -44,7 +44,7 @@ class TDERecentFilesAction; namespace KSettings { class Dialog; } class KRecPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: /// Constructor @@ -129,7 +129,7 @@ public: }; class KRecMainWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KRecMainWidget( TQWidget* p, const char* n=0 ) : TQWidget( p,n ) { @@ -146,5 +146,3 @@ public: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/main.cpp b/krec/main.cpp index cc66d360..d294630d 100644 --- a/krec/main.cpp +++ b/krec/main.cpp @@ -40,7 +40,7 @@ static TDECmdLineOptions options[] = // INSERT YOUR COMMANDLINE OPTIONS HERE }; -extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] ) { //cout<<endl<<"Starting kRec..."<<endl; @@ -63,6 +63,3 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) //cout<<"Quitting with "<<quit<<endl; return quit; } - -// vim:sw=4:ts=4 - diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp index 79d0f4ad..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; @@ -230,5 +230,3 @@ void KRecExport_MP3::setLameParameters() { delete config; } - -// vim:sw=4:ts=4 diff --git a/krec/mp3_export/krecexport_mp3.h b/krec/mp3_export/krecexport_mp3.h index 62bbfbe4..3ba4eb14 100644 --- a/krec/mp3_export/krecexport_mp3.h +++ b/krec/mp3_export/krecexport_mp3.h @@ -22,7 +22,7 @@ class KTempFile; class TQFile; class KRecExport_MP3 : public KRecExportItem { - Q_OBJECT + TQ_OBJECT public: KRecExport_MP3( TQObject*, const char* =0, const TQStringList& =0 ); @@ -49,5 +49,3 @@ private: }; #endif - -// vim:sw=4:ts=4 diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index 32ff777a..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; @@ -250,5 +250,3 @@ kdDebug( 60005 ) << k_funcinfo << endl; } #endif // vorbis - -// vim:sw=4:ts=4 diff --git a/krec/ogg_export/krecexport_ogg.h b/krec/ogg_export/krecexport_ogg.h index 543e8a6d..08437d19 100644 --- a/krec/ogg_export/krecexport_ogg.h +++ b/krec/ogg_export/krecexport_ogg.h @@ -26,7 +26,7 @@ class KTempFile; class TQFile; class KRecExport_OGG : public KRecExportItem { - Q_OBJECT + TQ_OBJECT public: KRecExport_OGG( TQObject*, const char* =0, const TQStringList& =0 ); @@ -60,5 +60,3 @@ private: #endif #endif - -// vim:sw=4:ts=4 |