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

2 files changed, 24 insertions, 24 deletions

diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index dabccb89b..7ceb5ea7c 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -48,7 +48,7 @@
 #define GNOKII_CHECK_ERROR(error) \
 	do { \
 		if (error) \
-			PRINT_DEBUG << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\
+			PRINT_DEBUG << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\
 	} while (0)
 
 
@@ -103,8 +103,8 @@ KMobileGnokii::KMobileGnokii(TQObject *obj, const char *name, const TQStringList
 	m_baud = "9600";
   }
 
-  PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").arg(m_modelnr)
-		.arg(m_connection).arg(m_port).arg(m_baud);
+  PRINT_DEBUG << TQString("Using GNOKII configuration: %1 %2 %3 %4\n").tqarg(m_modelnr)
+		.tqarg(m_connection).tqarg(m_port).tqarg(m_baud);
 
   saveDeviceConfiguration();
   saveGnokiiConfiguration();
@@ -237,7 +237,7 @@ static TQString businit(void)
 	state.config.require_dcd = old_dcd;
 	if (error != GN_ERR_NONE) {
 		busterminate();
-		return i18n("Mobile phone interface initialization failed:\n%1").arg(gn_error_print(error));
+		return i18n("Mobile phone interface initialization failed:\n%1").tqarg(gn_error_print(error));
 	}
 
 	// model
@@ -265,9 +265,9 @@ static TQString businit(void)
 	data.imei = NULL;
 
 	GNOKII_DEBUG( TQString("Found mobile phone: Model: %1, Revision: %2, IMEI: %3\n")
-				.arg(model).arg(revision).arg(imei) ); 
+				.tqarg(model).tqarg(revision).tqarg(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();
 }
@@ -299,7 +299,7 @@ static gn_error read_phone_memstat( gn_memory_type memtype, gn_memory_status *me
 		}
 	}
 	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;
 }
 
@@ -372,8 +372,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   if (error != GN_ERR_NONE)
       return error;
 
-  GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(index).arg(entry.name)
-	.arg(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(index).tqarg(entry.name)
+	.tqarg(entry.number).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count));
 
   // try to split Name into FamilyName and GivenName
   s = TQString(entry.name).simplifyWhiteSpace();
@@ -395,7 +395,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   }
 
   a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group));
-  a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").arg(GN_MT_ME).arg(entry.location));
+  a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1_%2").tqarg(GN_MT_ME).tqarg(entry.location));
 
   // set ProductId
   a->setProductId(PhoneProductId);
@@ -407,7 +407,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   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)
@@ -418,8 +418,8 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 	 for (int n=0; n<entry.subentries_count; n++) {
 		TQString s = TQString(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) {
@@ -478,7 +478,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 				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()
 	} // for(subentry)
@@ -501,7 +501,7 @@ bool KMobileGnokii::connectDevice(TQWidget * /*tqparent*/)
 
   TQString err = businit();
   m_connected = err.isEmpty();
-  PRINT_DEBUG << TQString("connectDevice() : %1\n").arg(m_connected ? "Ok" : err);
+  PRINT_DEBUG << TQString("connectDevice() : %1\n").tqarg(m_connected ? "Ok" : err);
   return m_connected;
 }
 
@@ -512,7 +512,7 @@ bool KMobileGnokii::disconnectDevice(TQWidget * /*tqparent*/)
 	return true;
   busterminate();
   m_connected = false;
-  PRINT_DEBUG << TQString("disconnectDevice() : %1\n").arg("done");
+  PRINT_DEBUG << TQString("disconnectDevice() : %1\n").tqarg("done");
   return true;
 }
 
@@ -547,7 +547,7 @@ TQString KMobileGnokii::iconFileName() const
 // this String is used to have a unique identification for syncronisation.
 TQString KMobileGnokii::tqdeviceUniqueID()
 { 
-  return TQString("GNOKII-IMEI-%1").arg(TQString::fromLocal8Bit(imei));
+  return TQString("GNOKII-IMEI-%1").tqarg(TQString::fromLocal8Bit(imei));
 }
 
 
@@ -587,7 +587,7 @@ int KMobileGnokii::numAddresses()
 
 int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
 {
-  PRINT_DEBUG << TQString("############   GET ADDRESS #%1\n").arg(index);
+  PRINT_DEBUG << TQString("############   GET ADDRESS #%1\n").tqarg(index);
   // index is zero-based, but in gnokii the first address starts at 1
   if (index<0 || index>=numAddresses())
     return KIO::ERR_DOES_NOT_EXIST;
@@ -870,8 +870,8 @@ int KMobileGnokii::readNote( int index, TQString &note )
 	"DeviceClassName: %3\n"
 	"Device Driver  : %4\n"
 	"Device Revision: %5\n")
-	.arg(index).arg(index)
-	.arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); 
+	.tqarg(index).tqarg(index)
+	.tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); 
   return 0;
 }
 
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index c027baaeb..c1bcd4929 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -64,7 +64,7 @@ KMobileSkeleton::~KMobileSkeleton()
 bool KMobileSkeleton::connectDevice(TQWidget *tqparent)
 {
   if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparent,
-	i18n("Please turn on your %1 on now and press continue to proceed.").arg(m_tqdeviceName),
+	i18n("Please turn on your %1 on now and press continue to proceed.").tqarg(m_tqdeviceName),
 	m_tqdeviceClassName ) )
 	return false;
   // connect it now...
@@ -112,7 +112,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
     return KIO::ERR_DOES_NOT_EXIST;
 
   // now build our own sample name
-  addr.setFamilyName(TQString("Meyer_%1").arg(index+1));  
+  addr.setFamilyName(TQString("Meyer_%1").tqarg(index+1));  
   addr.setGivenName("Peter");
   addr.setFormattedName("Peter "+addr.familyName());
   addr.setNickName("PeterM");
@@ -156,8 +156,8 @@ int KMobileSkeleton::readNote( int index, TQString &note )
 	"DeviceClassName: %3\n"
 	"Device Driver  : %4\n"
 	"Device Revision: %5\n")
-	.arg(index).arg(index)
-	.arg(tqdeviceClassName()).arg(tqdeviceName()).arg(revision()); 
+	.tqarg(index).tqarg(index)
+	.tqarg(tqdeviceClassName()).tqarg(tqdeviceName()).tqarg(revision()); 
   return 0;
 }