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

diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index cd288ba..33ae4f1 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p )
 				<< fCalendar->isLocalTime() << endl;
 
 			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).arg( tz ) :
-				i18n( "Using non-local time zone: %1" ).arg( tz ) );
+				i18n( "Using local time zone: %1" ).tqarg( tz ) :
+				i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
 
 			KURL kurl( config()->calendarFile() );
 			if( !KIO::NetAccess::download( config()->calendarFile(),
@@ -298,7 +298,7 @@ static void listResources( KCal::CalendarResources *p )
 				emit logError(i18n( "You chose to sync with the file \"%1\", which "
 					"cannot be opened. Please make sure to supply a "
 					"valid file name in the conduit's configuration dialog. "
-					"Aborting the conduit." ).arg( config()->calendarFile() ) );
+					"Aborting the conduit." ).tqarg( config()->calendarFile() ) );
 				KIO::NetAccess::removeTempFile( fCalendarFile );
 				return false;
 			}
@@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p )
 					emit logError( i18n( "You chose to sync with the file \"%1\", which "
 						"cannot be opened or created. Please make sure to supply a "
 						"valid file name in the conduit's configuration dialog. "
-						"Aborting the conduit." ).arg( config()->calendarFile() ) );
+						"Aborting the conduit." ).tqarg( config()->calendarFile() ) );
 					return false;
 				}
 				fl.close();
 				setFirstSync( true );
 			}
 			addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
-				.arg( config()->calendarFile() ) );
+				.tqarg( config()->calendarFile() ) );
 			break;
 		}
 
@@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p )
 #endif
 			addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
 			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).arg( tz ) :
-				i18n( "Using non-local time zone: %1" ).arg( tz ) );
+				i18n( "Using local time zone: %1" ).tqarg( tz ) :
+				i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
 			break;
 		default:
 			break;
@@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de )
 		return KMessageBox::No == questionYesNo(
 			query,
 			i18n( "Conflicting Entries" ),
-			TQString::null,
+			TQString(),
 			0 /* Never timeout */,
 			i18n( "Handheld" ), i18n( "PC" ));
 	}
@@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
 	if ( e && de )
 	{
 		// TODO: check for conflict, and if there is one, ask for resolution
-		if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE )
+		if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE )
 			&& r->isModified() )
 		{
 			// TODO: I have not yet found a way to complete ignore an item
@@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
 
 		// NOTE: This MUST be done last, since every other set* call
 		// calls updated(), which will trigger an
-		// setSyncStatus(SYNCMOD)!!!
-		e->setSyncStatus(KCal::Incidence::SYNCNONE);
+		// setSynctqStatus(SYNCMOD)!!!
+		e->setSynctqStatus(KCal::Incidence::SYNCNONE);
 		fLocalDatabase->writeRecord( r );
 	}
 	else
@@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
 		return;
 	}
 
-	if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
+	if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
 	{
 		DEBUGKPILOT << fname << ": don't write deleted incidence "
 			<< e->summary() << " to the palm" << endl;
@@ -573,15 +573,15 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
 
 		// NOTE: This MUST be done last, since every other set* call
 		// calls updated(), which will trigger an
-		// setSyncStatus(SYNCMOD)!!!
-		e->setSyncStatus(KCal::Incidence::SYNCNONE);
+		// setSynctqStatus(SYNCMOD)!!!
+		e->setSynctqStatus(KCal::Incidence::SYNCNONE);
 		KPILOT_DELETE( r );
 	}
 }
 
 const TQString VCalConduitBase::dbname()
 {
-    return TQString::null;
+    return TQString();
 }
 
 PilotRecord *VCalConduitBase::readRecordByIndex( int index )