summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/kcal
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/kolab/kcal')
-rw-r--r--kresources/kolab/kcal/event.cpp16
-rw-r--r--kresources/kolab/kcal/incidence.cpp30
-rw-r--r--kresources/kolab/kcal/incidence.h4
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp18
-rw-r--r--kresources/kolab/kcal/task.cpp34
-rw-r--r--kresources/kolab/kcal/task.h6
6 files changed, 54 insertions, 54 deletions
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index 5f85cde2..fedeca0c 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date )
{
mEndDate = date;
mHasEndDate = true;
- if ( mFloatingStatus == AllDay )
+ if ( mFloatingtqStatus == AllDay )
kdDebug() << "ERROR: Time on end date but no time on the event\n";
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
}
void Event::setEndDate( const TQDate& date )
{
mEndDate = date;
mHasEndDate = true;
- if ( mFloatingStatus == HasTime )
+ if ( mFloatingtqStatus == HasTime )
kdDebug() << "ERROR: No time on end date but time on the event\n";
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
}
void Event::setEndDate( const TQString& endDate )
@@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const
else
writeString( element, "show-time-as", "busy" );
if ( mHasEndDate ) {
- if ( mFloatingStatus == HasTime )
+ if ( mFloatingtqStatus == HasTime )
writeString( element, "end-date", dateTimeToString( endDate() ) );
else
writeString( element, "end-date", dateToString( endDate().date() ) );
@@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event )
if ( event->hasEndDate() || event->hasDuration() ) {
if ( event->doesFloat() ) {
// This is a floating event. Don't timezone move this one
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
setEndDate( event->dtEnd().date() );
} else {
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
setEndDate( localToUTC( event->dtEnd() ) );
}
} else {
@@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event )
event->setHasEndDate( mHasEndDate );
if ( mHasEndDate ) {
- if ( mFloatingStatus == AllDay )
+ if ( mFloatingtqStatus == AllDay )
// This is a floating event. Don't timezone move this one
event->setDtEnd( endDate() );
else
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 2617da4a..60232179 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -51,7 +51,7 @@ using namespace Kolab;
Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
const TQString& tz )
- : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
+ : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ),
mResource( res ),
mSubResource( subResource ),
mSernum( sernum )
@@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const
void Incidence::setStartDate( const TQDateTime& startDate )
{
mStartDate = startDate;
- if ( mFloatingStatus == AllDay )
+ if ( mFloatingtqStatus == AllDay )
kdDebug() << "ERROR: Time on start date but no time on the event\n";
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
}
void Incidence::setStartDate( const TQDate& startDate )
{
mStartDate = startDate;
- if ( mFloatingStatus == HasTime )
+ if ( mFloatingtqStatus == HasTime )
kdDebug() << "ERROR: No time on start date but time on the event\n";
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
}
void Incidence::setStartDate( const TQString& startDate )
@@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
// Save the base class elements
KolabBase::saveAttributes( element );
- if ( mFloatingStatus == HasTime )
+ if ( mFloatingtqStatus == HasTime )
writeString( element, "start-date", dateTimeToString( startDate() ) );
else
writeString( element, "start-date", dateToString( startDate().date() ) );
@@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element )
mCustomList.append( custom );
}
-static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s )
+static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s )
{
if ( s == "none" )
return KCal::Attendee::NeedsAction;
@@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence )
if ( incidence->doesFloat() ) {
// This is a floating event. Don't timezone move this one
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
setStartDate( incidence->dtStart().date() );
} else {
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
setStartDate( localToUTC( incidence->dtStart() ) );
}
@@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
if ( incidence->pilotId() != 0 )
setPilotSyncId( incidence->pilotId() );
- setPilotSyncStatus( incidence->syncStatus() );
+ setPilotSynctqStatus( incidence->synctqStatus() );
// Unhandled tags and other custom properties (see libkcal/customproperties.h)
const TQMap<TQCString, TQString> map = incidence->customProperties();
@@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
{
KolabBase::saveTo( incidence );
- if ( mFloatingStatus == AllDay ) {
+ if ( mFloatingtqStatus == AllDay ) {
// This is a floating event. Don't timezone move this one
incidence->setDtStart( startDate() );
incidence->setFloats( true );
@@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
incidence->clearAttendees();
TQValueList<Attendee>::ConstIterator it;
for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) {
- KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status );
+ KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status );
KCal::Attendee::Role role = attendeeStringToRole( (*it).role );
KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName,
(*it).smtpAddress,
@@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence )
}
if ( hasPilotSyncId() )
incidence->setPilotId( pilotSyncId() );
- if ( hasPilotSyncStatus() )
- incidence->setSyncStatus( pilotSyncStatus() );
+ if ( hasPilotSynctqStatus() )
+ incidence->setSynctqStatus( pilotSynctqStatus() );
for( TQValueList<Custom>::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) {
incidence->setNonKDECustomProperty( (*it).key, (*it).value );
@@ -1030,7 +1030,7 @@ void Incidence::loadAttachments()
TQString Incidence::productID() const
{
- return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion );
+ return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion );
}
// Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index 926ec1e4..e5df2382 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -123,7 +123,7 @@ public:
virtual bool saveAttributes( TQDomElement& ) const;
protected:
- enum FloatingStatus { Unset, AllDay, HasTime };
+ enum FloatingtqStatus { Unset, AllDay, HasTime };
// Read all known fields from this ical incidence
void setFields( const KCal::Incidence* );
@@ -150,7 +150,7 @@ protected:
TQString mLocation;
Email mOrganizer;
TQDateTime mStartDate;
- FloatingStatus mFloatingStatus;
+ FloatingtqStatus mFloatingtqStatus;
float mAlarm;
bool mHasAlarm;
Recurrence mRecurrence;
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index edd94303..e0ea6d16 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
ResourceKolab::ResourceKolab( const KConfig *config )
: ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
- mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+ mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
"mResourceChangedTimer" ), mBatchAddingInProgress( false )
{
if ( !config ) {
@@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
}
incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
- incidencebase->setLastModified( TQDateTime::currentDateTime() );
+ incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
@@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
addedIncidence = inc;
} else if ( result == 0 ) { // take both
addedIncidence = inc;
- addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) );
+ addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) );
addedIncidence->setUid( CalFormat::createUniqueId() );
localIncidence = local;
}
@@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
}
text += "<font></b><br>";
if ( !incidence->summary().isEmpty() )
- text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>";
+ text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
if ( !incidence->location().isEmpty() )
- text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
+ text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
text += "<br>";
if ( !incidence->doesFloat() )
text += i18n( "<b>Start:</b> %1, %2" )
- .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+ .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
else
- text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
+ text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() );
text += "<br>";
if ( incidence->type() == "Event" ) {
Event* event = static_cast<Event*>( incidence );
if ( event->hasEndDate() ) {
if ( !event->doesFloat() ) {
text += i18n( "<b>End:</b> %1, %2" )
- .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
+ .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
} else {
- text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
+ text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
}
}
text += "<br>";
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 488daf4a..570bb47b 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser
const TQString& tz, KCal::Todo* task )
: Incidence( res, subResource, sernum, tz ),
mPriority( 5 ), mPercentCompleted( 0 ),
- mStatus( KCal::Incidence::StatusNone ),
+ mtqStatus( KCal::Incidence::StatusNone ),
mHasStartDate( false ), mHasDueDate( false ),
mHasCompletedDate( false )
{
@@ -126,14 +126,14 @@ int Task::percentCompleted() const
return mPercentCompleted;
}
-void Task::seStatus( KCal::Incidence::Status status )
+void Task::setqStatus( KCal::Incidence::tqStatus status )
{
- mStatus = status;
+ mtqStatus = status;
}
-KCal::Incidence::Status Task::status() const
+KCal::Incidence::tqStatus Task::status() const
{
- return mStatus;
+ return mtqStatus;
}
void Task::setParent( const TQString& parentUid )
@@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date )
{
mDueDate = date;
mHasDueDate = true;
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
}
void Task::setDueDate( const TQDate &date )
{
mDueDate = date;
mHasDueDate = true;
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
}
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
setPercentCompleted( percent );
} else if ( tagName == "status" ) {
if ( element.text() == "in-progress" )
- seStatus( KCal::Incidence::StatusInProcess );
+ setqStatus( KCal::Incidence::StatusInProcess );
else if ( element.text() == "completed" )
- seStatus( KCal::Incidence::StatusCompleted );
+ setqStatus( KCal::Incidence::StatusCompleted );
else if ( element.text() == "waiting-on-someone-else" )
- seStatus( KCal::Incidence::StatusNeedsAction );
+ setqStatus( KCal::Incidence::StatusNeedsAction );
else if ( element.text() == "deferred" )
// Guessing a status here
- seStatus( KCal::Incidence::StatusCanceled );
+ setqStatus( KCal::Incidence::StatusCanceled );
else
// Default
- seStatus( KCal::Incidence::StatusNone );
+ setqStatus( KCal::Incidence::StatusNone );
} else if ( tagName == "due-date" ) {
setDueDate( element.text() );
} else if ( tagName == "parent" ) {
@@ -300,7 +300,7 @@ bool Task::saveAttributes( TQDomElement& element ) const
}
if ( hasDueDate() ) {
- if ( mFloatingStatus == HasTime ) {
+ if ( mFloatingtqStatus == HasTime ) {
writeString( element, "due-date", dateTimeToString( dueDate() ) );
} else {
writeString( element, "due-date", dateToString( dueDate().date() ) );
@@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task )
setPriority( task->priority() );
setPercentCompleted( task->percentComplete() );
- seStatus( task->status() );
+ setqStatus( task->status() );
setHasStartDate( task->hasStartDate() );
if ( task->hasDueDate() ) {
setDueDate( localToUTC( task->dtDue() ) );
if ( task->doesFloat() ) {
// This is a floating task. Don't timezone move this one
- mFloatingStatus = AllDay;
+ mFloatingtqStatus = AllDay;
setDueDate( task->dtDue().date() );
} else {
- mFloatingStatus = HasTime;
+ mFloatingtqStatus = HasTime;
setDueDate( localToUTC( task->dtDue() ) );
}
} else {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
task->setPriority( priority() );
task->setPercentComplete( percentCompleted() );
- task->seStatus( status() );
+ task->setqStatus( status() );
task->setHasStartDate( hasStartDate() );
task->setHasDueDate( hasDueDate() );
if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 981c56ab..43780c00 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -77,8 +77,8 @@ public:
virtual void setPercentCompleted( int percent );
virtual int percentCompleted() const;
- virtual void seStatus( KCal::Incidence::Status status );
- virtual KCal::Incidence::Status status() const;
+ virtual void setqStatus( KCal::Incidence::tqStatus status );
+ virtual KCal::Incidence::tqStatus status() const;
virtual void setParent( const TQString& parentUid );
virtual TQString parent() const;
@@ -126,7 +126,7 @@ protected:
int mKCalPriorityFromDom;
int mPercentCompleted;
- KCal::Incidence::Status mStatus;
+ KCal::Incidence::tqStatus mtqStatus;
TQString mParent;
bool mHasStartDate;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 01:51:12 +0000