TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

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 ) {