summaryrefslogtreecommitdiffstats
path: root/kfloppy
diff options
context:
space:
mode:
Diffstat (limited to 'kfloppy')
-rw-r--r--kfloppy/floppy.cpp10
-rw-r--r--kfloppy/floppy.h2
-rw-r--r--kfloppy/format.cpp38
-rw-r--r--kfloppy/zip.cpp14
4 files changed, 32 insertions, 32 deletions
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 18851bc..3eef4ef 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -22,7 +22,7 @@
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcursor.h>
@@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
frame = new TQLabel( this, "NewsWindow" );
frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- frame->tqsetAlignment(WordBreak|ExpandTabs);
+ frame->setAlignment(WordBreak|ExpandTabs);
TQWhatsThis::add( frame,
i18n("<qt>This is the status window, where error messages are displayed.</qt>") );
@@ -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;
@@ -539,7 +539,7 @@ void FloppyData::format(){
formatActions = new KFActionQueue(TQT_TQOBJECT(this));
connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
- this,TQT_SLOT(formattqStatus(const TQString &,int)));
+ this,TQT_SLOT(formatStatus(const TQString &,int)));
connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
this,TQT_SLOT(reset()));
@@ -642,7 +642,7 @@ void FloppyData::format(){
formatActions->exec();
}
-void FloppyData::formattqStatus(const TQString &s,int p)
+void FloppyData::formatStatus(const TQString &s,int p)
{
kdDebug(2002) << "FloppyData::formatStatus: " << s << " : " << p << endl;
if (!s.isEmpty())
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 30b0519..ead6b71 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -75,7 +75,7 @@ public slots:
void format();
void reset();
- void formattqStatus(const TQString &,int);
+ void formatStatus(const TQString &,int);
protected slots:
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 03f6f41..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);
}
}
@@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l)
{
Q_UNUSED(b);
Q_UNUSED(l);
- kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl;
+ kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
}
void FloppyAction::processStdErr(KProcess *p, char *b, int l)
@@ -390,7 +390,7 @@ FDFormat::FDFormat(TQObject *p) :
doVerify(true)
{
DEBUGSETUP;
- theProcessName = TQString::tqfromLatin1("fdformat");
+ theProcessName = TQString::fromLatin1("fdformat");
setName("FDFormat");
}
@@ -478,11 +478,11 @@ 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
{
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
if (s.contains("ioctl(FD_FORM)"))
{
emit status (i18n(
@@ -499,7 +499,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
DEBUGS(s);
}
#elif defined(ANY_LINUX)
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
DEBUGS(s);
TQRegExp regexp( "([0-9]+)" );
if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) )
@@ -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)
@@ -557,7 +557,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
FloppyAction(p)
{
kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
- theProcessName = TQString::tqfromLatin1("dd");
+ theProcessName = TQString::fromLatin1("dd");
setName("DD");
}
@@ -720,7 +720,7 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
{
@@ -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;
@@ -886,7 +886,7 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
{
@@ -977,7 +977,7 @@ void MinixFilesystem::exec()
void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
{
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
{
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index e774a8f..672eb06 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -34,7 +34,7 @@
#include "zip.moc"
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqwhatsthis.h>
@@ -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."));
@@ -250,8 +250,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
DEBUGSETUP;
#ifdef DEBUG
- TQString o = TQString::tqfromLatin1(b,l);
- DEBUGS(TQString(" %1").tqarg(o).latin1());
+ TQString o = TQString::fromLatin1(b,l);
+ 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;
@@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
//
emit setProgress(1);
- // TQString myBuf = TQString::tqfromLatin1(b, l);
+ // TQString myBuf = TQString::fromLatin1(b, l);
// DEBUGS(myBuf.latin1());
}
break;