From 46d967c53bb9221c29b1d357086d600a01a97706 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:39:08 -0600 Subject: Remove additional unneeded tq method conversions --- conduits/sysinfoconduit/sysinfo-conduit.cc | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'conduits/sysinfoconduit/sysinfo-conduit.cc') diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 372fbd2..5ed758f 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -299,10 +299,10 @@ 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::fromLatin1(device->getCardName())) - .tqarg(TQString::fromLatin1(device->getCardManufacturer())) - .tqarg(device->getRamFree()/1024) - .tqarg(device->getRamSize()/1024); + .arg(TQString::fromLatin1(device->getCardName())) + .arg(TQString::fromLatin1(device->getCardManufacturer())) + .arg(device->getRamFree()/1024) + .arg(device->getRamSize()/1024); KPILOT_DELETE(device); } else { fValues[CSL1("cards")] = i18n("No Cards available via pilot-link"); @@ -408,10 +408,10 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .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)); + .arg(TQString::fromLatin1(name.sysname)) + .arg(TQString::fromLatin1(name.release)) + .arg(TQString::fromLatin1(name.machine)); + fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename)); } #ifdef TDE_VERSION_STRING fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING); @@ -420,13 +420,13 @@ void SysInfoConduit::pcVersionInfo() 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) + .arg(PILOT_LINK_VERSION) + .arg(PILOT_LINK_MAJOR) + .arg(PILOT_LINK_MINOR) #ifdef PILOT_LINK_PATCH - .tqarg(TQString::fromLatin1(PILOT_LINK_PATCH)); + .arg(TQString::fromLatin1(PILOT_LINK_PATCH)); #else - .tqarg(TQString()); + .arg(TQString()); #endif keepParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion")); @@ -441,12 +441,12 @@ void SysInfoConduit::palmVersionInfo() * - #palmos# */ /* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)") - .tqarg(fHandle->getSysInfo()->getMajorVersion()) - .tqarg(fHandle->getSysInfo()->getMinorVersion()) - .tqarg(fHandle->getSysInfo()->getCompatMajorVersion()) - .tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/ + .arg(fHandle->getSysInfo()->getMajorVersion()) + .arg(fHandle->getSysInfo()->getMinorVersion()) + .arg(fHandle->getSysInfo()->getCompatMajorVersion()) + .arg(fHandle->getSysInfo()->getCompatMinorVersion());*/ KPilotSysInfo i = deviceLink()->getSysInfo(); - fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").tqarg(i.getMajorVersion()).tqarg(i.getMinorVersion()); + fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion()); keepParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion")); @@ -513,12 +513,12 @@ void SysInfoConduit::writeFile() // Remove all parts not extracted for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { - TQRegExp re(CSL1("").tqarg(*it).tqarg(*it)); + TQRegExp re(CSL1("").arg(*it).arg(*it)); re.setMinimal(true); output.remove(re); } for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - TQRegExp re(CSL1("").tqarg(*it).tqarg(*it)); + TQRegExp re(CSL1("").arg(*it).arg(*it)); re.setMinimal(true); output.replace(re, CSL1("\\1")); } @@ -526,7 +526,7 @@ void SysInfoConduit::writeFile() // Do a loop through all keys in fValues TQMap::Iterator it; for ( it = fValues.begin(); it != fValues.end(); ++it ) { - output.replace(CSL1("#%1#").tqarg(it.key()), it.data()); + output.replace(CSL1("#%1#").arg(it.key()), it.data()); } // Insert the list of databases @@ -584,11 +584,11 @@ void SysInfoConduit::writeFile() TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() ); fOutputFile=fi.absFilePath(); WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl; - emit logMessage(i18n("Unable to open output file, using %1 instead.").tqarg(fOutputFile)); + emit logMessage(i18n("Unable to open output file, using %1 instead.").arg(fOutputFile)); outfile.setName(fOutputFile); if (!outfile.open(IO_WriteOnly)) { WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; - emit logError(i18n("Unable to open %1").tqarg(fOutputFile)); + emit logError(i18n("Unable to open %1").arg(fOutputFile)); TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } @@ -599,7 +599,7 @@ void SysInfoConduit::writeFile() outstream<