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, 28 insertions, 28 deletions

diff --git a/kpilot/internalEditorAction.cc b/kpilot/internalEditorAction.cc
index 2c803f5..23e2c32 100644
--- a/kpilot/internalEditorAction.cc
+++ b/kpilot/internalEditorAction.cc
@@ -60,7 +60,7 @@ bool InternalEditorAction::exec()
 {
 	FUNCTIONSETUP;
 	emit logMessage(i18n("[Internal Editors]"));
-	fInternalEditorSyncStatus=eSyncStarted;
+	fInternalEditorSynctqStatus=eSyncStarted;
 	TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
 	return true;
 }
@@ -69,11 +69,11 @@ void InternalEditorAction::syncDirtyDB()
 {
 	FUNCTIONSETUP;
 
-	if (fInternalEditorSyncStatus!=eSyncDirtyDB)
+	if (fInternalEditorSynctqStatus!=eSyncDirtyDB)
 	{
-		fInternalEditorSyncStatus=eSyncDirtyDB;
+		fInternalEditorSynctqStatus=eSyncDirtyDB;
 		dirtyDBs=KPilotSettings::dirtyDatabases();
-		emit logMessage(i18n("Databases with changed records: %1").arg(dirtyDBs.join(CSL1(", "))));
+		emit logMessage(i18n("Databases with changed records: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
 	}
 	else
@@ -99,7 +99,7 @@ void InternalEditorAction::syncDirtyDB()
 	if (!localDB->isOpen() || !serialDB->isOpen())
 	{
 		emit logError(i18n("Unable to open the serial or local database for %1. "
-			"Skipping it.").arg(*dbIter));
+			"Skipping it.").tqarg(*dbIter));
 		goto nextDB;
 	}
 	while ( (rec=localDB->readNextModifiedRec()) )
@@ -161,8 +161,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 
 		PilotAddress localAddr(localrec);
 		PilotAddress serialAddr(serialrec);
-		localEntry=localAddr.getTextRepresentation(&info,Qt::RichText);
-		serialEntry=serialAddr.getTextRepresentation(&info,Qt::RichText);
+		localEntry=localAddr.getTextRepresentation(&info,TQt::RichText);
+		serialEntry=serialAddr.getTextRepresentation(&info,TQt::RichText);
 		recType=i18n("address");
 	}
 	else
@@ -172,8 +172,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 
 		PilotTodoEntry localTodo(localrec);
 		PilotTodoEntry serialTodo(serialrec);
-		localEntry=localTodo.getTextRepresentation(Qt::RichText);
-		serialEntry=serialTodo.getTextRepresentation(Qt::RichText);
+		localEntry=localTodo.getTextRepresentation(TQt::RichText);
+		serialEntry=serialTodo.getTextRepresentation(TQt::RichText);
 		recType=i18n("to-do entry");
 	}
 	else
@@ -181,8 +181,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 	{
 		PilotMemo localMemo(localrec);
 		PilotMemo serialMemo(serialrec);
-		localEntry=localMemo.getTextRepresentation(Qt::RichText);
-		serialEntry=serialMemo.getTextRepresentation(Qt::RichText);
+		localEntry=localMemo.getTextRepresentation(TQt::RichText);
+		serialEntry=serialMemo.getTextRepresentation(TQt::RichText);
 		recType=i18n("memo");
 	}
 	else
@@ -192,8 +192,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 
 		PilotDateEntry localEvent(localrec);
 		PilotDateEntry serialEvent(serialrec);
-		localEntry=localEvent.getTextRepresentation(Qt::RichText);
-		serialEntry=serialEvent.getTextRepresentation(Qt::RichText);
+		localEntry=localEvent.getTextRepresentation(TQt::RichText);
+		serialEntry=serialEvent.getTextRepresentation(TQt::RichText);
 		recType=i18n("calendar entry");
 	}
 	else
@@ -203,10 +203,10 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 
 	TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed "
 		"on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?").
-		arg(recType).arg(id).arg(dbName));
+		tqarg(recType).tqarg(id).tqarg(dbName));
 
 	KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true,
-		i18n("Conflict in database  %1").arg(*dbIter),
+		i18n("Conflict in database  %1").tqarg(*dbIter),
 		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true,
 		i18n("Use KPilot"), i18n("Use Handheld") );
 	resdlg->setButtonText(KDialogBase::Ok,  i18n("Use &KPilot"));
@@ -228,14 +228,14 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 		label=new TQLabel(i18n("Entry in KPilot"), page);
 		tqlayout->addWidget( label, 2,0);
 
-		KTextEdit*textBrowser = new KTextEdit(CSL1("<qt>")+localEntry+CSL1("</qt>"), TQString::null, page);
+		KTextEdit*textBrowser = new KTextEdit(CSL1("<qt>")+localEntry+CSL1("</qt>"), TQString(), page);
 		textBrowser->setReadOnly(true);
 		tqlayout->addWidget( textBrowser, 3,0);
 
 		label=new TQLabel(i18n("Entry on Handheld"), page);
 		tqlayout->addWidget( label, 2,1);
 
-		textBrowser = new KTextEdit(CSL1("<qt>")+serialEntry+CSL1("</qt>"), TQString::null, page);
+		textBrowser = new KTextEdit(CSL1("<qt>")+serialEntry+CSL1("</qt>"), TQString(), page);
 		textBrowser->setReadOnly(true);
 		tqlayout->addWidget( textBrowser, 3,1);
 	}
@@ -261,8 +261,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 		else
 		{
 			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
-			tmpW->setBackgroundMode( Qt::PaletteMid );
-			tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
+			tmpW->setBackgroundMode( TQt::PaletteMid );
+			tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 			tmpW->setFrameShape( TQFrame::Panel );
 			tmpW->setFrameShadow( TQFrame::Sunken );
 			hexEdit = tmpW;
@@ -289,8 +289,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 		else
 		{
 			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
-			tmpW->setBackgroundMode( Qt::PaletteMid );
-			tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
+			tmpW->setBackgroundMode( TQt::PaletteMid );
+			tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
 			tmpW->setFrameShape( TQFrame::Panel );
 			tmpW->setFrameShadow( TQFrame::Sunken );
 			hexEdit = tmpW;
@@ -308,11 +308,11 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
 void InternalEditorAction::syncFlagsChangedDB()
 {
 	FUNCTIONSETUP;
-	if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB)
+	if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB)
 	{
-		fInternalEditorSyncStatus=eSyncFlagsChangedDB;
+		fInternalEditorSynctqStatus=eSyncFlagsChangedDB;
 		dirtyDBs=KPilotSettings::flagsChangedDatabases();
-		emit logMessage(i18n("Databases with changed flags: %1").arg(dirtyDBs.join(CSL1(", "))));
+		emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
 	}
 	else
@@ -349,11 +349,11 @@ return;
 void InternalEditorAction::syncAppBlockChangedDB()
 {
 	FUNCTIONSETUP;
-	if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB)
+	if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB)
 	{
-		fInternalEditorSyncStatus=eSyncAppBlockChangedDB;
+		fInternalEditorSynctqStatus=eSyncAppBlockChangedDB;
 		dirtyDBs=KPilotSettings::appBlockChangedDatabases();
-		emit logMessage(i18n("Databases with changed AppBlock: %1").arg(dirtyDBs.join(CSL1(", "))));
+		emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", "))));
 		dbIter=dirtyDBs.begin();
 	}
 	else
@@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
 void InternalEditorAction::cleanup()
 {
 	FUNCTIONSETUP;
-	fInternalEditorSyncStatus=eSyncFinished;
+	fInternalEditorSynctqStatus=eSyncFinished;
 	emit syncDone(this);
 }