From f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 1 Jul 2011 00:37:32 +0000
Subject: 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
---
 lib/pilotAddress.cc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/pilotAddress.cc')

diff --git a/lib/pilotAddress.cc b/lib/pilotAddress.cc
index 4589688..11fdd12 100644
--- a/lib/pilotAddress.cc
+++ b/lib/pilotAddress.cc
@@ -171,7 +171,7 @@ unsigned int PhoneSlot::toField() const
 
 PhoneSlot::operator TQString() const
 {
-	return TQString("%1,%2").arg(toOffset()).arg(toField());
+	return TQString("%1,%2").tqarg(toOffset()).tqarg(toField());
 }
 
 #define MAXFIELDS 19
@@ -273,13 +273,13 @@ PilotAddress::~PilotAddress()
 	free_Address(&fAddressInfo);
 }
 
-TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const
+TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt::TextFormat richText) const
 {
 	TQString text, tmp;
 
-	TQString par = (richText==Qt::RichText) ?CSL1("<p>"): TQString();
-	TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n");
-	TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n");
+	TQString par = (richText==TQt::RichText) ?CSL1("<p>"): TQString();
+	TQString ps = (richText==TQt::RichText) ?CSL1("</p>"):CSL1("\n");
+	TQString br = (richText==TQt::RichText) ?CSL1("<br/>"):CSL1("\n");
 
 	// title + name
 	text += par;
@@ -293,14 +293,14 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T
 	TQString firstName = getField(entryFirstname);
 	if (firstName.isEmpty())
 	{
-		// So tqreplace placeholder for first name (%1) with empty
-		tmp = tmp.arg(TQString());
+		// So replace placeholder for first name (%1) with empty
+		tmp = tmp.tqarg(TQString());
 	}
 	else
 	{
-		tmp = tmp.arg(rtExpand(firstName,richText));
+		tmp = tmp.tqarg(rtExpand(firstName,richText));
 	}
-	tmp=tmp.arg(rtExpand(getField(entryLastname), richText));
+	tmp=tmp.tqarg(rtExpand(getField(entryLastname), richText));
 	text += tmp;
 	text += ps;
 
@@ -335,13 +335,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T
 			}
 			if (info)
 			{
-				tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) ));
+				tmp=tmp.tqarg(info->phoneLabel( getPhoneType( i ) ));
 			}
 			else
 			{
-				tmp=tmp.arg(CSL1("Contact: "));
+				tmp=tmp.tqarg(CSL1("Contact: "));
 			}
-			tmp=tmp.arg(rtExpand(getField(i.toField()), richText));
+			tmp=tmp.tqarg(rtExpand(getField(i.toField()), richText));
 			text += tmp;
 			text += br;
 		}
-- 
cgit v1.2.1