summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/kcal
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/kolab/kcal')
-rw-r--r--kresources/kolab/kcal/event.cpp24
-rw-r--r--kresources/kolab/kcal/event.h8
-rw-r--r--kresources/kolab/kcal/incidence.cpp38
-rw-r--r--kresources/kolab/kcal/incidence.h10
-rw-r--r--kresources/kolab/kcal/journal.cpp6
-rw-r--r--kresources/kolab/kcal/journal.h6
-rw-r--r--kresources/kolab/kcal/kolab.desktop2
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp36
-rw-r--r--kresources/kolab/kcal/resourcekolab.h15
-rw-r--r--kresources/kolab/kcal/resourcekolab_plugin.cpp6
-rw-r--r--kresources/kolab/kcal/task.cpp60
-rw-r--r--kresources/kolab/kcal/task.h18
12 files changed, 115 insertions, 114 deletions
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index f8309053e..fedeca0c2 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -51,7 +51,7 @@ KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::R
TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz )
{
- Event event( 0, TQString::null, 0, tz, kcalEvent );
+ Event event( 0, TQString(), 0, tz, kcalEvent );
return event.saveXML();
}
@@ -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/event.h b/kresources/kolab/kcal/event.h
index d9f1069a9..57aa3358f 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -54,7 +54,7 @@ public:
/// Use this to parse an xml string to a event entry
/// The caller is responsible for deleting the returned event
static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
- const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
+ const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
/// Use this to get an xml string describing this event entry
static TQString eventToXML( KCal::Event*, const TQString& tz );
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 060b9b93f..0d99780a4 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -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 )
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
TQString tagName = e.tagName();
if ( tagName == "display-name" ) {
- // Quote the text in case it tqcontains commas or other quotable chars.
+ // Quote the text in case it contains commas or other quotable chars.
TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
TQString tname, temail;
@@ -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() ) );
}
@@ -844,7 +844,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
// Handle the scheduling ID
if ( incidence->schedulingID() == incidence->uid() ) {
// There is no scheduling ID
- setInternalUID( TQString::null );
+ setInternalUID( TQString() );
} else {
// We've internally been using a different uid, so save that as the
// temporary (internal) uid and restore the original uid, the one that
@@ -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 );
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index b3de2f914..e5df23820 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -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/journal.cpp b/kresources/kolab/kcal/journal.cpp
index 462cfe3ca..4957927a3 100644
--- a/kresources/kolab/kcal/journal.cpp
+++ b/kresources/kolab/kcal/journal.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kresources/kolab/kcal/journal.h b/kresources/kolab/kcal/journal.h
index 57d614cc1..cd583c6ca 100644
--- a/kresources/kolab/kcal/journal.h
+++ b/kresources/kolab/kcal/journal.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kresources/kolab/kcal/kolab.desktop b/kresources/kolab/kcal/kolab.desktop
index c0a7daa56..21b412ed2 100644
--- a/kresources/kolab/kcal/kolab.desktop
+++ b/kresources/kolab/kcal/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Kalendarz na serwerze IMAP za pośrednictwem KMail
Name[pt]=Calendário em Servidor IMAP via KMail
Name[pt_BR]=Calendário em Servidor IMAP via KMail
Name[ru]=Календарь на сервере IMAP через KMail
-Name[sk]=Kalendár na IMAP serveri pomocou KMail
+Name[sk]=Kalendár na IMAP serveri potqmocou KMail
Name[sl]=Koledar na strežniku IMAP preko KMaila
Name[sr]=Календар на IMAP серверу преко KMail-а
Name[sr@Latn]=Kalendar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 5bbae761b..59f6a3558 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -285,7 +285,7 @@ void ResourceKolab::removeIncidences( const TQCString& incidenceType )
// better call event(uid), todo(uid) etc. directly.
// A faster but hackish way would probably be to check the type of the resource,
- // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
+ // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
const TQString& uid = it.key();
if ( incidenceType == "Event" && mCalendar.event( uid ) )
mUidMap.remove( it );
@@ -726,7 +726,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
}
}
/* Check if there are updates for this uid pending and if so process them. */
- if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
+ if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
mSilent = false; // we do want to tell KMail
mPendingUpdates.remove( uid );
incidenceUpdated( update );
@@ -920,7 +920,7 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
while ( it != alarms.end() ) {
KCal::Alarm *a = (*it);
++it;
- const TQString &uid = a->parent()->uid();
+ const TQString &uid = a->tqparent()->uid();
if ( mUidMap.tqcontains( uid ) ) {
const TQString &sr = mUidMap[ uid ].resource();
Kolab::SubResource *subResource = 0;
@@ -1009,15 +1009,15 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
if ( !subresourceActive( subResource ) ) return;
// Can't be in both, by contract
- if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
- mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
+ if ( mUidsPendingDeletion.tqfind( uid ) != mUidsPendingDeletion.end() ) {
+ mUidsPendingDeletion.remove( mUidsPendingDeletion.tqfind( uid ) );
} else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
// It's good to know if was deleted, but we are waiting on a new one to
- // tqreplace it, so let's just sit tight.
+ // replace it, so let's just sit tight.
} else {
TQString uidToUse;
- QPair<TQString, TQString> p( uid, subResource );
+ TQPair<TQString, TQString> p( uid, subResource );
if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
// Incidence with the same uid in a different folder...
// use the UID that addIncidence(...) generated
@@ -1119,7 +1119,7 @@ TQStringList ResourceKolab::subresources() const
+ mJournalSubResources.keys() );
}
-const QString
+const TQString
ResourceKolab::labelForSubresource( const TQString& subresource ) const
{
if ( mEventSubResources.tqcontains( subresource ) )
@@ -1231,22 +1231,22 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType
/*virtual*/
-bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tqparent )
{
kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
TQString contentsType = kmailCalendarContentsType;
- if ( !parent.isEmpty() ) {
- if ( mEventSubResources.tqcontains( parent ) )
+ if ( !tqparent.isEmpty() ) {
+ if ( mEventSubResources.tqcontains( tqparent ) )
contentsType = kmailCalendarContentsType;
- else if ( mTodoSubResources.tqcontains( parent ) )
+ else if ( mTodoSubResources.tqcontains( tqparent ) )
contentsType = kmailTodoContentsType;
- else if ( mJournalSubResources.tqcontains( parent ) )
+ else if ( mJournalSubResources.tqcontains( tqparent ) )
contentsType = kmailJournalContentsType;
} else {
TQStringList contentTypeChoices;
contentTypeChoices << i18n("Calendar") << i18n("Tasks") << i18n("Journals");
const TQString caption = i18n("Which kind of subresource should this be?");
- const TQString choice = KInputDialog::getItem( caption, TQString::null, contentTypeChoices );
+ const TQString choice = KInputDialog::getItem( caption, TQString(), contentTypeChoices );
if ( choice == contentTypeChoices[0] )
contentsType = kmailCalendarContentsType;
else if ( choice == contentTypeChoices[1] )
@@ -1255,7 +1255,7 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
contentsType = kmailJournalContentsType;
}
- return kmailAddSubresource( resource, parent, contentsType );
+ return kmailAddSubresource( resource, tqparent, contentsType );
}
/*virtual*/
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index fd4c3b57e..1535403a6 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -52,6 +52,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
public Kolab::ResourceKolabBase
{
Q_OBJECT
+ TQ_OBJECT
friend struct TemporarySilencer;
public:
@@ -139,7 +140,7 @@ public:
virtual TQString subresourceIdentifier( Incidence *incidence );
- virtual bool addSubresource( const TQString& resource, const TQString& parent );
+ virtual bool addSubresource( const TQString& resource, const TQString& tqparent );
virtual bool removeSubresource( const TQString& resource );
virtual TQString subresourceType( const TQString &resource );
@@ -223,11 +224,11 @@ private:
ICalFormat mFormat;
/**
- This map tqcontains the association between a new added incidence
+ This map contains the association between a new added incidence
and the subresource it belongs to.
That's needed to return the correct mapping in subresourceIdentifier().
- We can't trust on mUidMap here, because it tqcontains only non-pending uids.
+ We can't trust on mUidMap here, because it contains only non-pending uids.
*/
TQMap<TQString, TQString> mNewIncidencesMap;
int mProgressDialogIncidenceLimit;
@@ -245,7 +246,7 @@ private:
*
* The key is originalUID,subResource and the value is the fake UID.
*/
- TQMap< QPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
+ TQMap< TQPair<TQString, TQString>, TQString > mOriginalUID2fakeUID;
bool mBatchAddingInProgress;
TQMap<Kolab::ResourceType,TQString> mLastUsedResources;
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index 14d09465a..151fa9f3d 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 33cc50eef..872e9b4a4 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -86,7 +86,7 @@ KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::Reso
TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
{
- Task task( 0, TQString::null, 0, tz, todo );
+ Task task( 0, TQString(), 0, tz, todo );
return task.saveXML();
}
@@ -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,22 +126,22 @@ 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 )
+void Task::setParent( const TQString& tqparentUid )
{
- mParent = parentUid;
+ mParent = tqparentUid;
}
-TQString Task::parent() const
+TQString Task::tqparent() const
{
return mParent;
}
@@ -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,20 +234,20 @@ 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" ) {
+ } else if ( tagName == "tqparent" ) {
setParent( element.text() );
} else if ( tagName == "x-completed-date" ) {
setCompletedDate( stringToDateTime( element.text() ) );
@@ -300,15 +300,15 @@ 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() ) );
}
}
- if ( !parent().isNull() ) {
- writeString( element, "parent", parent() );
+ if ( !tqparent().isNull() ) {
+ writeString( element, "tqparent", tqparent() );
}
if ( hasCompletedDate() && percentCompleted() == 100 ) {
@@ -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 {
@@ -396,7 +396,7 @@ void Task::setFields( const KCal::Todo* task )
} else if ( !task->relatedToUid().isEmpty() ) {
setParent( task->relatedToUid( ) );
} else {
- setParent( TQString::null );
+ setParent( TQString() );
}
if ( task->hasCompletedDate() && task->percentComplete() == 100 ) {
@@ -447,14 +447,14 @@ 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() )
task->setDtDue( utcToLocal( dueDate() ) );
- if ( !parent().isNull() )
- task->setRelatedToUid( parent() );
+ if ( !tqparent().isNull() )
+ task->setRelatedToUid( tqparent() );
if ( hasCompletedDate() && task->percentComplete() == 100 )
task->setCompleted( utcToLocal( mCompletedDate ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 6fe318e2c..624605a29 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -58,7 +58,7 @@ public:
/// Use this to parse an xml string to a task entry
/// The caller is responsible for deleting the returned task
static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
- const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
+ const TQString& subResource = TQString(), TQ_UINT32 sernum = 0 );
/// Use this to get an xml string describing this task entry
static TQString taskToXML( KCal::Todo*, const TQString& tz );
@@ -77,11 +77,11 @@ 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;
+ virtual void setParent( const TQString& tqparentUid );
+ virtual TQString tqparent() const;
virtual void setHasStartDate( bool );
virtual bool hasStartDate() 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.1 (git 2.18.0) at 2024-12-29 17:07:53 +0000