Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

1 files changed, 67 insertions, 67 deletions

diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 343831a90..053a850e2 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -63,7 +63,7 @@ extern "C" {
 #define GNOKII_CHECK_ERROR(error) \
 	do { \
 		if (error) \
-			kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\
+			kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\
 	} while (0)
 
 // Locale conversion routines:
@@ -126,8 +126,8 @@ static TQString businit(void)
 {
 	GNOKII_DEBUG( "Using new gnokii version." );
 
-	GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) );
-	GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) );
+	GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) );
+	GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) );
 
 	gn_error error = gn_lib_phoneprofile_load(NULL, &state);
 	if (error) 
@@ -142,7 +142,7 @@ static TQString businit(void)
 			"You might try to run \"gnokii --identify\" on the command line to "
 			"check any cable/transport issues and to verify if your gnokii "
 			"configuration is correct.</center></qt>")
-			.arg(gn_error_print(error));
+			.tqarg(gn_error_print(error));
 	}
 
 	// identify phone
@@ -152,7 +152,7 @@ static TQString businit(void)
 	imei         = gn_lib_get_phone_imei(state);
 
 	GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n")
-				.arg(manufacturer, model, revision, imei) );
+				.tqarg(manufacturer, model, revision, imei) );
 
 	return TQString();
 }
@@ -166,7 +166,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 	error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free);
 
 	GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n")
-					.arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+					.tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
 	return error;
 }
 
@@ -176,13 +176,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
 	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
-		.arg(i18n("Mobile Phone information:"))
-		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
-		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
-		.arg(format.arg(i18n("Revision")).arg(GN_FROM(revision)))
-		.arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei)))
-		.arg(format.arg(i18n("Phonebook status"))
-			   .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free)));
+		.tqarg(i18n("Mobile Phone information:"))
+		.tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
+		.tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
+		.tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision)))
+		.tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei)))
+		.tqarg(format.tqarg(i18n("Phonebook status"))
+			   .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free)));
 }
 
 // read and evaluate all phone entries
@@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 
   progress->setTotalSteps(memstat.used);
   m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>")
-		.arg(memstat.used)
-		.arg(gn_memory_type2str(memtype))
-		.arg(buildPhoneInfoString(memstat)) );
+		.tqarg(memstat.used)
+		.tqarg(gn_memory_type2str(memtype))
+		.tqarg(buildPhoneInfoString(memstat)) );
 
   int num_read = 0;
 
@@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		const char *name = gn_lib_get_pb_name(state);
 		const char *number = gn_lib_get_pb_number(state);
 
-		GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i)
-			.arg(GN_FROM(name)).arg(GN_FROM(number))
-			.arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state))
-			.arg(subentries_count));
+		GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i)
+			.tqarg(GN_FROM(name)).tqarg(GN_FROM(number))
+			.tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state))
+			.tqarg(subentries_count));
 		KABC::Addressee *a = new KABC::Addressee();
 
 		// try to split Name into FamilyName and GivenName
@@ -263,10 +263,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		}
 
 		a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state)));
-		a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state)));
+		a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state)));
 
 		// set ProductId
-		a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei));
+		a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei));
 
 		// evaluate timestamp (ignore timezone)
 		TQDateTime datetime;
@@ -276,7 +276,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		else
 			datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day),
 							  TQTime(ts.hour, ts.minute, ts.second) );
-		GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString()));
+		GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString()));
 		a->setRevision(datetime);
 
 		if (!subentries_count)
@@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 
 		  TQString s = GN_FROM(number).simplifyWhiteSpace();
 		  GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n")
-				.arg(n).arg(entry_type).arg(number_type).arg(s));
+				.tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s));
 		  if (s.isEmpty())
 			continue;
 		  switch(entry_type) {
@@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			break;
 		   default:
 			GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n")
-				.arg(entry_type).arg(s));
+				.tqarg(entry_type).tqarg(s));
 			break;
 		  } // switch()
 		} // if(subentry)
@@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 			       time.hour(), time.minute(), time.second(), 0 );
 	gn_lib_set_pb_date(state, ts);
 
-	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
-		.arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state))));
+	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location)
+		.tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state))));
 
 	const KABC::Address homeAddr = addr->address(KABC::Address::Home);
 	const KABC::Address workAddr = addr->address(KABC::Address::Work);
@@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		// only one email allowed if we have URLS, notes, addresses (to avoid phone limitations)
 		if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) {
 			GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n")
-					.arg(s));
+					.tqarg(s));
 			continue;
 		}
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
@@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		const char *number;
 		gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number);
 		GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n")
-						.arg(st).arg(entry_type)
-						.arg(number_type).arg(GN_FROM(number)));
+						.tqarg(st).tqarg(entry_type)
+						.tqarg(number_type).tqarg(GN_FROM(number)));
 	}
 
 	gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location);
@@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->setButtonText(i18n("&Stop Export"));
 	m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> "
 			"of the Mobile Phone.<br><br>%3</qt>")
-		.arg(list.count())
-		.arg(gn_memory_type2str(memtype))
-		.arg(buildPhoneInfoString(memstat)) );
+		.tqarg(list.count())
+		.tqarg(gn_memory_type2str(memtype))
+		.tqarg(buildPhoneInfoString(memstat)) );
 
 	// Now run the loop...
 	phone_entry_no = 1;
@@ -682,7 +682,7 @@ try_next_phone_entry:
 			break;
 
 		GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n")
-				.arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+				.tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count));
 
 		error = GN_ERR_NONE;
 
@@ -755,7 +755,7 @@ finish:
 	delete m_progressDlg;
 
 	if (!failedList.isEmpty()) {
-		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
+		GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
 		KMessageBox::informationList(tqparentWidget(),
                         i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:<br><ul>"
@@ -851,7 +851,7 @@ static TQString businit(void)
 			"You might try to run \"gnokii --identify\" on the command line to "
 			"check any cable/transport issues and to verify if your gnokii "
 			"configuration is correct.</center></qt>")
-			.arg(gn_error_print(error));
+			.tqarg(gn_error_print(error));
 	}
 
 	// identify phone
@@ -874,9 +874,9 @@ static TQString businit(void)
 	GNOKII_CHECK_ERROR(error);
 
 	GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n")
-				.arg(manufacturer, model, revision, imei) );
+				.tqarg(manufacturer, model, revision, imei) );
 
-	PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei);
+	PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei);
 
 	return TQString();
 }
@@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 		}
 	}
 	GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n")
-					.arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+					.tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
 	return error;
 }
 
@@ -946,13 +946,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
 	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
-		.arg(i18n("Mobile Phone information:"))
-		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
-		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
-		.arg(format.arg(i18n("Revision")).arg(GN_FROM(revision)))
-		.arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei)))
-		.arg(format.arg(i18n("Phonebook status"))
-			   .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free)));
+		.tqarg(i18n("Mobile Phone information:"))
+		.tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
+		.tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
+		.tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision)))
+		.tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei)))
+		.tqarg(format.tqarg(i18n("Phonebook status"))
+			   .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free)));
 }
 
 static TQString buildMemoryTypeString( gn_memory_type memtype )
@@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 
   progress->setTotalSteps(memstat.used);
   m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>")
-		.arg(memstat.used)
-		.arg(buildMemoryTypeString(memtype))
-		.arg(buildPhoneInfoString(memstat)) );
+		.tqarg(memstat.used)
+		.tqarg(buildMemoryTypeString(memtype))
+		.tqarg(buildPhoneInfoString(memstat)) );
 
   int num_read = 0;
 
@@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 	if (error == GN_ERR_INVALIDMEMORYTYPE)
 		break;
 	if (error == GN_ERR_NONE) {
-		GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name))
-			.arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count));
+		GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name))
+			.tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count));
 		KABC::Addressee *a = new KABC::Addressee();
 
 		// try to split Name into FamilyName and GivenName
@@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		}
 
 		a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group));
-		a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location));
+		a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location));
 
 		// set ProductId
 		a->setProductId(PhoneProductId);
@@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		else
 			datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day),
 							  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
-		GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString()));
+		GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString()));
 		a->setRevision(datetime);
 
 		if (!entry.subentries_count)
@@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		 for (int n=0; n<entry.subentries_count; n++) {
 		  TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace();
 		  GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n")
-				.arg(n).arg(entry.subentries[n].entry_type)
-				.arg(entry.subentries[n].number_type).arg(s));
+				.tqarg(n).tqarg(entry.subentries[n].entry_type)
+				.tqarg(entry.subentries[n].number_type).tqarg(s));
 		  if (s.isEmpty())
 			continue;
 		  switch(entry.subentries[n].entry_type) {
@@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 			break;
 		   default:
 			GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n")
-				.arg(entry.subentries[n].entry_type).arg(s));
+				.tqarg(entry.subentries[n].entry_type).tqarg(s));
 			break;
 		  } // switch()
 		} // if(subentry)
@@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 	entry.date.minute = time.minute();
 	entry.date.second = time.second();
 
-	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
-					.arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number)));
+	GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location)
+					.tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number)));
 
 	const KABC::Address homeAddr = addr->address(KABC::Address::Home);
 	const KABC::Address workAddr = addr->address(KABC::Address::Work);
@@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		// only one email allowed if we have URLS, notes, addresses (to avoid phone limitations)
 		if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) {
 			GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n")
-					.arg(s));
+					.tqarg(s));
 			continue;
 		}
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Email;
@@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 	for (int st=0; st<entry.subentries_count; st++) {
 		gn_phonebook_subentry *subentry = &entry.subentries[st];
 		GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n")
-						.arg(st).arg(subentry->entry_type)
-						.arg(subentry->number_type).arg(GN_FROM(subentry->data.number)));
+						.tqarg(st).tqarg(subentry->entry_type)
+						.tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number)));
 	}
 
 	data.phonebook_entry = &entry;
@@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
 	entry.memory_type = memtype;
 	entry.location = phone_location;
 	data.phonebook_entry = &entry;
-	GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location));
+	GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location));
 	gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state);
 	GNOKII_CHECK_ERROR(error);
 	return error;
@@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->setButtonText(i18n("&Stop Export"));
 	m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> "
 			"of the Mobile Phone.<br><br>%3</qt>")
-		.arg(list.count())
-		.arg(buildMemoryTypeString(memtype))
-		.arg(buildPhoneInfoString(memstat)) );
+		.tqarg(list.count())
+		.tqarg(buildMemoryTypeString(memtype))
+		.tqarg(buildPhoneInfoString(memstat)) );
 
 	// Now run the loop...
 	phone_entry_no = 1;
@@ -1473,7 +1473,7 @@ try_next_phone_entry:
 			break;
 
 		GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n")
-				.arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+				.tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count));
 
 		error = GN_ERR_NONE;
 
@@ -1546,7 +1546,7 @@ finish:
 	delete m_progressDlg;
 
 	if (!failedList.isEmpty()) {
-		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
+		GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
 		KMessageBox::informationList(tqparentWidget(),
                         i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:<br><ul>"