diff options
Diffstat (limited to 'conduits/sysinfoconduit/sysinfo-conduit.cc')
| -rw-r--r-- | conduits/sysinfoconduit/sysinfo-conduit.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 4d1a35f..372fbd2 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -214,14 +214,14 @@ void SysInfoConduit::hardwareInfo() * - #devicetype# */ KPilotSysInfo sysinfo = fHandle->getSysInfo(); - fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID()); + fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID()); const KPilotCard *device = fHandle->getCardInfo(); if (device) { - fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName()); + fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName()); fValues[CSL1("devicemodel")] = unknown; // TODO - fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(device->getCardManufacturer()); + fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer()); } else { @@ -299,8 +299,8 @@ void SysInfoConduit::storageInfo() const KPilotCard *device = fHandle->getCardInfo(1); if (device) { fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)") - .tqarg(TQString::tqfromLatin1(device->getCardName())) - .tqarg(TQString::tqfromLatin1(device->getCardManufacturer())) + .tqarg(TQString::fromLatin1(device->getCardName())) + .tqarg(TQString::fromLatin1(device->getCardManufacturer())) .tqarg(device->getRamFree()/1024) .tqarg(device->getRamSize()/1024); KPILOT_DELETE(device); @@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo() * - #kpilot# * - #pilotlink# */ - fValues[CSL1("kpilot")] = TQString::tqfromLatin1(KPILOT_VERSION); + fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION); fValues[CSL1("kde")] = i18n("unknown"); fValues[CSL1("qt")] = i18n("unknown"); fValues[CSL1("os")] = i18n("unknown"); @@ -408,23 +408,23 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .tqarg(TQString::tqfromLatin1(name.sysname)) - .tqarg(TQString::tqfromLatin1(name.release)) - .tqarg(TQString::tqfromLatin1(name.machine)); - fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename)); + .tqarg(TQString::fromLatin1(name.sysname)) + .tqarg(TQString::fromLatin1(name.release)) + .tqarg(TQString::fromLatin1(name.machine)); + fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::fromLatin1(name.nodename)); } #ifdef TDE_VERSION_STRING - fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING); + fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING); #endif #ifdef TQT_VERSION_STR - fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR); + fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR); #endif fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") .tqarg(PILOT_LINK_VERSION) .tqarg(PILOT_LINK_MAJOR) .tqarg(PILOT_LINK_MINOR) #ifdef PILOT_LINK_PATCH - .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH)); + .tqarg(TQString::fromLatin1(PILOT_LINK_PATCH)); #else .tqarg(TQString()); #endif @@ -470,7 +470,7 @@ void SysInfoConduit::writeFile() { FUNCTIONSETUP; - fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate); + fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate); TQString output; // Open the template file @@ -552,11 +552,11 @@ void SysInfoConduit::writeFile() * %8 .. modifyDate * %9 .. backupDate */ - newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name)); + newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name)); set_long(&tmpchr[0],dbi.type); - newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr)); set_long(&tmpchr[0],dbi.creator); - newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr)); newpatt.replace(CSL1("%3"), TQString::number(dbi.index)); newpatt.replace(CSL1("%4"), TQString::number(dbi.flags)); newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags)); |