Fix FTBFS

1 files changed, 34 insertions, 34 deletions

diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc
index 0040a91..dae2539 100644
--- a/conduits/abbrowserconduit/kabcRecord.cc
+++ b/conduits/abbrowserconduit/kabcRecord.cc
@@ -74,7 +74,7 @@ static TDEABC::PhoneNumber::Types pilotToPhoneMap[8] = {
 	TDEABC::PhoneNumber::Cell   // eMobile
 } ;
 
-TDEABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a)
+TDEABC::PhoneNumber::List TDEABCSync::getPhoneNumbers(const PilotAddress &a)
 {
 	FUNCTIONSETUP;
 
@@ -131,7 +131,7 @@ TDEABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a)
 	return list;
 }
 
-void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
+void TDEABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 	PilotAddress &a,
 	const TDEABC::PhoneNumber::List &list)
 {
@@ -222,7 +222,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
 	}
 }
 
-unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
+unsigned int TDEABCSync::bestMatchedCategory(const TQStringList &pccategories,
 	const PilotAddressInfo &info,
 	unsigned int hhcategory)
 {
@@ -258,7 +258,7 @@ unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
 	return Pilot::Unfiled;
 }
 
-void KABCSync::setCategory(TDEABC::Addressee & abEntry, const TQString &cat)
+void TDEABCSync::setCategory(TDEABC::Addressee & abEntry, const TQString &cat)
 {
 	if ( (!cat.isEmpty()))
 	{
@@ -267,10 +267,10 @@ void KABCSync::setCategory(TDEABC::Addressee & abEntry, const TQString &cat)
 }
 
 
-TQString KABCSync::getFieldForHHCustom(
+TQString TDEABCSync::getFieldForHHCustom(
 	const unsigned int index,
 	const TDEABC::Addressee &abEntry,
-	const KABCSync::Settings &settings)
+	const TDEABCSync::Settings &settings)
 {
 	FUNCTIONSETUPL(4);
 
@@ -318,11 +318,11 @@ TQString KABCSync::getFieldForHHCustom(
 	return retval;
 }
 
-void KABCSync::setFieldFromHHCustom(
+void TDEABCSync::setFieldFromHHCustom(
 	const unsigned int index,
 	TDEABC::Addressee &abEntry,
 	const TQString &value,
-	const KABCSync::Settings &settings)
+	const TDEABCSync::Settings &settings)
 {
 	FUNCTIONSETUPL(4);
 
@@ -392,7 +392,7 @@ void KABCSync::setFieldFromHHCustom(
  *  for home or work as specified in the config dialog. If we don't have
  *  such one, either, search for the other type. If we still have no luck,
  *  return an address with preferred + home/work flag (from config dlg). */
-TDEABC::Address KABCSync::getAddress(const TDEABC::Addressee &abEntry, const KABCSync::Settings &s)
+TDEABC::Address TDEABCSync::getAddress(const TDEABC::Addressee &abEntry, const TDEABCSync::Settings &s)
 {
 	// preferhome == (AbbrowserSettings::pilotStreet==0)
 
@@ -416,7 +416,7 @@ TDEABC::Address KABCSync::getAddress(const TDEABC::Addressee &abEntry, const KAB
 }
 
 
-TQString KABCSync::getFieldForHHOtherPhone(const TDEABC::Addressee & abEntry, const KABCSync::Settings &s)
+TQString TDEABCSync::getFieldForHHOtherPhone(const TDEABC::Addressee & abEntry, const TDEABCSync::Settings &s)
 {
 	switch(s.fieldForOtherPhone())
 	{
@@ -441,7 +441,7 @@ TQString KABCSync::getFieldForHHOtherPhone(const TDEABC::Addressee & abEntry, co
 	}
 }
 
-void KABCSync::setFieldFromHHOtherPhone(TDEABC::Addressee & abEntry, const TQString &nr, const KABCSync::Settings &s)
+void TDEABCSync::setFieldFromHHOtherPhone(TDEABC::Addressee & abEntry, const TQString &nr, const TDEABCSync::Settings &s)
 {
 	int phoneType = 0;
 	switch (s.fieldForOtherPhone())
@@ -483,7 +483,7 @@ void KABCSync::setFieldFromHHOtherPhone(TDEABC::Addressee & abEntry, const TQStr
 	abEntry.insertPhoneNumber(phone);
 }
 
-void KABCSync::setAddress(PilotAddress &toPilotAddr,
+void TDEABCSync::setAddress(PilotAddress &toPilotAddr,
 	const TDEABC::Address & abAddress)
 {
 	toPilotAddr.setField(entryAddress, abAddress.street());
@@ -494,25 +494,25 @@ void KABCSync::setAddress(PilotAddress &toPilotAddr,
 }
 
 
-bool KABCSync::isArchived(const TDEABC::Addressee &addr)
+bool TDEABCSync::isArchived(const TDEABC::Addressee &addr)
 {
-	return addr.custom(KABCSync::appString, KABCSync::flagString) == TQString::number(SYNCDEL);
+	return addr.custom(TDEABCSync::appString, TDEABCSync::flagString) == TQString::number(SYNCDEL);
 }
 
-void KABCSync::makeArchived(TDEABC::Addressee &addr)
+void TDEABCSync::makeArchived(TDEABC::Addressee &addr)
 {
 	FUNCTIONSETUP;
-	addr.insertCustom(KABCSync::appString, KABCSync::flagString, TQString::number(SYNCDEL));
-	addr.removeCustom(KABCSync::appString, KABCSync::idString);
+	addr.insertCustom(TDEABCSync::appString, TDEABCSync::flagString, TQString::number(SYNCDEL));
+	addr.removeCustom(TDEABCSync::appString, TDEABCSync::idString);
 }
 
 
 
 
-void KABCSync::copy(PilotAddress &toPilotAddr,
+void TDEABCSync::copy(PilotAddress &toPilotAddr,
 	const TDEABC::Addressee &fromAbEntry,
 	const PilotAddressInfo &appInfo,
-	const KABCSync::Settings &syncSettings)
+	const TDEABCSync::Settings &syncSettings)
 {
 	FUNCTIONSETUP;
 
@@ -532,17 +532,17 @@ void KABCSync::copy(PilotAddress &toPilotAddr,
 	// now in one fell swoop, set all phone numbers from the Addressee.  Note,
 	// we don't need to differentiate between Fax numbers here--all Fax numbers
 	// (Home Fax or Work Fax or just plain old Fax) will get synced to the Pilot
-	KABCSync::setPhoneNumbers(appInfo,toPilotAddr,fromAbEntry.phoneNumbers());
+	TDEABCSync::setPhoneNumbers(appInfo,toPilotAddr,fromAbEntry.phoneNumbers());
 
 	// Other field is an oddball and if the user has more than one field set
 	// as "Other" then only one will be carried over.
-	TQString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
+	TQString oth = TDEABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
 	DEBUGKPILOT << fname << ": putting: ["<<oth<<"] into Palm's other"<<endl;
 	toPilotAddr.setPhoneField(PilotAddressInfo::eOther,
 		oth, PilotAddress::Replace);
 
-	TDEABC::Address homeAddress = KABCSync::getAddress(fromAbEntry, syncSettings);
-	KABCSync::setAddress(toPilotAddr, homeAddress);
+	TDEABC::Address homeAddress = TDEABCSync::getAddress(fromAbEntry, syncSettings);
+	TDEABCSync::setAddress(toPilotAddr, homeAddress);
 
 	// Process the additional entries from the Palm(the palm database app block tells us the name of the fields)
 	unsigned int customIndex = 0;
@@ -553,7 +553,7 @@ void KABCSync::copy(PilotAddress &toPilotAddr,
 		toPilotAddr.setField(hhField,getFieldForHHCustom(customIndex,fromAbEntry,syncSettings));
 	}
 
-	int categoryForHH = KABCSync::bestMatchedCategory(fromAbEntry.categories(),
+	int categoryForHH = TDEABCSync::bestMatchedCategory(fromAbEntry.categories(),
 		appInfo,toPilotAddr.category());
 	toPilotAddr.setCategory(categoryForHH);
 
@@ -567,10 +567,10 @@ void KABCSync::copy(PilotAddress &toPilotAddr,
 	}
 }
 
-void KABCSync::copy(TDEABC::Addressee &toAbEntry,
+void TDEABCSync::copy(TDEABC::Addressee &toAbEntry,
 	const PilotAddress &fromPiAddr,
 	const PilotAddressInfo &appInfo,
-	const KABCSync::Settings &syncSettings)
+	const TDEABCSync::Settings &syncSettings)
 {
 	FUNCTIONSETUP;
 
@@ -601,7 +601,7 @@ void KABCSync::copy(TDEABC::Addressee &toAbEntry,
 	}
 
 	// now, get the phone numbers from the Pilot and set them one at a time in kabc
-	TDEABC::PhoneNumber::List phones = KABCSync::getPhoneNumbers(fromPiAddr);
+	TDEABC::PhoneNumber::List phones = TDEABCSync::getPhoneNumbers(fromPiAddr);
 	for (TDEABC::PhoneNumber::List::Iterator it = phones.begin(); it != phones.end(); ++it) {
 		TDEABC::PhoneNumber phone = *it;
 		// check for fax number if it is one, set the type per the user's direction
@@ -615,7 +615,7 @@ void KABCSync::copy(TDEABC::Addressee &toAbEntry,
 	// Note:  this is weird, and it may cause data to not be synced if there is
 	// more than one "Other" field being used on the Pilot, since only one will
 	// be synced in either direction.
-	KABCSync::setFieldFromHHOtherPhone(toAbEntry,
+	TDEABCSync::setFieldFromHHOtherPhone(toAbEntry,
 		fromPiAddr.getPhoneField(PilotAddressInfo::eOther),syncSettings);
 
 	// going from Pilot to kabc, we need to clear out all addresses in kabc
@@ -627,7 +627,7 @@ void KABCSync::copy(TDEABC::Addressee &toAbEntry,
 		const TDEABC::Address addr = *it;
 		toAbEntry.removeAddress(addr);
 	}
-	TDEABC::Address homeAddress = KABCSync::getAddress(toAbEntry,syncSettings);
+	TDEABC::Address homeAddress = TDEABCSync::getAddress(toAbEntry,syncSettings);
 	homeAddress.setStreet(fromPiAddr.getField(entryAddress));
 	homeAddress.setLocality(fromPiAddr.getField(entryCity));
 	homeAddress.setRegion(fromPiAddr.getField(entryState));
@@ -640,7 +640,7 @@ void KABCSync::copy(TDEABC::Addressee &toAbEntry,
 
 	for ( ; customIndex<4; ++customIndex,++hhField )
 	{
-		KABCSync::setFieldFromHHCustom(customIndex,
+		TDEABCSync::setFieldFromHHCustom(customIndex,
 			toAbEntry,
 			fromPiAddr.getField(hhField),
 			syncSettings);
@@ -650,14 +650,14 @@ void KABCSync::copy(TDEABC::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, TQString::number(fromPiAddr.id()));
+	toAbEntry.insertCustom(TDEABCSync::appString, TDEABCSync::idString, TQString::number(fromPiAddr.id()));
 
-	KABCSync::setCategory(toAbEntry, appInfo.categoryName(fromPiAddr.category()));
+	TDEABCSync::setCategory(toAbEntry, appInfo.categoryName(fromPiAddr.category()));
 
 	showAddressee(toAbEntry);
 }
 
-void KABCSync::showAddressee(const TDEABC::Addressee & abAddress)
+void TDEABCSync::showAddressee(const TDEABC::Addressee & abAddress)
 {
 	FUNCTIONSETUP;
 #ifdef DEBUG
@@ -699,7 +699,7 @@ void KABCSync::showAddressee(const TDEABC::Addressee & abAddress)
 
 
 
-KABCSync::Settings::Settings() :
+TDEABCSync::Settings::Settings() :
 	fDateFormat(),
 	fCustomMapping(4), // Reserve space for 4 elements, value 0 == CustomField
 	fOtherPhone(eOtherPhone),