summaryrefslogtreecommitdiffstats
path: root/conduits/vcalconduit
diff options
context:
space:
mode:
Diffstat (limited to 'conduits/vcalconduit')
-rw-r--r--conduits/vcalconduit/cleanupstate.cc2
-rw-r--r--conduits/vcalconduit/hhtopcstate.cc4
-rw-r--r--conduits/vcalconduit/korganizerConduit.ui4
-rw-r--r--conduits/vcalconduit/pctohhstate.cc2
-rw-r--r--conduits/vcalconduit/todo-conduit.cc6
-rw-r--r--conduits/vcalconduit/todoRecord.cc6
-rw-r--r--conduits/vcalconduit/vcal-conduit.cc4
-rw-r--r--conduits/vcalconduit/vcal-conduitbase.cc26
-rw-r--r--conduits/vcalconduit/vcalRecord.cc4
9 files changed, 29 insertions, 29 deletions
diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc
index 76d756d..209a0e9 100644
--- a/conduits/vcalconduit/cleanupstate.cc
+++ b/conduits/vcalconduit/cleanupstate.cc
@@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca )
vccb->addLogError( i18n( "An error occurred while uploading"
" \"%1\". You can try to upload "
"the temporary local file \"%2\" manually.")
- .tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile));
+ .arg(vccb->config()->calendarFile()).arg(fCalendarFile));
}
else {
KIO::NetAccess::removeTempFile( fCalendarFile );
diff --git a/conduits/vcalconduit/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc
index 4fa12af..82024f1 100644
--- a/conduits/vcalconduit/hhtopcstate.cc
+++ b/conduits/vcalconduit/hhtopcstate.cc
@@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca )
{
KCal::Incidence *e = vccb->addRecord( r );
if ( vccb->config()->syncArchived() && archiveRecord ) {
- e->setSynctqStatus( KCal::Incidence::SYNCDEL );
+ e->setSyncStatus( KCal::Incidence::SYNCDEL );
}
}
}
@@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC()
{
KCal::Incidence*e=addRecord(r);
if (config()->syncArchived() && archiveRecord) {
- e->setSynctqStatus(KCal::Incidence::SYNCDEL);
+ e->setSyncStatus(KCal::Incidence::SYNCDEL);
}
}
}
diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui
index 52904b4..7fa4491 100644
--- a/conduits/vcalconduit/korganizerConduit.ui
+++ b/conduits/vcalconduit/korganizerConduit.ui
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -243,7 +243,7 @@ be saved in the calendar on the PC.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc
index 84d50ed..d2866fd 100644
--- a/conduits/vcalconduit/pctohhstate.cc
+++ b/conduits/vcalconduit/pctohhstate.cc
@@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca )
if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
{
- if( e->synctqStatus() == KCal::Incidence::SYNCDEL )
+ if( e->syncStatus() == KCal::Incidence::SYNCDEL )
{
vccb->deletePalmRecord( e, s );
}
diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc
index 8a04f15..4eee4b4 100644
--- a/conduits/vcalconduit/todo-conduit.cc
+++ b/conduits/vcalconduit/todo-conduit.cc
@@ -35,7 +35,7 @@
#include "options.h"
#include <tqdatetime.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <libkcal/calendar.h>
#include <libkcal/todo.h>
@@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
}
if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
while (fAllTodosIterator != fAllTodos.end() &&
- e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
+ e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
{
e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
#ifdef DEBUG
if(e)
- DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->synctqStatus()<<endl;
+ DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl;
#endif
}
diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc
index f3baaeb..7618df3 100644
--- a/conduits/vcalconduit/todoRecord.cc
+++ b/conduits/vcalconduit/todoRecord.cc
@@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e,
// COMPLETED? //
e->setCompleted(de->getComplete());
if ( de->getComplete() && !e->hasCompletedDate() ) {
- e->setCompleted( TQDateTime::tqcurrentDateTime() );
+ e->setCompleted( TQDateTime::currentDateTime() );
}
e->setSummary(de->getDescription());
@@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSynctqStatus(SYNCMOD)!!!
- e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+ // setSyncStatus(SYNCMOD)!!!
+ e->setSyncStatus(KCal::Incidence::SYNCNONE);
return true;
}
diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index 52bd759..2cdc5d3 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->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
+ e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
{
e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
}
@@ -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.").tqarg(e->summary()));
+ 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()));
}
PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index 33ae4f1..19b6790 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" ).tqarg( tz ) :
- i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
+ i18n( "Using local time zone: %1" ).arg( tz ) :
+ i18n( "Using non-local time zone: %1" ).arg( 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." ).tqarg( config()->calendarFile() ) );
+ "Aborting the conduit." ).arg( 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." ).tqarg( config()->calendarFile() ) );
+ "Aborting the conduit." ).arg( config()->calendarFile() ) );
return false;
}
fl.close();
setFirstSync( true );
}
addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
- .tqarg( config()->calendarFile() ) );
+ .arg( 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" ).tqarg( tz ) :
- i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
+ i18n( "Using local time zone: %1" ).arg( tz ) :
+ i18n( "Using non-local time zone: %1" ).arg( tz ) );
break;
default:
break;
@@ -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->synctqStatus() != KCal::Incidence::SYNCNONE )
+ if ( ( e->syncStatus() != 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
- // setSynctqStatus(SYNCMOD)!!!
- e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+ // setSyncStatus(SYNCMOD)!!!
+ e->setSyncStatus(KCal::Incidence::SYNCNONE);
fLocalDatabase->writeRecord( r );
}
else
@@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
return;
}
- if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
+ if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
{
DEBUGKPILOT << fname << ": don't write deleted incidence "
<< e->summary() << " to the palm" << endl;
@@ -573,8 +573,8 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSynctqStatus(SYNCMOD)!!!
- e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+ // setSyncStatus(SYNCMOD)!!!
+ e->setSyncStatus(KCal::Incidence::SYNCNONE);
KPILOT_DELETE( r );
}
}
diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc
index fc274b1..898bc79 100644
--- a/conduits/vcalconduit/vcalRecord.cc
+++ b/conduits/vcalconduit/vcalRecord.cc
@@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSynctqStatus(SYNCMOD)!!!
- e->setSynctqStatus(KCal::Incidence::SYNCNONE);
+ // setSyncStatus(SYNCMOD)!!!
+ e->setSyncStatus(KCal::Incidence::SYNCNONE);
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 20:10:22 +0000