diff options
Diffstat (limited to 'krusader/Splitter')
-rw-r--r-- | krusader/Splitter/combiner.cpp | 16 | ||||
-rw-r--r-- | krusader/Splitter/splitter.cpp | 20 | ||||
-rw-r--r-- | krusader/Splitter/splittergui.cpp | 8 | ||||
-rw-r--r-- | krusader/Splitter/splittergui.h | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp index ebb937f..37e7504 100644 --- a/krusader/Splitter/combiner.cpp +++ b/krusader/Splitter/combiner.cpp @@ -59,7 +59,7 @@ Combiner::~Combiner() void Combiner::combine() { setCaption( i18n("Krusader::Combining...") ); - setLabelText( i18n("Combining the file %1...").arg( vfs::pathOrURL( baseURL ) )); + setLabelText( i18n("Combining the file %1...").tqarg( vfs::pathOrURL( baseURL ) )); /* check whether the .crc file exists */ splURL = baseURL; @@ -71,7 +71,7 @@ void Combiner::combine() { int ret = KMessageBox::questionYesNo(0, i18n("The CRC information file (%1) is missing!\n" "Validity checking is impossible without it. Continue combining?") - .arg( vfs::pathOrURL( splURL ) ) ); + .tqarg( vfs::pathOrURL( splURL ) ) ); if( ret == KMessageBox::No ) { @@ -107,7 +107,7 @@ void Combiner::combineSplitFileFinished(KIO::Job *job) TQString error; if( job->error() ) - error = i18n("Error at reading the CRC file (%1)!").arg( vfs::pathOrURL( splURL ) ); + error = i18n("Error at reading the CRC file (%1)!").tqarg( vfs::pathOrURL( splURL ) ); else { splitFile.remove( '\r' ); // Windows compatibility @@ -174,7 +174,7 @@ void Combiner::openNextFile() do { - ch = name.at( pos ).latin1() + 1; + ch = name.tqat( pos ).latin1() + 1; if( ch == TQChar( 'Z' + 1 ) ) ch = 'A'; if( ch == TQChar( 'z' + 1 ) ) @@ -189,7 +189,7 @@ void Combiner::openNextFile() else { TQString index( "%1" ); /* determining the filename */ - index = index.arg(++fileCounter).rightJustify( 3, '0' ); + index = index.tqarg(++fileCounter).rightJustify( 3, '0' ); readURL = baseURL; readURL.setFileName( baseURL.fileName() + "." + index ); } @@ -254,14 +254,14 @@ void Combiner::combineReceiveFinished(KIO::Job *job) { combineAbortJobs(); KMessageBox::questionYesNo(0, i18n("Can't open the first split file of %1!") - .arg( vfs::pathOrURL( baseURL ) ) ); + .tqarg( vfs::pathOrURL( baseURL ) ) ); emit reject(); return; } if( hasValidSplitFile ) { - TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() + TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() .rightJustify(8, '0'); if( receivedSize != expectedSize ) @@ -293,7 +293,7 @@ void Combiner::combineSendFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { combineAbortJobs(); - KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp index 83c2c60..8426c14 100644 --- a/krusader/Splitter/splitter.cpp +++ b/krusader/Splitter/splitter.cpp @@ -30,7 +30,7 @@ #include "splitter.h" #include "../VFS/vfs.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kmessagebox.h> #include <kio/job.h> @@ -67,7 +67,7 @@ void Splitter::split( KIO::filesize_t splitSizeIn ) splitSize = splitSizeIn; setCaption( i18n("Krusader::Splitting...") ); - setLabelText( i18n("Splitting the file %1...").arg( vfs::pathOrURL( fileName ) ) ); + setLabelText( i18n("Splitting the file %1...").tqarg( vfs::pathOrURL( fileName ) ) ); if( file.isDir() ) { @@ -122,17 +122,17 @@ void Splitter::splitReceiveFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { splitAbortJobs(); - KMessageBox::error(0, i18n("Error reading file %1!").arg( vfs::pathOrURL( fileName ) ) ); + KMessageBox::error(0, i18n("Error reading file %1!").tqarg( vfs::pathOrURL( fileName ) ) ); emit reject(); return; } - TQString crcResult = TQString( "%1" ).arg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() + TQString crcResult = TQString( "%1" ).tqarg( crcContext->result(), 0, 16 ).upper().stripWhiteSpace() .rightJustify(8, '0'); - splitFile = TQString( "filename=%1\n" ).arg( fileName.fileName() )+ - TQString( "size=%1\n" ) .arg( KIO::number( fileSize ) )+ - TQString( "crc32=%1\n" ) .arg( crcResult ); + splitFile = TQString( "filename=%1\n" ).tqarg( fileName.fileName() )+ + TQString( "size=%1\n" ) .tqarg( KIO::number( fileSize ) )+ + TQString( "crc32=%1\n" ) .tqarg( crcResult ); } void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent) @@ -143,7 +143,7 @@ void Splitter::splitReceivePercent (KIO::Job *, unsigned long percent) void Splitter::splitCreateWriteJob() { TQString index( "%1" ); /* making the splitted filename */ - index = index.arg(++fileNumber).rightJustify( 3, '0' ); + index = index.tqarg(++fileNumber).rightJustify( 3, '0' ); TQString outFileName = fileName.fileName() + "." + index; writeURL = destinationDir; @@ -198,7 +198,7 @@ void Splitter::splitSendFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { splitAbortJobs(); - KMessageBox::error(0, i18n("Error writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } @@ -241,7 +241,7 @@ void Splitter::splitFileFinished(KIO::Job *job) if( job->error() ) /* any error occurred? */ { - KMessageBox::error(0, i18n("Error at writing file %1!").arg( vfs::pathOrURL( writeURL ) ) ); + KMessageBox::error(0, i18n("Error at writing file %1!").tqarg( vfs::pathOrURL( writeURL ) ) ); emit reject(); return; } diff --git a/krusader/Splitter/splittergui.cpp b/krusader/Splitter/splittergui.cpp index e90a982..2c575bc 100644 --- a/krusader/Splitter/splittergui.cpp +++ b/krusader/Splitter/splittergui.cpp @@ -31,7 +31,7 @@ #include "splittergui.h" #include "../VFS/vfs.h" #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <kmessagebox.h> @@ -57,7 +57,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : grid->setMargin( 11 ); TQLabel *splitterLabel = new TQLabel( this, "SplitterLabel" ); - splitterLabel->setText( i18n( "Split the file %1 to directory:" ).arg( vfs::pathOrURL( fileURL ) ) ); + splitterLabel->setText( i18n( "Split the file %1 to directory:" ).tqarg( vfs::pathOrURL( fileURL ) ) ); splitterLabel->setMinimumWidth( 400 ); grid->addWidget( splitterLabel,0 ,0 ); @@ -75,7 +75,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : TQLabel *spacer = new TQLabel( splitSizeLine ); spacer->setText( " " ); - spacer->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + spacer->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQLabel *bytesPerFile = new TQLabel( splitSizeLine, "BytesPerFile" ); bytesPerFile->setText( i18n( "Max file size:" ) ); @@ -94,7 +94,7 @@ SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : TQFrame *separator = new TQFrame( this, "separatorLine" ); separator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - separator->setFixedHeight( separator->sizeHint().height() ); + separator->setFixedHeight( separator->tqsizeHint().height() ); grid->addWidget( separator,3 ,0 ); diff --git a/krusader/Splitter/splittergui.h b/krusader/Splitter/splittergui.h index ae6af9b..b83e757 100644 --- a/krusader/Splitter/splittergui.h +++ b/krusader/Splitter/splittergui.h @@ -91,14 +91,14 @@ struct PredefinedDevice if( frac_part ) { - frac = TQString( "%1" ).arg( frac_part ).rightJustify( 3, '0' ); + frac = TQString( "%1" ).tqarg( frac_part ).rightJustify( 3, '0' ); frac = "." + frac; while( frac.endsWith("0") ) frac.truncate( frac.length() - 1 ); } } - return TQString( "%1%2" ).arg( int_part ).arg( frac ); + return TQString( "%1%2" ).tqarg( int_part ).tqarg( frac ); } int mapTextToValue( bool * ) |