diff options
Diffstat (limited to 'kfloppy')
-rw-r--r-- | kfloppy/floppy.cpp | 2 | ||||
-rw-r--r-- | kfloppy/format.cpp | 22 | ||||
-rw-r--r-- | kfloppy/zip.cpp | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index a89d18f..f749a70 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -497,7 +497,7 @@ void FloppyData::format(){ if (KMessageBox::warningContinueCancel( this, i18n("<qt>Formatting will erase all data on the device:<br/><b>%1</b><br/>" "(Please check the correctness of the device name.)<br/>" - "Are you sure you wish to proceed?</qt>").tqarg( currentComboBoxDevice ) + "Are you sure you wish to proceed?</qt>").arg( currentComboBoxDevice ) , i18n("Proceed?") ) != KMessageBox::Continue) { return; diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 9a972f4..35ed933 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -266,7 +266,7 @@ bool FloppyAction::configureDevice(int drive,int density) if ((drive<0) || (drive>1)) { - emit status(i18n("Unexpected drive number %1.").tqarg(drive),-1); + emit status(i18n("Unexpected drive number %1.").arg(drive),-1); return false; } @@ -278,7 +278,7 @@ bool FloppyAction::configureDevice(int drive,int density) } if (!deviceinfo) { - emit status(i18n("Unexpected density number %1.").tqarg(density),-1); + emit status(i18n("Unexpected density number %1.").arg(density),-1); return false; } @@ -294,7 +294,7 @@ bool FloppyAction::configureDevice(int drive,int density) if (!deviceinfo || !deviceinfo->devices) { emit status(i18n("Cannot find a device for drive %1 and density %2.") - .tqarg(drive).tqarg(density),-1); + .arg(drive).arg(density),-1); return false; } @@ -313,7 +313,7 @@ bool FloppyAction::configureDevice(int drive,int density) { const TQString str = i18n( "Cannot access %1\nMake sure that the device exists and that " - "you have write permission to it.").tqarg(deviceinfo->devices[0]); + "you have write permission to it.").arg(deviceinfo->devices[0]); emit status(str,-1); return false; } @@ -343,13 +343,13 @@ void FloppyAction::processDone(KProcess *p) } else { - emit status(i18n("The program %1 terminated with an error.").tqarg(theProcessName),100); + emit status(i18n("The program %1 terminated with an error.").arg(theProcessName),100); emit done(this,false); } } else { - emit status(i18n("The program %1 terminated abnormally.").tqarg(theProcessName),100); + emit status(i18n("The program %1 terminated abnormally.").arg(theProcessName),100); emit done(this,false); } } @@ -478,7 +478,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) } else if (b[0]=='E') { - emit status(i18n("Error formatting track %1.").tqarg(formatTrackCount),-1); + emit status(i18n("Error formatting track %1.").arg(formatTrackCount),-1); } else { @@ -507,12 +507,12 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) if ( regexp.search( s ) > -1 ) { const int track = regexp.cap(1).toInt(); - emit status(i18n("Low-level formatting error at track %1.").tqarg(track), -1); + emit status(i18n("Low-level formatting error at track %1.").arg(track), -1); } else { // This error should not happen - emit status(i18n("Low-level formatting error: %1").tqarg(s), -1); + emit status(i18n("Low-level formatting error: %1").arg(s), -1); } return; } @@ -532,7 +532,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) // Be careful to leave "iotcl" as last before checking numbers else if (s.find("ioctl")!=-1) { - emit status(i18n("Low-level format error: %1").tqarg(s),-1); + emit status(i18n("Low-level format error: %1").arg(s),-1); return; } // Check for numbers at last (as /dev/fd0u1440 has numbers too) @@ -792,7 +792,7 @@ void UFSFilesystem::exec() // ### TODO: is it still needed? (FreeBSD 5.3's man page says: "For backward compatibility.") if ( deviceInfo ) - *p << "-T" << TQString("fd%1").tqarg(deviceInfo->blocks); + *p << "-T" << TQString("fd%1").arg(deviceInfo->blocks); *p << deviceName; diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index 5dae22e..51da7ef 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -188,7 +188,7 @@ void ZipFormat::transition() << "if=/dev/zero" << "of=/dev/afd0c" << "bs=8192" ; - *p << TQString("count=%1").tqarg(totalBlocks); + *p << TQString("count=%1").arg(totalBlocks); if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput)) { emit statusMessage(i18n("Cannot start dd to zero disk.")); @@ -251,7 +251,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l) #ifdef DEBUG TQString o = TQString::fromLatin1(b,l); - DEBUGS(TQString(" %1").tqarg(o).latin1()); + DEBUGS(TQString(" %1").arg(o).latin1()); #endif switch(formatStep) @@ -264,8 +264,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l) if (totalBlocks>10000) { emit statusMessage(i18n("Zeroing block %1 of %2...") - .tqarg(currentblock) - .tqarg(totalBlocks)); + .arg(currentblock) + .arg(totalBlocks)); } } break; |