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/syncAction.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/syncAction.cc')

diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 3e29ad3..d0227f4 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -65,11 +65,11 @@ SyncAction::SyncAction(KPilotLink  *p,
 }
 
 SyncAction::SyncAction(KPilotLink *p,
-	TQWidget * visibleparent,
+	TQWidget * visibletqparent,
 	const char *name) :
 	TQObject(p, name),
 	fHandle(p),
-	fParent(visibleparent)
+	fParent(visibletqparent)
 {
 	FUNCTIONSETUP;
 }
@@ -101,7 +101,7 @@ SyncAction::~SyncAction()
 	if (!r)
 	{
 		emit logError(i18n("The conduit %1 could not be executed.")
-			.arg(TQString::tqfromLatin1(name())));
+			.tqarg(TQString::tqfromLatin1(name())));
 		delayDone();
 	}
 }
@@ -217,11 +217,11 @@ TQString SyncAction::SyncMode::name() const
 	if (isTest())
 	{
 
-		s.append(CSL1(" [%1]").arg(i18n("Test Sync")));
+		s.append(CSL1(" [%1]").tqarg(i18n("Test Sync")));
 	}
 	if (isLocal())
 	{
-		s.append(CSL1(" [%1]").arg(i18n("Local Sync")));
+		s.append(CSL1(" [%1]").tqarg(i18n("Local Sync")));
 	}
 	return s;
 }
@@ -332,7 +332,7 @@ int SyncAction::questionYesNo(const TQString & text,
 		TQMessageBox::Question,
 		text,
 		TQStringList(),
-		(key.isEmpty() ? TQString::null : i18n("&Do not ask again")),
+		(key.isEmpty() ? TQString() : i18n("&Do not ask again")),
 		&checkboxReturn,
 		0);
 
@@ -445,7 +445,7 @@ int SyncAction::questionYesNoCancel(const TQString & text,
 		TQMessageBox::Question,
 		text,
 		TQStringList(),
-		(key.isEmpty() ? TQString::null : i18n("&Do not ask again")),
+		(key.isEmpty() ? TQString() : i18n("&Do not ask again")),
 		&checkboxReturn,
 		0);
 #else
-- 
cgit v1.2.3