summaryrefslogtreecommitdiffstats
path: root/kdf/disks.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 10:00:17 -0600
committerTimothy Pearson <[email protected]>2011-12-16 10:00:17 -0600
commit955e20356d63ed405198c8143617a8a0ca8bfc02 (patch)
tree9a9ab22c86d212a5655014ad752e96b04c0c86a9 /kdf/disks.cpp
parentbf280726d5d22f33d33e4f9e771220c725249407 (diff)
downloadtdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.tar.gz
tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
Diffstat (limited to 'kdf/disks.cpp')
-rw-r--r--kdf/disks.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index c4af664..155e6e2 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(TQString::fromLatin1("%d"),deviceName());
- cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
- cmdS.replace(TQString::fromLatin1("%t"),fsType());
- cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
+ cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::tqfromLatin1("%t"),fsType());
+ cmdS.replace(TQString::tqfromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(TQString::fromLatin1("%d"),deviceName());
- cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -226,11 +226,11 @@ int DiskEntry::sysCall(const TQString & command)
{
if (readingSysStdErrOut || sysProc->isRunning() ) return -1;
- sysStringErrOut=i18n("Called: %1\n\n").arg(command); // put the called command on ErrOut
+ sysStringErrOut=i18n("Called: %1\n\n").tqarg(command); // put the called command on ErrOut
sysProc->clearArguments();
(*sysProc) << command;
if (!sysProc->start( KProcess::Block, KProcess::AllOutput ))
- kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl;
+ kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl;
if (sysProc->exitStatus()!=0) emit sysCallError(this, sysProc->exitStatus());