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

diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index d882cf8..52bd759 100644
--- a/conduits/vcalconduit/vcal-conduit.cc
+++ b/conduits/vcalconduit/vcal-conduit.cc
@@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
 	if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator;
 	// Then walk the list until we find an unsynced entry
 	while ( fAllEventsIterator != fAllEvents.end() &&
-		e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
+		e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
 	{
 		e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
 	}
@@ -200,7 +200,7 @@ const TQString VCalConduit::getTitle(PilotRecordBase *de)
 {
 	PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de);
 	if (d) return TQString(d->getDescription());
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -219,7 +219,7 @@ PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::I
 		(e->recurrenceType() ==  KCal::Recurrence::rYearlyPos) )
 	{
 		// Warn ahead of time
-		emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").arg(e->summary()));
+		emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").tqarg(e->summary()));
 	}
 
 	PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);