diff options
Diffstat (limited to 'ksysv/IOCore.cpp')
| -rw-r--r-- | ksysv/IOCore.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp index 8c7dc90..1951aa2 100644 --- a/ksysv/IOCore.cpp +++ b/ksysv/IOCore.cpp @@ -49,23 +49,23 @@ void ksv::IO::removeFile (const TQFileInfo& info, TQDir& dir, TQString& rich, TQ if (!dir.remove(info.fileName(), FALSE)) { rich = (i18n ("<error>FAILED</error> to remove <cmd>%1</cmd> from <cmd>%2</cmd>: \"%3\"<br/>") - .tqarg(info.fileName()) - .tqarg(dir.path()) - .tqarg(strerror(errno))); + .arg(info.fileName()) + .arg(dir.path()) + .arg(strerror(errno))); plain = (i18n ("FAILED to remove %1 from %2: \"%3\"\n") - .tqarg(info.fileName()) - .tqarg(dir.path()) - .tqarg(strerror(errno))); + .arg(info.fileName()) + .arg(dir.path()) + .arg(strerror(errno))); } else { rich = i18n("removed <cmd>%1</cmd> from <cmd>%2</cmd><br/>") - .tqarg(info.fileName()) - .tqarg(dir.path()); + .arg(info.fileName()) + .arg(dir.path()); plain = i18n("removed %1 from %2\n") - .tqarg(info.fileName()) - .tqarg(dir.path()); + .arg(info.fileName()) + .arg(dir.path()); } } @@ -80,8 +80,8 @@ void ksv::IO::dissectFilename (const TQString& file, TQString& base, int& nr) void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start, TQString& rich, TQString& plain) { - const TQString symName = TQString("%1%2%3").tqarg(start ? "S" : "K").tqarg(data.numberString()).tqarg(data.label()); - const TQString symPath = TQString("%1/rc%2.d/").tqarg(KSVConfig::self()->runlevelPath()).tqarg(runlevel); + const TQString symName = TQString("%1%2%3").arg(start ? "S" : "K").arg(data.numberString()).arg(data.label()); + const TQString symPath = TQString("%1/rc%2.d/").arg(KSVConfig::self()->runlevelPath()).arg(runlevel); const TQString symbol = symPath + symName; TQString target = data.filename(); @@ -92,20 +92,20 @@ void ksv::IO::makeSymlink (const KSVData& data, int runlevel, bool start, if (symlink(target.local8Bit(), symbol.local8Bit()) == 0) { - rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").tqarg(symName).tqarg(symPath); - plain = i18n("created %1 in %2\n").tqarg(symName).tqarg(symPath); + rich = i18n("created <cmd>%1</cmd> in <cmd>%2</cmd><br/>").arg(symName).arg(symPath); + plain = i18n("created %1 in %2\n").arg(symName).arg(symPath); } else { rich = i18n("<error>FAILED</error> to create <cmd>%1</cmd> in <cmd>%2</cmd>: \"%3\"<br/>") - .tqarg(symName) - .tqarg(symPath) - .tqarg(strerror(errno)); + .arg(symName) + .arg(symPath) + .arg(strerror(errno)); plain = i18n("FAILED to create %1 in %2: \"%3\"\n") - .tqarg(symName) - .tqarg(symPath) - .tqarg(strerror(errno)); + .arg(symName) + .arg(symPath) + .arg(strerror(errno)); } } @@ -201,7 +201,7 @@ bool ksv::IO::loadSavedConfiguration (TQDataStream& s, s >> rlMagic; s >> section; - if (rlMagic != TQString::tqfromLatin1("RUNLEVEL %1").tqarg(i)) + if (rlMagic != TQString::fromLatin1("RUNLEVEL %1").arg(i)) return false; if (section != "START") @@ -240,14 +240,14 @@ bool ksv::IO::saveConfiguration (TQDataStream& s, s << TQCString("KSysV") << version - << TQDateTime::tqcurrentDateTime(); // save date + << TQDateTime::currentDateTime(); // save date for (int i = 0; i < ksv::runlevelNumber; ++i) { TQ_INT32 numberOfItems = start[i]->childCount(); - s << TQString::tqfromLatin1 ("RUNLEVEL %1").arg (i) - << TQString::tqfromLatin1 ("START") + s << TQString::fromLatin1 ("RUNLEVEL %1").arg (i) + << TQString::fromLatin1 ("START") << numberOfItems; for (TQListViewItemIterator it (start[i]); @@ -259,7 +259,7 @@ bool ksv::IO::saveConfiguration (TQDataStream& s, numberOfItems = stop[i]->childCount(); - s << TQString::tqfromLatin1 ("STOP") + s << TQString::fromLatin1 ("STOP") << numberOfItems; for (TQListViewItemIterator it (stop[i]); |