TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index e4f674a..7de5582 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook()
 				emit logError(i18n("You chose to sync with the file \"%1\", which "
 							"cannot be opened. Please make sure to supply a "
 							"valid file name in the conduit's configuration dialog. "
-							"Aborting the conduit.").arg(AbbrowserSettings::fileName()));
+							"Aborting the conduit.").tqarg(AbbrowserSettings::fileName()));
 				KIO::NetAccess::removeTempFile(fABookFile);
 				stopTickle();
 				return false;
@@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook()
 			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
 				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
 					"the temporary local file \"%2\" manually")
-					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
+					.tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile));
 			}
 			else {
 				KIO::NetAccess::removeTempFile(fABookFile);
@@ -476,7 +476,7 @@ void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress)
 	}
 	DEBUGKPILOT << fname << "\n"
 			<< pilotAddress->getTextRepresentation(
-				fAddressAppInfo,Qt::PlainText) << endl;
+				fAddressAppInfo,TQt::PlainText) << endl;
 }
 
 
@@ -762,7 +762,7 @@ void AbbrowserConduit::slotDeletedRecord()
 	recordid_t id = backupRec->id();
 
 	TQString uid = addresseeMap[id];
-	Addressee e = aBook->tqfindByUid(uid);
+	Addressee e = aBook->findByUid(uid);
 
 		DEBUGKPILOT << fname << ": now looking at palm id: ["
 					<< id << "], kabc uid: [" << uid << "]." << endl;
@@ -779,7 +779,7 @@ void AbbrowserConduit::slotDeletedRecord()
 		DEBUGKPILOT << fname << ": no Addressee found for this id." << endl;
 		DEBUGKPILOT << fname << "\n"
 			<< backupAddr->getTextRepresentation( 
-				fAddressAppInfo,Qt::PlainText) << endl;
+				fAddressAppInfo,TQt::PlainText) << endl;
 
 		if (palmRec) {
 		DEBUGKPILOT << fname << ": deleting from database on palm." << endl;
@@ -1493,7 +1493,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString
 
 	// If this is a first sync, we don't have a backup record, so
 	if(isFirstSync() || backup.isEmpty()) {
-		if (pc.isEmpty() && palm.isEmpty() ) return TQString::null;
+		if (pc.isEmpty() && palm.isEmpty() ) return TQString();
 		if(pc.isEmpty()) return palm;
 		if(palm.isEmpty()) return pc;
 	} else {
@@ -1512,7 +1512,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString
 		case SyncAction::ePreviousSyncOverrides: return backup; break;
 		default: break;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -1535,9 +1535,9 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse
 
 #define appendGen(desc, abfield, palmfield) \
 	tab->append(new ResolutionItem(desc, tab->fExistItems, \
-		(!pcAddr.isEmpty())?(abfield):(TQString::null), \
-		(palmAddr)?(palmAddr->palmfield):(TQString::null), \
-		(backupAddr)?(backupAddr->palmfield):(TQString::null) ))
+		(!pcAddr.isEmpty())?(abfield):(TQString()), \
+		(palmAddr)?(palmAddr->palmfield):(TQString()), \
+		(backupAddr)?(backupAddr->palmfield):(TQString()) ))
 #define appendAddr(desc, abfield, palmfield) \
 	appendGen(desc, abfield, getField(palmfield))
 #define appendGenPhone(desc, abfield, palmfield) \
@@ -1588,7 +1588,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse
 		tab->fExistItems,
 		!pcAddr.isEmpty() ?
 			KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) :
-			TQString::null,
+			TQString(),
 		palmAddrCategoryLabel,
 		backupAddrCategoryLabel));
 #undef appendGen
@@ -1843,7 +1843,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const
 		DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl;
 		if(!id.isEmpty())
 		{
-			Addressee res(aBook->tqfindByUid(id));
+			Addressee res(aBook->findByUid(id));
 			if(!res.isEmpty()) return res;
 			DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl;
 		}