1 files changed, 27 insertions, 27 deletions

diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.cc b/kpilot/conduits/abbrowserconduit/kabcRecord.cc
index b5d68121..9b49a2ca 100644
--- a/kpilot/conduits/abbrowserconduit/kabcRecord.cc
+++ b/kpilot/conduits/abbrowserconduit/kabcRecord.cc
@@ -33,7 +33,7 @@
 
 #include "options.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <kglobal.h>
 #include <kabc/addressee.h>
@@ -79,7 +79,7 @@ KABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a)
 	FUNCTIONSETUP;
 
 	KABC::PhoneNumber::List list;
-	QString test;
+	TQString test;
 
 	PhoneSlot shownPhone = a.getShownPhone();
 
@@ -136,7 +136,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 	const KABC::PhoneNumber::List &list)
 {
 	FUNCTIONSETUP;
-	QString test;
+	TQString test;
 
 	// clear all phone numbers (not e-mails) first
 	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid() ; ++i )
@@ -144,7 +144,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 		PilotAddressInfo::EPhoneType ind = a.getPhoneType( i );
 		if (ind != PilotAddressInfo::eEmail)
 		{
-			a.setField(i, QString());
+			a.setField(i, TQString());
 		}
 	}
 
@@ -199,7 +199,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 
 	// after setting the numbers, make sure that something sensible is set as the
 	// shownPhone on the Pilot if nothing is yet...
-	QString pref = a.getField(a.getShownPhone());
+	TQString pref = a.getField(a.getShownPhone());
 	if (!a.getShownPhone().isValid() || pref.isEmpty())
 	{
 		DEBUGKPILOT << fname << ": Pilot's showPhone: ["
@@ -222,7 +222,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 	}
 }
 
-unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories,
+unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
 	const PilotAddressInfo &info,
 	unsigned int hhcategory)
 {
@@ -243,7 +243,7 @@ unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories,
 
 	// Look for the first category from the list which is available on
 	// the handheld as well.
-	for(QStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it)
+	for(TQStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it)
 	{
 		// Do not map unknown to unfiled when looking for category
 		int c = info.findCategory( *it, false );
@@ -258,7 +258,7 @@ unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories,
 	return Pilot::Unfiled;
 }
 
-void KABCSync::setCategory(KABC::Addressee & abEntry, const QString &cat)
+void KABCSync::setCategory(KABC::Addressee & abEntry, const TQString &cat)
 {
 	if ( (!cat.isEmpty()))
 	{
@@ -267,24 +267,24 @@ void KABCSync::setCategory(KABC::Addressee & abEntry, const QString &cat)
 }
 
 
-QString KABCSync::getFieldForHHCustom(
+TQString KABCSync::getFieldForHHCustom(
 	const unsigned int index,
 	const KABC::Addressee &abEntry,
 	const KABCSync::Settings &settings)
 {
 	FUNCTIONSETUPL(4);
 
-	QString retval;
+	TQString retval;
 
 	if (index>3)
 	{
 		WARNINGKPILOT << "Bad index number " << index << endl;
-		retval = QString();
+		retval = TQString();
 	}
 	if (settings.customMapping().count() != 4)
 	{
 		WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl;
-		retval = QString();
+		retval = TQString();
 	}
 
 	switch (settings.custom(index))
@@ -296,9 +296,9 @@ QString KABCSync::getFieldForHHCustom(
 		}
 		else
 		{
-			QString tmpfmt(KGlobal::locale()->dateFormat());
+			TQString tmpfmt(KGlobal::locale()->dateFormat());
 			KGlobal::locale()->setDateFormat(settings.dateFormat());
-			QString ret(KGlobal::locale()->formatDate(abEntry.birthday().date()));
+			TQString ret(KGlobal::locale()->formatDate(abEntry.birthday().date()));
 			KGlobal::locale()->setDateFormat(tmpfmt);
 			retval = ret;
 		}
@@ -311,7 +311,7 @@ QString KABCSync::getFieldForHHCustom(
 		break;
 	case eCustomField:
 	default:
-		retval = abEntry.custom(appString, CSL1("CUSTOM")+QString::number(index));
+		retval = abEntry.custom(appString, CSL1("CUSTOM")+TQString::number(index));
 		break;
 	}
 
@@ -321,7 +321,7 @@ QString KABCSync::getFieldForHHCustom(
 void KABCSync::setFieldFromHHCustom(
 	const unsigned int index,
 	KABC::Addressee &abEntry,
-	const QString &value,
+	const TQString &value,
 	const KABCSync::Settings &settings)
 {
 	FUNCTIONSETUPL(4);
@@ -341,7 +341,7 @@ void KABCSync::setFieldFromHHCustom(
 	{
 	case eCustomBirthdate:
 	{
-		QDate bdate;
+		TQDate bdate;
 		bool ok=false;
 		if (settings.dateFormat().isEmpty())
 		{
@@ -356,8 +356,8 @@ void KABCSync::setFieldFromHHCustom(
 
 		if (!ok)
 		{
-			QString format = KGlobal::locale()->dateFormatShort();
-			QRegExp re(CSL1("%[yY][^%]*"));
+			TQString format = KGlobal::locale()->dateFormatShort();
+			TQRegExp re(CSL1("%[yY][^%]*"));
 			format.remove(re); // Remove references to year and following punctuation
 			bdate = KGlobal::locale()->readDate(value, format, &ok);
 		}
@@ -382,7 +382,7 @@ void KABCSync::setFieldFromHHCustom(
 		break;
 	case eCustomField:
 	default:
-		abEntry.insertCustom(appString, CSL1("CUSTOM")+QString::number(index), value);
+		abEntry.insertCustom(appString, CSL1("CUSTOM")+TQString::number(index), value);
 		break;
 	}
 }
@@ -416,7 +416,7 @@ KABC::Address KABCSync::getAddress(const KABC::Addressee &abEntry, const KABCSyn
 }
 
 
-QString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s)
+TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s)
 {
 	switch(s.fieldForOtherPhone())
 	{
@@ -437,11 +437,11 @@ QString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const
 		case eTTYTTDPhone:
 			return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number();
 		default:
-			return QString::null;
+			return TQString::null;
 	}
 }
 
-void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const QString &nr, const KABCSync::Settings &s)
+void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const TQString &nr, const KABCSync::Settings &s)
 {
 	int phoneType = 0;
 	switch (s.fieldForOtherPhone())
@@ -496,13 +496,13 @@ void KABCSync::setAddress(PilotAddress &toPilotAddr,
 
 bool KABCSync::isArchived(const KABC::Addressee &addr)
 {
-	return addr.custom(KABCSync::appString, KABCSync::flagString) == QString::number(SYNCDEL);
+	return addr.custom(KABCSync::appString, KABCSync::flagString) == TQString::number(SYNCDEL);
 }
 
 void KABCSync::makeArchived(KABC::Addressee &addr)
 {
 	FUNCTIONSETUP;
-	addr.insertCustom(KABCSync::appString, KABCSync::flagString, QString::number(SYNCDEL));
+	addr.insertCustom(KABCSync::appString, KABCSync::flagString, TQString::number(SYNCDEL));
 	addr.removeCustom(KABCSync::appString, KABCSync::idString);
 }
 
@@ -536,7 +536,7 @@ void KABCSync::copy(PilotAddress &toPilotAddr,
 
 	// Other field is an oddball and if the user has more than one field set
 	// as "Other" then only one will be carried over.
-	QString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
+	TQString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
 	DEBUGKPILOT << fname << ": putting: ["<<oth<<"] into Palm's other"<<endl;
 	toPilotAddr.setPhoneField(PilotAddressInfo::eOther,
 		oth, PilotAddress::Replace);
@@ -650,7 +650,7 @@ void KABCSync::copy(KABC::Addressee &toAbEntry,
 	// pilot id may be zero(since it could be new) but couldn't hurt
 	// to even assign it to zero; let's us know what state the
 	// toAbEntry is in
-	toAbEntry.insertCustom(KABCSync::appString, KABCSync::idString, QString::number(fromPiAddr.id()));
+	toAbEntry.insertCustom(KABCSync::appString, KABCSync::idString, TQString::number(fromPiAddr.id()));
 
 	KABCSync::setCategory(toAbEntry, appInfo.categoryName(fromPiAddr.category()));