diff options
Diffstat (limited to 'kfloppy')
-rw-r--r-- | kfloppy/floppy.cpp | 32 | ||||
-rw-r--r-- | kfloppy/floppy.h | 7 | ||||
-rw-r--r-- | kfloppy/format.cpp | 118 | ||||
-rw-r--r-- | kfloppy/format.h | 23 | ||||
-rw-r--r-- | kfloppy/zip.cpp | 12 | ||||
-rw-r--r-- | kfloppy/zip.h | 1 |
6 files changed, 99 insertions, 94 deletions
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index 5075025..110bc20 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -48,8 +48,8 @@ #include "floppy.h" #include "format.h" -FloppyData::FloppyData(TQWidget * parent, const char * name) - : KDialog( parent, name ), +FloppyData::FloppyData(TQWidget * tqparent, const char * name) + : KDialog( tqparent, name ), formatActions(0L), m_canLowLevel(false), m_canZeroOut( false ) { @@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) frame = new TQLabel( this, "NewsWindow" ); frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - frame->setAlignment(WordBreak|ExpandTabs); + frame->tqsetAlignment(WordBreak|ExpandTabs); TQWhatsThis::add( frame, i18n("<qt>This is the status window, where error messages are displayed.</qt>") ); @@ -334,7 +334,7 @@ void FloppyData::closeEvent(TQCloseEvent*) void FloppyData::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_F1: + case TQt::Key_F1: kapp->invokeHelp(); break; default: @@ -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>").arg( currentComboBoxDevice ) + "Are you sure you wish to proceed?</qt>").tqarg( currentComboBoxDevice ) , i18n("Proceed?") ) != KMessageBox::Continue) { return; @@ -524,7 +524,7 @@ void FloppyData::format(){ setEnabled(false); // Erase text box - frame->setText( TQString::null ); + frame->setText( TQString() ); if ( !userDevice ) { @@ -536,10 +536,10 @@ void FloppyData::format(){ } if (formatActions) delete formatActions; - formatActions = new KFActionQueue(this); + formatActions = new KFActionQueue(TQT_TQOBJECT(this)); connect(formatActions,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SLOT(formatStatus(const TQString &,int))); + this,TQT_SLOT(formattqStatus(const TQString &,int))); connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)), this,TQT_SLOT(reset())); @@ -550,7 +550,7 @@ void FloppyData::format(){ } else if ( zerooutformat->isChecked() ) { - DDZeroOut* f = new DDZeroOut( this ); + DDZeroOut* f = new DDZeroOut( TQT_TQOBJECT(this) ); if ( userDevice ) { f->configureDevice( currentComboBoxDevice ); @@ -569,7 +569,7 @@ void FloppyData::format(){ } else { - FDFormat *f = new FDFormat(this); + FDFormat *f = new FDFormat(TQT_TQOBJECT(this)); f->configureDevice(drive,blocks); f->configure(verifylabel->isChecked()); formatActions->queue(f); @@ -577,7 +577,7 @@ void FloppyData::format(){ if ( filesystemComboBox->currentText() == i18n("DOS") ) { - FATFilesystem *f = new FATFilesystem(this); + FATFilesystem *f = new FATFilesystem(TQT_TQOBJECT(this)); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -594,7 +594,7 @@ void FloppyData::format(){ else if ( filesystemComboBox->currentText() == i18n("ext2") ) { - Ext2Filesystem *f = new Ext2Filesystem(this); + Ext2Filesystem *f = new Ext2Filesystem(TQT_TQOBJECT(this)); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -612,7 +612,7 @@ void FloppyData::format(){ #ifdef ANY_BSD else if ( filesystemComboBox->currentText() == i18n("UFS") ) { - FloppyAction *f = new UFSFilesystem(this); + FloppyAction *f = new UFSFilesystem(TQT_TQOBJECT(this)); f->configureDevice(drive,blocks); formatActions->queue(f); } @@ -621,7 +621,7 @@ void FloppyData::format(){ #ifdef ANY_LINUX else if ( filesystemComboBox->currentText() == i18n("Minix") ) { - MinixFilesystem *f = new MinixFilesystem(this); + MinixFilesystem *f = new MinixFilesystem(TQT_TQOBJECT(this)); f->configure(verifylabel->isChecked(), labellabel->isChecked(), lineedit->text()); @@ -642,9 +642,9 @@ void FloppyData::format(){ formatActions->exec(); } -void FloppyData::formatStatus(const TQString &s,int p) +void FloppyData::formattqStatus(const TQString &s,int p) { - kdDebug(2002) << "FloppyData::formatStatus: " << s << " : " << p << endl; + kdDebug(2002) << "FloppyData::formattqStatus: " << s << " : " << p << endl; if (!s.isEmpty()) { const TQString oldText ( frame->text() ); diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h index 49b0766..c95dbc6 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -44,9 +44,10 @@ class KFActionQueue; class FloppyData : public KDialog { Q_OBJECT + TQ_OBJECT public: - FloppyData(TQWidget* parent = 0, const char * name = 0); + FloppyData(TQWidget* tqparent = 0, const char * name = 0); virtual ~FloppyData(); /// Need to overload normal show() in order to mangle caption @@ -64,7 +65,7 @@ public: void readSettings(); /// Map stored settings to widget status void setWidgets(); - /// A kind of TQString::find() + /// A kind of TQString::tqfind() int findKeyWord(TQString &, const TQString &); /// Enable/disable all UI elements void setEnabled(bool); @@ -74,7 +75,7 @@ public slots: void format(); void reset(); - void formatStatus(const TQString &,int); + void formattqStatus(const TQString &,int); protected slots: diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 485acc3..ea98530 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -34,7 +34,7 @@ #include "format.h" -static TQString extPath = TQString::null; +static TQString extPath = TQString(); /* static */ TQString findExecutable(const TQString &e) { @@ -51,8 +51,8 @@ static TQString extPath = TQString::null; -KFAction::KFAction(TQObject *parent) : - TQObject(parent) +KFAction::KFAction(TQObject *tqparent) : + TQObject(tqparent) { DEBUGSETUP; } @@ -79,8 +79,8 @@ public: TQPtrList<KFAction> list; } ; -KFActionQueue::KFActionQueue(TQObject *parent) : - KFAction(parent), +KFActionQueue::KFActionQueue(TQObject *tqparent) : + KFAction(tqparent), d(new KFActionQueue_p) { DEBUGSETUP; @@ -262,11 +262,11 @@ bool FloppyAction::configureDevice(int drive,int density) const char *devicename = 0L; deviceInfo=0L; - deviceName = TQString::null; + deviceName = TQString(); if ((drive<0) || (drive>1)) { - emit status(i18n("Unexpected drive number %1.").arg(drive),-1); + emit status(i18n("Unexpected drive number %1.").tqarg(drive),-1); return false; } @@ -278,7 +278,7 @@ bool FloppyAction::configureDevice(int drive,int density) } if (!deviceinfo) { - emit status(i18n("Unexpected density number %1.").arg(density),-1); + emit status(i18n("Unexpected density number %1.").tqarg(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.") - .arg(drive).arg(density),-1); + .tqarg(drive).tqarg(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.").arg(deviceinfo->devices[0]); + "you have write permission to it.").tqarg(deviceinfo->devices[0]); emit status(str,-1); return false; } @@ -338,18 +338,18 @@ void FloppyAction::processDone(KProcess *p) { if (p->exitStatus() == 0) { - emit status(TQString::null,100); + emit status(TQString(),100); emit done(this,true); } else { - emit status(i18n("The program %1 terminated with an error.").arg(theProcessName),100); + emit status(i18n("The program %1 terminated with an error.").tqarg(theProcessName),100); emit done(this,false); } } else { - emit status(i18n("The program %1 terminated abnormally.").arg(theProcessName),100); + emit status(i18n("The program %1 terminated abnormally.").tqarg(theProcessName),100); emit done(this,false); } } @@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l) { Q_UNUSED(b); Q_UNUSED(l); - kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl; + kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl; } void FloppyAction::processStdErr(KProcess *p, char *b, int l) @@ -383,14 +383,14 @@ bool FloppyAction::startProcess() } -/* static */ TQString FDFormat::fdformatName = TQString::null; +/* static */ TQString FDFormat::fdformatName = TQString(); FDFormat::FDFormat(TQObject *p) : FloppyAction(p), doVerify(true) { DEBUGSETUP; - theProcessName = TQString::fromLatin1("fdformat"); + theProcessName = TQString::tqfromLatin1("fdformat"); setName("FDFormat"); } @@ -473,17 +473,17 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) if (b[0]=='F') { formatTrackCount++; - emit status(TQString::null, + emit status(TQString(), formatTrackCount * 100 / deviceInfo->tracks); } else if (b[0]=='E') { - emit status(i18n("Error formatting track %1.").arg(formatTrackCount),-1); + emit status(i18n("Error formatting track %1.").tqarg(formatTrackCount),-1); } else { - s = TQString::fromLatin1(b,l); - if (s.contains("ioctl(FD_FORM)")) + s = TQString::tqfromLatin1(b,l); + if (s.tqcontains("ioctl(FD_FORM)")) { emit status (i18n( "Cannot access floppy or floppy drive.\n" @@ -491,7 +491,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) "have selected a valid floppy drive."),-1); return; } - if (s.find("/dev/")>=0) + if (s.tqfind("/dev/")>=0) { emit status(s,-1); return; @@ -499,24 +499,24 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) DEBUGS(s); } #elif defined(ANY_LINUX) - s = TQString::fromLatin1(b,l); + s = TQString::tqfromLatin1(b,l); DEBUGS(s); TQRegExp regexp( "([0-9]+)" ); - if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) ) + if ( s.startsWith( "bad data at cyl" ) || ( s.tqfind( "Problem reading cylinder" ) != -1 ) ) { if ( regexp.search( s ) > -1 ) { const int track = regexp.cap(1).toInt(); - emit status(i18n("Low-level formatting error at track %1.").arg(track), -1); + emit status(i18n("Low-level formatting error at track %1.").tqarg(track), -1); } else { // This error should not happen - emit status(i18n("Low-level formatting error: %1").arg(s), -1); + emit status(i18n("Low-level formatting error: %1").tqarg(s), -1); } return; } - else if (s.find("ioctl(FDFMTBEG)")!=-1) + else if (s.tqfind("ioctl(FDFMTBEG)")!=-1) { emit status (i18n( "Cannot access floppy or floppy drive.\n" @@ -524,15 +524,15 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) "have selected a valid floppy drive."),-1); return; } - else if (s.find("busy")!=-1) // "Device or resource busy" + else if (s.tqfind("busy")!=-1) // "Device or resource busy" { emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1); return; } // Be careful to leave "iotcl" as last before checking numbers - else if (s.find("ioctl")!=-1) + else if (s.tqfind("ioctl")!=-1) { - emit status(i18n("Low-level format error: %1").arg(s),-1); + emit status(i18n("Low-level format error: %1").tqarg(s),-1); return; } // Check for numbers at last (as /dev/fd0u1440 has numbers too) @@ -542,7 +542,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) const int p = regexp.cap(1).toInt(); if ((p>=0) && (p<deviceInfo->tracks)) { - emit status(TQString::null, + emit status(TQString(), p * 100 / deviceInfo->tracks); } } @@ -551,13 +551,13 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) } -/* static */ TQString DDZeroOut::m_ddName = TQString::null; +/* static */ TQString DDZeroOut::m_ddName = TQString(); DDZeroOut::DDZeroOut(TQObject *p) : FloppyAction(p) { kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl; - theProcessName = TQString::fromLatin1("dd"); + theProcessName = TQString::tqfromLatin1("dd"); setName("DD"); } @@ -617,16 +617,16 @@ void DDZeroOut::processDone(KProcess *p) * * ### TODO: really check if the exit is not on an other error and then abort the formatting */ - emit status(TQString::null,100); + emit status(TQString(),100); emit done(this,true); } -/* static */ TQString FATFilesystem::newfs_fat = TQString::null ; +/* static */ TQString FATFilesystem::newfs_fat = TQString() ; -FATFilesystem::FATFilesystem(TQObject *parent) : - FloppyAction(parent) +FATFilesystem::FATFilesystem(TQObject *tqparent) : + FloppyAction(tqparent) { DEBUGSETUP; runtimeCheck(); @@ -656,7 +656,7 @@ bool FATFilesystem::configure(bool v,bool l,const TQString &lbl) if (l) label=lbl.simplifyWhiteSpace(); else - label=TQString::null; + label=TQString(); return true; } @@ -720,20 +720,20 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l) #ifdef ANY_BSD // ### TODO: do some checks #elif defined(ANY_LINUX) - TQString s ( TQString::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( b, l ) ); kdDebug(KFAREA) << s << endl; - if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system + if (s.tqfind("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system { emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1); return; } - else if (s.find("busy")!=-1) // "Device or resource busy" + else if (s.tqfind("busy")!=-1) // "Device or resource busy" { emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1); return; } # if 0 - else if ( s.find( "mkdosfs" ) != -1 ) // DEBUG: get the program header and show it! + else if ( s.tqfind( "mkdosfs" ) != -1 ) // DEBUG: get the program header and show it! { emit status( s, -1 ); return; @@ -747,10 +747,10 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l) #ifdef ANY_BSD -/* static */ TQString UFSFilesystem::newfs = TQString::null ; +/* static */ TQString UFSFilesystem::newfs = TQString() ; -UFSFilesystem::UFSFilesystem(TQObject *parent) : - FloppyAction(parent) +UFSFilesystem::UFSFilesystem(TQObject *tqparent) : + FloppyAction(tqparent) { DEBUGSETUP; runtimeCheck(); @@ -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").arg(deviceInfo->blocks); + *p << "-T" << TQString("fd%1").tqarg(deviceInfo->blocks); *p << deviceName; @@ -806,10 +806,10 @@ void UFSFilesystem::exec() -/* static */ TQString Ext2Filesystem::newfs = TQString::null ; +/* static */ TQString Ext2Filesystem::newfs = TQString() ; -Ext2Filesystem::Ext2Filesystem(TQObject *parent) : - FloppyAction(parent) +Ext2Filesystem::Ext2Filesystem(TQObject *tqparent) : + FloppyAction(tqparent) { DEBUGSETUP; runtimeCheck(); @@ -836,7 +836,7 @@ bool Ext2Filesystem::configure(bool v,bool l,const TQString &lbl) } else { - label=TQString::null; + label=TQString(); } return true; @@ -886,14 +886,14 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l) #ifdef ANY_BSD // ### TODO: do some checks #elif defined(ANY_LINUX) - TQString s ( TQString::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( b, l ) ); kdDebug(KFAREA) << s << endl; - if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!" + if (s.tqfind("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!" { emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1); return; } - else if (s.find("busy")!=-1) // "Device or resource busy" + else if (s.tqfind("busy")!=-1) // "Device or resource busy" { emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1); return; @@ -904,10 +904,10 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l) #ifdef ANY_LINUX -/* static */ TQString MinixFilesystem::newfs = TQString::null ; +/* static */ TQString MinixFilesystem::newfs = TQString() ; -MinixFilesystem::MinixFilesystem(TQObject *parent) : - FloppyAction(parent) +MinixFilesystem::MinixFilesystem(TQObject *tqparent) : + FloppyAction(tqparent) { DEBUGSETUP; runtimeCheck(); @@ -934,7 +934,7 @@ bool MinixFilesystem::configure(bool v,bool l,const TQString &lbl) } else { - label=TQString::null; + label=TQString(); } return true; @@ -977,14 +977,14 @@ void MinixFilesystem::exec() void MinixFilesystem::processStdOut(KProcess *, char *b, int l) { - TQString s ( TQString::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( b, l ) ); kdDebug(KFAREA) << s << endl; - if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!" + if (s.tqfind("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!" { emit status(i18n("Floppy is mounted.\nYou need to unmount the floppy first."),-1); return; } - else if (s.find("busy")!=-1) // "Device or resource busy" + else if (s.tqfind("busy")!=-1) // "Device or resource busy" { emit status(i18n("Device busy.\nPerhaps you need to unmount the floppy first."),-1); return; diff --git a/kfloppy/format.h b/kfloppy/format.h index 6f8de58..f4c57c8 100644 --- a/kfloppy/format.h +++ b/kfloppy/format.h @@ -63,12 +63,13 @@ * and push a bunch of actions on it, then run exec() * on the stack and wait for the done() signal. */ -class KFAction : public QObject +class KFAction : public TQObject { Q_OBJECT + TQ_OBJECT public: - KFAction(TQObject *parent = 0L); + KFAction(TQObject *tqparent = 0L); virtual ~KFAction(); public slots: @@ -115,9 +116,10 @@ signals: class KFActionQueue : public KFAction { Q_OBJECT + TQ_OBJECT public: - KFActionQueue(TQObject *parent = 0L); + KFActionQueue(TQObject *tqparent = 0L); virtual ~KFActionQueue(); /** @@ -174,9 +176,10 @@ class KProcess; class FloppyAction : public KFAction { Q_OBJECT + TQ_OBJECT public: - FloppyAction(TQObject *parent = 0L); + FloppyAction(TQObject *tqparent = 0L); /** * Kills the running process, if one exists. @@ -249,7 +252,7 @@ protected: class FDFormat : public FloppyAction { public: - FDFormat(TQObject *parent = 0L); + FDFormat(TQObject *tqparent = 0L); virtual void exec(); @@ -285,7 +288,7 @@ protected: class DDZeroOut : public FloppyAction { public: - DDZeroOut(TQObject *parent = 0L); + DDZeroOut(TQObject *tqparent = 0L); virtual void exec(); @@ -315,7 +318,7 @@ protected: class FATFilesystem : public FloppyAction { public: - FATFilesystem(TQObject *parent = 0L); + FATFilesystem(TQObject *tqparent = 0L); virtual void exec(); @@ -346,7 +349,7 @@ protected: class Ext2Filesystem : public FloppyAction { public: - Ext2Filesystem(TQObject *parent = 0L); + Ext2Filesystem(TQObject *tqparent = 0L); virtual void exec(); @@ -374,7 +377,7 @@ protected: class UFSFilesystem : public FloppyAction { public: - UFSFilesystem(TQObject *parent = 0L); + UFSFilesystem(TQObject *tqparent = 0L); virtual void exec(); @@ -396,7 +399,7 @@ protected: class MinixFilesystem : public FloppyAction { public: - MinixFilesystem(TQObject *parent = 0L); + MinixFilesystem(TQObject *tqparent = 0L); virtual void exec(); diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index 51da7ef..e774a8f 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").arg(totalBlocks); + *p << TQString("count=%1").tqarg(totalBlocks); if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput)) { emit statusMessage(i18n("Cannot start dd to zero disk.")); @@ -250,8 +250,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l) DEBUGSETUP; #ifdef DEBUG - TQString o = TQString::fromLatin1(b,l); - DEBUGS(TQString(" %1").arg(o).latin1()); + TQString o = TQString::tqfromLatin1(b,l); + DEBUGS(TQString(" %1").tqarg(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...") - .arg(currentblock) - .arg(totalBlocks)); + .tqarg(currentblock) + .tqarg(totalBlocks)); } } break; @@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l) // emit setProgress(1); - // TQString myBuf = TQString::fromLatin1(b, l); + // TQString myBuf = TQString::tqfromLatin1(b, l); // DEBUGS(myBuf.latin1()); } break; diff --git a/kfloppy/zip.h b/kfloppy/zip.h index 93cb234..b422c92 100644 --- a/kfloppy/zip.h +++ b/kfloppy/zip.h @@ -47,6 +47,7 @@ class KConfig; class ZipFormat : public DiskFormat { Q_OBJECT + TQ_OBJECT public: ZipFormat(TQWidget *w, const char *n); |