Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 631a19d8c5c5f69dc0d941c1997806fb422c79a6.

2 files changed, 36 insertions, 36 deletions

diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc
index 5ed758f..4d1a35f 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::fromLatin1(sysinfo.getProductID());
+		fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID());
 
 		const KPilotCard *device = fHandle->getCardInfo();
 		if (device)
 		{
-			fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName());
+			fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName());
 			fValues[CSL1("devicemodel")] = unknown;  // TODO
-			fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer());
+			fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(device->getCardManufacturer());
 		}
 		else
 		{
@@ -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)")
-				.arg(TQString::fromLatin1(device->getCardName()))
-				.arg(TQString::fromLatin1(device->getCardManufacturer()))
-				.arg(device->getRamFree()/1024)
-				.arg(device->getRamSize()/1024);
+				.tqarg(TQString::tqfromLatin1(device->getCardName()))
+				.tqarg(TQString::tqfromLatin1(device->getCardManufacturer()))
+				.tqarg(device->getRamFree()/1024)
+				.tqarg(device->getRamSize()/1024);
 			KPILOT_DELETE(device);
 		} else {
 			fValues[CSL1("cards")] = i18n("No Cards available via pilot-link");
@@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo()
 		 * - #kpilot#
 		 * - #pilotlink#
 		 */
-		fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION);
+		fValues[CSL1("kpilot")] = TQString::tqfromLatin1(KPILOT_VERSION);
 		fValues[CSL1("kde")] = i18n("unknown");
 		fValues[CSL1("qt")] = i18n("unknown");
 		fValues[CSL1("os")] = i18n("unknown");
@@ -408,25 +408,25 @@ void SysInfoConduit::pcVersionInfo()
 		struct utsname name;
 		if (uname (&name) >= 0) {
 			fValues[CSL1("os")] = CSL1("%1 %3, %5")
-				.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));
+				.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));
 		}
 #ifdef TDE_VERSION_STRING
-		fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING);
+		fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING);
 #endif
 #ifdef TQT_VERSION_STR
-		fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR);
+		fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR);
 #endif
 		fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
-			.arg(PILOT_LINK_VERSION)
-			.arg(PILOT_LINK_MAJOR)
-			.arg(PILOT_LINK_MINOR)
+			.tqarg(PILOT_LINK_VERSION)
+			.tqarg(PILOT_LINK_MAJOR)
+			.tqarg(PILOT_LINK_MINOR)
 #ifdef PILOT_LINK_PATCH
-			.arg(TQString::fromLatin1(PILOT_LINK_PATCH));
+			.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH));
 #else
-			.arg(TQString());
+			.tqarg(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)")
-			.arg(fHandle->getSysInfo()->getMajorVersion())
-			.arg(fHandle->getSysInfo()->getMinorVersion())
-			.arg(fHandle->getSysInfo()->getCompatMajorVersion())
-			.arg(fHandle->getSysInfo()->getCompatMinorVersion());*/
+			.tqarg(fHandle->getSysInfo()->getMajorVersion())
+			.tqarg(fHandle->getSysInfo()->getMinorVersion())
+			.tqarg(fHandle->getSysInfo()->getCompatMajorVersion())
+			.tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/
 		KPilotSysInfo i = deviceLink()->getSysInfo();
-		fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion());
+		fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").tqarg(i.getMajorVersion()).tqarg(i.getMinorVersion());
 
 		keepParts.append(CSL1("palmversion"));
 	} else removeParts.append(CSL1("palmversion"));
@@ -470,7 +470,7 @@ void SysInfoConduit::writeFile()
 {
 	FUNCTIONSETUP;
 
-	fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate);
+	fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate);
 
 	TQString output;
 	// Open the template file
@@ -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("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it));
+		TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").tqarg(*it).tqarg(*it));
 		re.setMinimal(true);
 		output.remove(re);
 	}
 	for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) {
-		TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it));
+		TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").tqarg(*it).tqarg(*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<TQString,TQString>::Iterator it;
 	for ( it = fValues.begin(); it != fValues.end(); ++it ) {
-		output.replace(CSL1("#%1#").arg(it.key()), it.data());
+		output.replace(CSL1("#%1#").tqarg(it.key()), it.data());
 	}
 
 	// Insert the list of databases
@@ -552,11 +552,11 @@ void SysInfoConduit::writeFile()
 			 * %8 .. modifyDate
 			 * %9 .. backupDate
 			 */
-			newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name));
+			newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name));
 			set_long(&tmpchr[0],dbi.type);
-			newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr));
+			newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr));
 			set_long(&tmpchr[0],dbi.creator);
-			newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr));
+			newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(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));
@@ -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.").arg(fOutputFile));
+		emit logMessage(i18n("Unable to open output file, using %1 instead.").tqarg(fOutputFile));
 		outfile.setName(fOutputFile);
 		if (!outfile.open(IO_WriteOnly)) {
 			WARNINGKPILOT<< "Unable to open " << fOutputFile << endl;
-			emit logError(i18n("Unable to open %1").arg(fOutputFile));
+			emit logError(i18n("Unable to open %1").tqarg(fOutputFile));
 			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
 			return;
 		}
@@ -599,7 +599,7 @@ void SysInfoConduit::writeFile()
 	outstream<<output;
 	outfile.close();
 
-	emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile));
+	emit logMessage(i18n("Handheld system information written to the file %1").tqarg(fOutputFile));
 	TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
 }
 
diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
index d23be0e..7e5fbc1 100644
--- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
+++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
@@ -48,7 +48,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>51</height>
@@ -160,7 +160,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>20</height>