summaryrefslogtreecommitdiffstats
path: root/libkcal
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal')
-rw-r--r--libkcal/assignmentvisitor.cpp2
-rw-r--r--libkcal/assignmentvisitor.h2
-rw-r--r--libkcal/attendee.cpp2
-rw-r--r--libkcal/attendee.h2
-rw-r--r--libkcal/calendar.cpp4
-rw-r--r--libkcal/calendarlocal.cpp2
-rw-r--r--libkcal/calendarnull.cpp2
-rw-r--r--libkcal/calendarresources.cpp6
-rw-r--r--libkcal/calendarresources.h2
-rw-r--r--libkcal/calfilter.cpp4
-rw-r--r--libkcal/calformat.cpp4
-rw-r--r--libkcal/calhelper.cpp4
-rw-r--r--libkcal/calselectdialog.cpp8
-rw-r--r--libkcal/compat.cpp2
-rw-r--r--libkcal/customproperties.cpp2
-rw-r--r--libkcal/dndfactory.cpp2
-rw-r--r--libkcal/htmlexport.cpp56
-rw-r--r--libkcal/icaldrag.cpp2
-rw-r--r--libkcal/icalformat.cpp8
-rw-r--r--libkcal/icalformatimpl.cpp12
-rw-r--r--libkcal/incidence.cpp6
-rw-r--r--libkcal/incidence.h2
-rw-r--r--libkcal/incidencebase.cpp2
-rw-r--r--libkcal/incidenceformatter.cpp90
-rw-r--r--libkcal/recurrence.cpp34
-rw-r--r--libkcal/recurrence.h10
-rw-r--r--libkcal/recurrencerule.cpp6
-rw-r--r--libkcal/recurrencerule.h2
-rw-r--r--libkcal/resourcecached.cpp10
-rw-r--r--libkcal/resourcelocaldir.cpp2
-rw-r--r--libkcal/scheduler.cpp20
-rw-r--r--libkcal/tests/fbrecurring.cpp2
-rw-r--r--libkcal/tests/readandwrite.cpp2
-rw-r--r--libkcal/tests/testcalendar.cpp2
-rw-r--r--libkcal/tests/testfields.cpp12
-rw-r--r--libkcal/tests/testrecurprevious.cpp2
-rw-r--r--libkcal/tests/testrecurrence.cpp2
-rw-r--r--libkcal/tests/testrecurrencetype.cpp2
-rw-r--r--libkcal/tests/testrecurson.cpp2
-rw-r--r--libkcal/tests/testvcalexport.cpp2
-rw-r--r--libkcal/todo.cpp8
-rw-r--r--libkcal/vcaldrag.cpp2
-rw-r--r--libkcal/vcalformat.cpp26
-rw-r--r--libkcal/versit/vobject.h4
44 files changed, 190 insertions, 190 deletions
diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp
index 023df8572..4cc52b7c6 100644
--- a/libkcal/assignmentvisitor.cpp
+++ b/libkcal/assignmentvisitor.cpp
@@ -120,4 +120,4 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy )
return true;
}
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/libkcal/assignmentvisitor.h b/libkcal/assignmentvisitor.h
index 2be0215cc..046de61cb 100644
--- a/libkcal/assignmentvisitor.h
+++ b/libkcal/assignmentvisitor.h
@@ -119,4 +119,4 @@ class AssignmentVisitor : public IncidenceBase::Visitor
}
#endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp
index 9aa3d46f7..d129bc36b 100644
--- a/libkcal/attendee.cpp
+++ b/libkcal/attendee.cpp
@@ -53,7 +53,7 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 )
a1.delegator() == a2.delegator() );
}
-void Attendee::setStatus( Attendee::PartStat s )
+void Attendee::seStatus( Attendee::PartStat s )
{
mStatus = s;
}
diff --git a/libkcal/attendee.h b/libkcal/attendee.h
index 161c77ed2..a61b07c5f 100644
--- a/libkcal/attendee.h
+++ b/libkcal/attendee.h
@@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person
/**
Set status. See enum for definitions of possible values.
*/
- void setStatus( PartStat s );
+ void seStatus( PartStat s );
/**
Return status.
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 711cdc12a..c76ce329b 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -935,7 +935,7 @@ void Calendar::removeRelations( Incidence *incidence )
void Calendar::registerObserver( Observer *observer )
{
- if( !mObservers.contains( observer ) )
+ if( !mObservers.tqcontains( observer ) )
mObservers.append( observer );
mNewObserver = true;
}
@@ -961,7 +961,7 @@ void Calendar::setModified( bool modified )
void Calendar::incidenceUpdated( IncidenceBase *incidence )
{
incidence->setSyncStatus( Event::SYNCMOD );
- incidence->setLastModified( TQDateTime::currentDateTime() );
+ incidence->setLastModified( TQDateTime::tqcurrentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
// need to verify with ical documentation.
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 2f2d7739b..95b5a0063 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -499,7 +499,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
void CalendarLocal::incidenceUpdated( IncidenceBase *incidence )
{
incidence->setSyncStatusSilent( Event::SYNCMOD );
- incidence->setLastModified( TQDateTime::currentDateTime() );
+ incidence->setLastModified( TQDateTime::tqcurrentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
// need to verify with ical documentation.
diff --git a/libkcal/calendarnull.cpp b/libkcal/calendarnull.cpp
index f4b07789c..39993e448 100644
--- a/libkcal/calendarnull.cpp
+++ b/libkcal/calendarnull.cpp
@@ -36,7 +36,7 @@ CalendarNull *CalendarNull::mSelf = 0;
CalendarNull *CalendarNull::self()
{
- if ( !mSelf ) mSelf = new CalendarNull( TQString::fromLatin1( "UTC" ) );
+ if ( !mSelf ) mSelf = new CalendarNull( TQString::tqfromLatin1( "UTC" ) );
return mSelf;
}
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index abd1cc213..50c5fba51 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -324,7 +324,7 @@ bool CalendarResources::addIncidence( Incidence *incidence,
kdDebug(5800)<< "CalendarResources: validRes is " << validRes << endl;
ResourceCalendar *oldResource = 0;
- if ( mResourceMap.contains( incidence ) ) {
+ if ( mResourceMap.tqcontains( incidence ) ) {
oldResource = mResourceMap[incidence];
}
mResourceMap[incidence] = resource;
@@ -960,7 +960,7 @@ void CalendarResources::endAddingIncidences()
int CalendarResources::incrementChangeCount( ResourceCalendar *r )
{
- if ( !mChangeCounts.contains( r ) ) {
+ if ( !mChangeCounts.tqcontains( r ) ) {
mChangeCounts.insert( r, 0 );
}
@@ -973,7 +973,7 @@ int CalendarResources::incrementChangeCount( ResourceCalendar *r )
int CalendarResources::decrementChangeCount( ResourceCalendar *r )
{
- if ( !mChangeCounts.contains( r ) ) {
+ if ( !mChangeCounts.tqcontains( r ) ) {
kdError() << "No change count for resource." << endl;
return 0;
}
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index a78b77bbc..9a93be53d 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -161,7 +161,7 @@ class LIBKCAL_EXPORT CalendarResources :
*/
CalendarResources(
const TQString &timeZoneId,
- const TQString &family = TQString::fromLatin1( "calendar" ) );
+ const TQString &family = TQString::tqfromLatin1( "calendar" ) );
/**
Destructor
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 898ec79cf..c065bf448 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -108,14 +108,14 @@ bool CalFilter::filterIncidence(Incidence *incidence) const
if ( (mCriteria & HideCompleted) && todo->isCompleted() ) {
// Check if completion date is suffently long ago:
if ( todo->completed().addDays( mCompletedTimeSpan ) <
- TQDateTime::currentDateTime() ) {
+ TQDateTime::tqcurrentDateTime() ) {
return false;
}
}
if( ( mCriteria & HideInactiveTodos ) &&
( todo->hasStartDate() &&
- TQDateTime::currentDateTime() < todo->dtStart() ||
+ TQDateTime::tqcurrentDateTime() < todo->dtStart() ||
todo->isCompleted() ) )
return false;
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index e506b8dfe..12ba30696 100644
--- a/libkcal/calformat.cpp
+++ b/libkcal/calformat.cpp
@@ -27,8 +27,8 @@
using namespace KCal;
-TQString CalFormat::mApplication = TQString::fromLatin1("libkcal");
-TQString CalFormat::mProductId = TQString::fromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN");
+TQString CalFormat::mApplication = TQString::tqfromLatin1("libkcal");
+TQString CalFormat::mProductId = TQString::tqfromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN");
CalFormat::CalFormat()
diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp
index cae5c102f..ebdb9de99 100644
--- a/libkcal/calhelper.cpp
+++ b/libkcal/calhelper.cpp
@@ -45,7 +45,7 @@ bool CalHelper::isMyKolabIncidence( Calendar *calendar, Incidence *incidence )
CalendarResourceManager::Iterator it;
for ( it = manager->begin(); it != manager->end(); ++it ) {
TQString subRes = (*it)->subresourceIdentifier( incidence );
- if ( !subRes.isEmpty() && !subRes.contains( "/.INBOX.directory/" ) ) {
+ if ( !subRes.isEmpty() && !subRes.tqcontains( "/.INBOX.directory/" ) ) {
return false;
}
}
@@ -126,7 +126,7 @@ bool CalHelper::hasMyWritableEventsFolders( const TQString &family )
if ( (*it)->type() == "imap" || (*it)->type() == "kolab" ) {
if ( (*it)->subresourceType( ( *subIt ) ) == "todo" ||
(*it)->subresourceType( ( *subIt ) ) == "journal" ||
- !(*subIt).contains( "/.INBOX.directory/" ) ) {
+ !(*subIt).tqcontains( "/.INBOX.directory/" ) ) {
continue;
}
}
diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp
index 9c346f483..3022d7cc0 100644
--- a/libkcal/calselectdialog.cpp
+++ b/libkcal/calselectdialog.cpp
@@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
: KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true )
{
TQFrame *frame = makeMainWidget();
- TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
TQLabel *labelWidget = new TQLabel( label, frame );
- layout->addWidget( labelWidget );
+ tqlayout->addWidget( labelWidget );
mListBox = new KListBox( frame );
mListBox->insertStringList( list );
mListBox->setSelected( 0, true );
mListBox->ensureCurrentVisible();
- layout->addWidget( mListBox, 10 );
+ tqlayout->addWidget( mListBox, 10 );
connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),
TQT_SLOT(slotOk()) );
@@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
mListBox->setFocus();
- layout->addStretch();
+ tqlayout->addStretch();
setMinimumWidth( 320 );
}
diff --git a/libkcal/compat.cpp b/libkcal/compat.cpp
index 8268f9785..5b5c6a5a4 100644
--- a/libkcal/compat.cpp
+++ b/libkcal/compat.cpp
@@ -217,7 +217,7 @@ void CompatPre31::fixRecurrence( Incidence *incidence )
TQValueList<int> months = r->byMonths();
for ( TQValueListConstIterator<int> it = days.begin(); it != days.end(); ++it ) {
int newmonth = TQDate( r->startDt().date().year(), 1, 1).addDays( (*it) - 1 ).month();
- if ( !months.contains( newmonth ) )
+ if ( !months.tqcontains( newmonth ) )
months.append( newmonth );
}
r->setByMonths( months );
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index 2d59fe912..689a2c854 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -123,7 +123,7 @@ TQMap<TQCString, TQString> CustomProperties::customProperties() const
bool CustomProperties::checkName(const TQCString &name)
{
- // Check that the property name starts with 'X-' and contains
+ // Check that the property name starts with 'X-' and tqcontains
// only the permitted characters
const char* n = name;
int len = name.length();
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index b94c1707b..7f4398194 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -232,7 +232,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
// update relations
for ( it = list.constBegin(); it != list.constEnd(); ++it ) {
Incidence *inc = *it;
- if ( oldUidToNewInc.contains( inc->relatedToUid() ) ) {
+ if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) {
Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()];
inc->setRelatedToUid( parentInc->uid() );
inc->setRelatedTo( parentInc );
diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index c945b88f0..f5fde5d9d 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -172,14 +172,14 @@ void HtmlExport::createMonthView(TQTextStream *ts)
*ts << " <td valign=\"top\"><table border=\"0\">";
*ts << "<tr><td ";
- if (mHolidayMap.contains(start) || start.dayOfWeek() == 7) {
+ if (mHolidayMap.tqcontains(start) || start.dayOfWeek() == 7) {
*ts << "class=\"dateholiday\"";
} else {
*ts << "class=\"date\"";
}
*ts << ">" << TQString::number(start.day());
- if (mHolidayMap.contains(start)) {
+ if (mHolidayMap.tqcontains(start)) {
*ts << " <em>" << mHolidayMap[start] << "</em>";
}
@@ -343,7 +343,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
}
// FIXME: Sort list by priorities. This is brute force and should be
- // replaced by a real sorting algorithm.
+ // tqreplaced by a real sorting algorithm.
Todo::List todoList;
for ( int i = 1; i <= 9; ++i ) {
for( it = rawTodoList.begin(); it != rawTodoList.end(); ++it ) {
@@ -403,7 +403,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
Todo::List sortedList;
// FIXME: Sort list by priorities. This is brute force and should be
- // replaced by a real sorting algorithm.
+ // tqreplaced by a real sorting algorithm.
for ( int i = 1; i <= 9; ++i ) {
Incidence::List::ConstIterator it2;
for( it2 = relations.begin(); it2 != relations.end(); ++it2 ) {
@@ -559,7 +559,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
#ifndef KORG_NOKABC
KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
KABC::Addressee::List addressList;
- addressList = add_book->findByEmail(event->organizer().email());
+ addressList = add_book->tqfindByEmail(event->organizer().email());
KABC::Addressee o = addressList.first();
if (!o.isEmpty() && addressList.size()<2) {
*ts << "<a href=\"mailto:" << event->organizer().email() << "\">";
@@ -589,7 +589,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
TQString HtmlExport::breakString(const TQString &text)
{
- int number = text.contains("\n");
+ int number = text.tqcontains("\n");
if(number < 0) {
return text;
} else {
@@ -640,28 +640,28 @@ void HtmlExport::createFooter( TQTextStream *ts )
TQString HtmlExport::cleanChars(const TQString &text)
{
TQString txt = text;
- txt = txt.replace( "&", "&amp;" );
- txt = txt.replace( "<", "&lt;" );
- txt = txt.replace( ">", "&gt;" );
- txt = txt.replace( "\"", "&quot;" );
- txt = txt.replace( TQString::fromUtf8("ä"), "&auml;" );
- txt = txt.replace( TQString::fromUtf8("á"), "&aacute;" );
- txt = txt.replace( TQString::fromUtf8("à"), "&agrave;" );
- txt = txt.replace( TQString::fromUtf8("â"), "&acirc;" );
- txt = txt.replace( TQString::fromUtf8("Ä"), "&Auml;" );
- txt = txt.replace( TQString::fromUtf8("ó"), "&oacute;" );
- txt = txt.replace( TQString::fromUtf8("ô"), "&ocirc;" );
- txt = txt.replace( TQString::fromUtf8("ö"), "&ouml;" );
- txt = txt.replace( TQString::fromUtf8("Ö"), "&Ouml;" );
- txt = txt.replace( TQString::fromUtf8("ü"), "&uuml;" );
- txt = txt.replace( TQString::fromUtf8("Ü"), "&Uuml;" );
- txt = txt.replace( TQString::fromUtf8("ß"), "&szlig;" );
- txt = txt.replace( TQString::fromUtf8("€"), "&euro;" );
- txt = txt.replace( TQString::fromUtf8("é"), "&eacute;" );
- txt = txt.replace( TQString::fromUtf8("ë"), "&euml;" );
- txt = txt.replace( TQString::fromUtf8("è"), "&egrave;" );
- txt = txt.replace( TQString::fromUtf8("ñ"), "&ntilde;" );
- txt = txt.replace( TQString::fromUtf8("ç"), "&ccedil;" );
+ txt = txt.tqreplace( "&", "&amp;" );
+ txt = txt.tqreplace( "<", "&lt;" );
+ txt = txt.tqreplace( ">", "&gt;" );
+ txt = txt.tqreplace( "\"", "&quot;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ä"), "&auml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("á"), "&aacute;" );
+ txt = txt.tqreplace( TQString::fromUtf8("à"), "&agrave;" );
+ txt = txt.tqreplace( TQString::fromUtf8("â"), "&acirc;" );
+ txt = txt.tqreplace( TQString::fromUtf8("Ä"), "&Auml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ó"), "&oacute;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ô"), "&ocirc;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ö"), "&ouml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("Ö"), "&Ouml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ü"), "&uuml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("Ü"), "&Uuml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ß"), "&szlig;" );
+ txt = txt.tqreplace( TQString::fromUtf8("€"), "&euro;" );
+ txt = txt.tqreplace( TQString::fromUtf8("é"), "&eacute;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ë"), "&euml;" );
+ txt = txt.tqreplace( TQString::fromUtf8("è"), "&egrave;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ñ"), "&ntilde;" );
+ txt = txt.tqreplace( TQString::fromUtf8("ç"), "&ccedil;" );
return txt;
}
diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp
index 39315f5a6..2c5f2309d 100644
--- a/libkcal/icaldrag.cpp
+++ b/libkcal/icaldrag.cpp
@@ -46,7 +46,7 @@ bool ICalDrag::decode( TQMimeSource *de, Calendar *cal )
{
bool success = false;
- TQByteArray payload = de->encodedData( "text/calendar" );
+ TQByteArray payload = de->tqencodedData( "text/calendar" );
if ( payload.size() ) {
TQString txt = TQString::fromUtf8( payload.data() );
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index c6a245c80..76898ec09 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
if (messageText.isEmpty())
{
- setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
+ setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
return 0;
}
// TODO FIXME: Don't we have to ical-free message??? MEMLEAK
@@ -449,7 +449,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
if (!message)
{
- setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
+ setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
return 0;
}
@@ -457,7 +457,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
ICAL_METHOD_PROPERTY);
if (!m)
{
- setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
+ setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
return 0;
}
@@ -495,7 +495,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
if (!incidence) {
kdDebug(5800) << "ICalFormat:parseScheduleMessage: object is not a freebusy, event, todo or journal" << endl;
- setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
+ setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
return 0;
}
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index d711dd1ac..bdbc1f7be 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -73,9 +73,9 @@ static TQString quoteForParam( const TQString &text )
{
TQString tmp = text;
tmp.remove( '"' );
- if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) )
+ if ( tmp.tqcontains( ';' ) || tmp.tqcontains( ':' ) || tmp.tqcontains( ',' ) )
return tmp; // libical quotes in this case already, see icalparameter_as_ical_string()
- return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" );
+ return TQString::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" );
}
const int gSecondsPerMinute = 60;
@@ -157,7 +157,7 @@ icalcomponent *ICalFormatImpl::writeTodo(Todo *todo)
if (!todo->hasCompletedDate()) {
// If todo was created by KOrganizer <2.2 it has no correct completion
// date. Set it to now.
- todo->setCompleted(TQDateTime::currentDateTime());
+ todo->setCompleted(TQDateTime::tqcurrentDateTime());
}
icaltimetype completed = writeICalDateTime(todo->completed());
icalcomponent_add_property(vtodo,icalproperty_new_completed(completed));
@@ -537,7 +537,7 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent,
IncidenceBase * incidenceBase )
{
icalcomponent_add_property( parent, icalproperty_new_dtstamp(
- writeICalDateTime( TQDateTime::currentDateTime() ) ) );
+ writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) );
// organizer stuff
if ( !incidenceBase->organizer().isEmpty() ) {
@@ -1083,7 +1083,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon
const TQString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT");
if ( !msade.isEmpty() ) {
- const bool floats = ( msade == TQString::fromLatin1("TRUE") );
+ const bool floats = ( msade == TQString::tqfromLatin1("TRUE") );
event->setFloats(floats);
}
@@ -1440,7 +1440,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
default: stat = Incidence::StatusNone; break;
}
if (stat != Incidence::StatusX)
- incidence->setStatus(stat);
+ incidence->seStatus(stat);
break;
}
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 79de6723d..4c41e7a9a 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -207,14 +207,14 @@ bool Incidence::operator==( const Incidence& i2 ) const
void Incidence::recreate()
{
- setCreated(TQDateTime::currentDateTime());
+ setCreated(TQDateTime::tqcurrentDateTime());
setUid(CalFormat::createUniqueId());
setSchedulingID( TQString::null );
setRevision(0);
- setLastModified(TQDateTime::currentDateTime());
+ setLastModified(TQDateTime::tqcurrentDateTime());
setPilotId( 0 );
setSyncStatus( SYNCNONE );
}
@@ -738,7 +738,7 @@ int Incidence::priority() const
return mPriority;
}
-void Incidence::setStatus(Incidence::Status status)
+void Incidence::seStatus(Incidence::Status status)
{
if (mReadOnly || status == StatusX) return;
mStatus = status;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 89d45b085..883d08c86 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -381,7 +381,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
Sets the incidence status to a standard status value. See
separate enum. Note that StatusX cannot be specified.
*/
- void setStatus( Status status );
+ void seStatus( Status status );
/**
Sets the incidence status to a non-standard status value.
@param status non-standard status string. If empty,
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index a8a6bdb05..518d0f63e 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -394,7 +394,7 @@ unsigned long IncidenceBase::pilotId() const
void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
{
- if( !mObservers.contains( observer ) ) mObservers.append( observer );
+ if( !mObservers.tqcontains( observer ) ) mObservers.append( observer );
}
void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index cebdd0b16..ebfb68eab 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -74,7 +74,7 @@ static TQString htmlAddLink( const TQString &ref, const TQString &text,
static TQString htmlAddTag( const TQString & tag, const TQString & text )
{
- int numLineBreaks = text.contains( "\n" );
+ int numLineBreaks = text.tqcontains( "\n" );
TQString str = "<" + tag + ">";
TQString tmpText = text;
TQString tmpStr = str;
@@ -184,7 +184,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS
// and either name or uid is missing
if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
- KABC::Addressee::List addressList = add_book->findByEmail( email );
+ KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
if ( !addressList.isEmpty() ) {
KABC::Addressee o = addressList.first();
if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -1135,7 +1135,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString
// and either name or uid is missing
if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
- KABC::Addressee::List addressList = add_book->findByEmail( email );
+ KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
if ( !addressList.isEmpty() ) {
KABC::Addressee o = addressList.first();
if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -2278,7 +2278,7 @@ static bool incidenceOwnedByMe( Calendar *calendar, Incidence *incidence )
return true;
}
const TQString subRes = res->subresourceIdentifier( incidence );
- if ( !subRes.contains( "/.INBOX.directory/" ) ) {
+ if ( !subRes.tqcontains( "/.INBOX.directory/" ) ) {
return false;
}
return true;
@@ -2426,9 +2426,9 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
// First make the text of the message
TQString html;
- TQString tableStyle = TQString::fromLatin1(
+ TQString tableStyle = TQString::tqfromLatin1(
"style=\"border: solid 1px; margin: 0em;\"" );
- TQString tableHead = TQString::fromLatin1(
+ TQString tableHead = TQString::tqfromLatin1(
"<div align=\"center\">"
"<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>"
"<tr><td>").arg(tableStyle);
@@ -2701,7 +2701,7 @@ TQString IncidenceFormatter::formatICalInvitationNoHtml( TQString invitation,
//-----------------------------------------------------------------------------
-static TQString stringProp( KTNEFMessage* tnefMsg, const Q_UINT32& key,
+static TQString stringProp( KTNEFMessage* tnefMsg, const TQ_UINT32& key,
const TQString& fallback = TQString::null)
{
return tnefMsg->findProp( key < 0x10000 ? key & 0xFFFF : key >> 16,
@@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
KTNEFParser parser;
TQBuffer buf( tnef );
- CalendarLocal cal ( TQString::fromLatin1( "UTC" ) );
+ CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) );
KABC::Addressee addressee;
KABC::VCardConverter cardConv;
ICalFormat calFormat;
@@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
Attendee *attendee = new Attendee( s, s, true );
if( bIsReply ) {
if( bCompatMethodAccepted )
- attendee->setStatus( Attendee::Accepted );
+ attendee->seStatus( Attendee::Accepted );
if( bCompatMethodDeclined )
- attendee->setStatus( Attendee::Declined );
+ attendee->seStatus( Attendee::Declined );
if( bCompatMethodAcceptedCond )
- attendee->setStatus(Attendee::Tentative);
+ attendee->seStatus(Attendee::Tentative);
} else {
- attendee->setStatus( Attendee::NeedsAction );
+ attendee->seStatus( Attendee::NeedsAction );
attendee->setRole( Attendee::ReqParticipant );
}
event->addAttendee(attendee);
@@ -2947,13 +2947,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
true );
if( bIsReply ) {
if( bCompatMethodAccepted )
- attendee->setStatus( Attendee::Accepted );
+ attendee->seStatus( Attendee::Accepted );
if( bCompatMethodAcceptedCond )
- attendee->setStatus( Attendee::Declined );
+ attendee->seStatus( Attendee::Declined );
if( bCompatMethodDeclined )
- attendee->setStatus( Attendee::Tentative );
+ attendee->seStatus( Attendee::Tentative );
} else {
- attendee->setStatus(Attendee::NeedsAction);
+ attendee->seStatus(Attendee::NeedsAction);
attendee->setRole(Attendee::ReqParticipant);
}
event->addAttendee(attendee);
@@ -2966,12 +2966,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
if( !s.isEmpty() )
event->setOrganizer( s );
- s = tnefMsg->findProp( 0x8516 ).replace( TQChar( '-' ), TQString::null )
- .replace( TQChar( ':' ), TQString::null );
+ s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString::null )
+ .tqreplace( TQChar( ':' ), TQString::null );
event->setDtStart( TQDateTime::fromString( s ) ); // ## Format??
- s = tnefMsg->findProp( 0x8517 ).replace( TQChar( '-' ), TQString::null )
- .replace( TQChar( ':' ), TQString::null );
+ s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString::null )
+ .tqreplace( TQChar( ':' ), TQString::null );
event->setDtEnd( TQDateTime::fromString( s ) );
s = tnefMsg->findProp( 0x8208 );
@@ -2988,9 +2988,9 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
// PENDING(khz): is this value in local timezone? Must it be
// adjusted? Most likely this is a bug in the server or in
// Outlook - we ignore it for now.
- s = tnefMsg->findProp( 0x8202 ).replace( TQChar( '-' ), TQString::null )
- .replace( TQChar( ':' ), TQString::null );
- // ### libkcal always uses currentDateTime()
+ s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString::null )
+ .tqreplace( TQChar( ':' ), TQString::null );
+ // ### libkcal always uses tqcurrentDateTime()
// event->setDtStamp(TQDateTime::fromString(s));
s = tnefMsg->findNamedProp( "Keywords" );
@@ -3010,12 +3010,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
Alarm *alarm = new Alarm(event);
TQDateTime highNoonTime =
pureISOToLocalQDateTime( tnefMsg->findProp( 0x8502 )
- .replace( TQChar( '-' ), "" )
- .replace( TQChar( ':' ), "" ) );
+ .tqreplace( TQChar( '-' ), "" )
+ .tqreplace( TQChar( ':' ), "" ) );
TQDateTime wakeMeUpTime =
pureISOToLocalQDateTime( tnefMsg->findProp( 0x8560, "" )
- .replace( TQChar( '-' ), "" )
- .replace( TQChar( ':' ), "" ) );
+ .tqreplace( TQChar( '-' ), "" )
+ .tqreplace( TQChar( ':' ), "" ) );
alarm->setTime(wakeMeUpTime);
if( highNoonTime.isValid() && wakeMeUpTime.isValid() )
@@ -3047,8 +3047,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
addressee.insertCustom( "KADDRESSBOOK", "X-Profession", stringProp( tnefMsg, MAPI_TAG_PR_PROFESSION ) );
TQString s = tnefMsg->findProp( MAPI_TAG_PR_WEDDING_ANNIVERSARY )
- .replace( TQChar( '-' ), TQString::null )
- .replace( TQChar( ':' ), TQString::null );
+ .tqreplace( TQChar( '-' ), TQString::null )
+ .tqreplace( TQChar( ':' ), TQString::null );
if( !s.isEmpty() )
addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", s );
@@ -3114,8 +3114,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) );
s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY )
- .replace( TQChar( '-' ), TQString::null )
- .replace( TQChar( ':' ), TQString::null );
+ .tqreplace( TQChar( '-' ), TQString::null )
+ .tqreplace( TQChar( ':' ), TQString::null );
if( !s.isEmpty() )
addressee.setBirthday( TQDateTime::fromString( s ) );
@@ -3218,25 +3218,25 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const
tmp = "<br>" + i18n("Event start", "<i>From:</i>&nbsp;%1");
if (event->doesFloat())
- ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).tqreplace(" ", "&nbsp;") );
else
- ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).tqreplace(" ", "&nbsp;") );
tmp = "<br>" + i18n("Event end","<i>To:</i>&nbsp;%1");
if (event->doesFloat())
- ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).tqreplace(" ", "&nbsp;") );
else
- ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).tqreplace(" ", "&nbsp;") );
} else {
ret += "<br>"+i18n("<i>Date:</i>&nbsp;%1").
- arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+ arg( IncidenceFormatter::dateToString( startDt, false ).tqreplace(" ", "&nbsp;") );
if ( !event->doesFloat() ) {
const TQString dtStartTime =
- IncidenceFormatter::timeToString( startDt, true ).replace( " ", "&nbsp;" );
+ IncidenceFormatter::timeToString( startDt, true ).tqreplace( " ", "&nbsp;" );
const TQString dtEndTime =
- IncidenceFormatter::timeToString( endDt, true ).replace( " ", "&nbsp;" );
+ IncidenceFormatter::timeToString( endDt, true ).tqreplace( " ", "&nbsp;" );
if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00'
tmp = "<br>" + i18n("time for event, &nbsp; to prevent ugly line breaks",
"<i>Time:</i>&nbsp;%1").
@@ -3268,7 +3268,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
ret += "<br>" +
i18n("<i>Start:</i>&nbsp;%1").
arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ).
- replace( " ", "&nbsp;" ) );
+ tqreplace( " ", "&nbsp;" ) );
}
if ( todo->hasDueDate() && todo->dtDue().isValid() ) {
@@ -3283,7 +3283,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
ret += "<br>" +
i18n("<i>Due:</i>&nbsp;%1").
arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ).
- replace( " ", "&nbsp;" ) );
+ tqreplace( " ", "&nbsp;" ) );
}
// Print priority and completed info here, for lack of a better place
@@ -3297,7 +3297,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
ret += "<br>";
if ( todo->isCompleted() ) {
ret += "<i>" + i18n( "Completed:" ) + "</i>" + "&nbsp;";
- ret += todo->completedStr().replace( " ", "&nbsp;" );
+ ret += todo->completedStr().tqreplace( " ", "&nbsp;" );
} else {
ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + "&nbsp;";
ret += i18n( "%1%" ).arg( todo->percentComplete() );
@@ -3361,7 +3361,7 @@ static TQString tooltipPerson( const TQString& email, TQString name )
// and name is missing
if ( name.isEmpty() && !email.isEmpty() ) {
KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
- KABC::Addressee::List addressList = add_book->findByEmail( email );
+ KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
if ( !addressList.isEmpty() ) {
KABC::Addressee o = addressList.first();
if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -3475,7 +3475,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
TQString tmp = "<qt>";
// header
- tmp += "<b>" + incidence->summary().replace( "\n", "<br>" ) + "</b>";
+ tmp += "<b>" + incidence->summary().tqreplace( "\n", "<br>" ) + "</b>";
//NOTE: using <hr> seems to confuse TQt3 tooltips in some cases so use "-----"
tmp += "<br>----------<br>";
@@ -3492,7 +3492,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
if ( !incidence->location().isEmpty() ) {
tmp += "<br>";
tmp += "<i>" + i18n( "Location:" ) + "</i>" + "&nbsp;";
- tmp += incidence->location().replace( "\n", "<br>" );
+ tmp += incidence->location().tqreplace( "\n", "<br>" );
}
TQString durStr = IncidenceFormatter::durationString( incidence );
@@ -3515,7 +3515,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
}
tmp += "<br>----------<br>";
tmp += "<i>" + i18n( "Description:" ) + "</i>" + "<br>";
- tmp += desc.replace( "\n", "<br>" );
+ tmp += desc.tqreplace( "\n", "<br>" );
tmp += "<br>----------";
}
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index ae47db326..474d885f1 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -112,13 +112,13 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
void Recurrence::addObserver( Observer *observer )
{
- if ( !mObservers.contains( observer ) )
+ if ( !mObservers.tqcontains( observer ) )
mObservers.append( observer );
}
void Recurrence::removeObserver( Observer *observer )
{
- if ( mObservers.contains( observer ) )
+ if ( mObservers.tqcontains( observer ) )
mObservers.remove( observer );
}
@@ -269,7 +269,7 @@ bool Recurrence::recursOn(const TQDate &qd) const
{
TimeList tms;
// First handle dates. Exrules override
- if ( mExDates.contains( qd ) ) return false;
+ if ( mExDates.tqcontains( qd ) ) return false;
// For all-day events a matching exrule excludes the whole day
// since exclusions take precedence over inclusions, we know it can't occur on that day.
if ( doesFloat() ) {
@@ -279,7 +279,7 @@ bool Recurrence::recursOn(const TQDate &qd) const
}
}
- if ( mRDates.contains( qd ) ) return true;
+ if ( mRDates.tqcontains( qd ) ) return true;
bool recurs = false;
@@ -328,14 +328,14 @@ bool Recurrence::recursOn(const TQDate &qd) const
bool Recurrence::recursAt( const TQDateTime &dt ) const
{
// if it's excluded anyway, don't bother to check if it recurs at all.
- if ( mExDateTimes.contains( dt )) return false;
- if ( mExDates.contains( dt.date() )) return false;
+ if ( mExDateTimes.tqcontains( dt )) return false;
+ if ( mExDates.tqcontains( dt.date() )) return false;
for ( RecurrenceRule::List::ConstIterator rr = mExRules.begin(); rr != mExRules.end(); ++rr ) {
if ( (*rr)->recursAt( dt ) ) return false;
}
// Check explicit recurrences, then rrules.
- bool occurs = ( startDateTime() == dt ) || mRDateTimes.contains( dt );
+ bool occurs = ( startDateTime() == dt ) || mRDateTimes.tqcontains( dt );
if ( occurs )
return true;
for ( RecurrenceRule::List::ConstIterator rr = mRRules.begin(); rr != mRRules.end(); ++rr ) {
@@ -624,7 +624,7 @@ void Recurrence::addMonthlyPos( short pos, const TQBitArray &days )
for ( int i = 0; i < 7; ++i ) {
if ( days.testBit(i) ) {
RecurrenceRule::WDayPos p( pos, i + 1 );
- if ( !positions.contains( p ) ) {
+ if ( !positions.tqcontains( p ) ) {
changed = true;
positions.append( p );
}
@@ -646,7 +646,7 @@ void Recurrence::addMonthlyPos( short pos, ushort day )
TQValueList<RecurrenceRule::WDayPos> positions = rrule->byDays();
RecurrenceRule::WDayPos p( pos, day );
- if ( !positions.contains( p ) ) {
+ if ( !positions.tqcontains( p ) ) {
positions.append( p );
rrule->setByDays( positions );
updated();
@@ -661,7 +661,7 @@ void Recurrence::addMonthlyDate( short day )
if ( !rrule ) return;
TQValueList<int> monthDays = rrule->byMonthDays();
- if ( !monthDays.contains( day ) ) {
+ if ( !monthDays.tqcontains( day ) ) {
monthDays.append( day );
rrule->setByMonthDays( monthDays );
updated();
@@ -682,7 +682,7 @@ void Recurrence::addYearlyDay( int day )
if ( !rrule ) return;
TQValueList<int> days = rrule->byYearDays();
- if ( !days.contains( day ) ) {
+ if ( !days.tqcontains( day ) ) {
days << day;
rrule->setByYearDays( days );
updated();
@@ -710,7 +710,7 @@ void Recurrence::addYearlyMonth( short month )
if ( !rrule ) return;
TQValueList<int> months = rrule->byMonths();
- if ( !months.contains(month) ) {
+ if ( !months.tqcontains(month) ) {
months << month;
rrule->setByMonths( months );
updated();
@@ -722,7 +722,7 @@ TimeList Recurrence::recurTimesOn( const TQDate &date ) const
{
TimeList times;
// The whole day is excepted
- if ( mExDates.contains( date ) ) return times;
+ if ( mExDates.tqcontains( date ) ) return times;
// EXRULE takes precedence over RDATE entries, so for floating events,
// a matching excule also excludes the whole day automatically
if ( doesFloat() ) {
@@ -893,8 +893,8 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
nextDT = dates.first();
// Check if that date/time is excluded explicitly or by an exrule:
- if ( !containsSorted( mExDates, nextDT.date() ) &&
- !containsSorted( mExDateTimes, nextDT ) ) {
+ if ( !tqcontainsSorted( mExDates, nextDT.date() ) &&
+ !tqcontainsSorted( mExDateTimes, nextDT ) ) {
bool allowed = true;
for ( i = 0, end = mExRules.count(); i < end; ++i ) {
allowed = allowed && !( mExRules[i]->recursAt( nextDT ) );
@@ -964,8 +964,8 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
prevDT = dates.last();
// Check if that date/time is excluded explicitly or by an exrule:
- if ( !containsSorted( mExDates, prevDT.date() ) &&
- !containsSorted( mExDateTimes, prevDT ) ) {
+ if ( !tqcontainsSorted( mExDates, prevDT.date() ) &&
+ !tqcontainsSorted( mExDateTimes, prevDT ) ) {
bool allowed = true;
for ( i = 0, end = mExRules.count(); i < end; ++i ) {
allowed = allowed && !( mExRules[i]->recursAt( prevDT ) );
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index 0a594a6fb..355a922f6 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -308,7 +308,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
* @return Weekday of the first day of the week (Monday=1 .. Sunday=7)
*/
int weekStart() const;
- /** Returns week day mask (bit 0 = Monday). */
+ /** Returns week day tqmask (bit 0 = Monday). */
TQBitArray days() const; // Emulate the old behavior
/** Sets an event to recur monthly. By default infinite recurrence is used.
@@ -410,13 +410,13 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
void addYearlyPos( short pos, const TQBitArray &days );
/** Returns the day numbers within a yearly recurrence.
- * @return the days of the year for the event. E.g. if the list contains
+ * @return the days of the year for the event. E.g. if the list tqcontains
* 60, this means the recurrence happens on day 60 of the year, i.e.
* on Feb 29 in leap years and March 1 in non-leap years.
*/
TQValueList<int> yearDays() const;
/** Returns the dates within a yearly recurrence.
- * @return the days of the month for the event. E.g. if the list contains
+ * @return the days of the month for the event. E.g. if the list tqcontains
* 13, this means the recurrence happens on the 13th of the month.
* The months for the recurrence can be obtained through
* yearlyMonths(). If this list is empty, the month of the start
@@ -424,7 +424,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
*/
TQValueList<int> yearDates() const;
/** Returns the months within a yearly recurrence.
- * @return the months for the event. E.g. if the list contains
+ * @return the months for the event. E.g. if the list tqcontains
* 11, this means the recurrence happens in November.
* The days for the recurrence can be obtained either through
* yearDates() if they are given as dates within the month or
@@ -435,7 +435,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
/** Returns the positions within a yearly recurrence.
* @return the positions for the event, either within a month (if months
* are set through addYearlyMonth()) or within the year.
- * E.g. if the list contains {Pos=3, Day=5}, this means the third
+ * E.g. if the list tqcontains {Pos=3, Day=5}, this means the third
* friday. If a month is set this position is understoodas third
* Friday in the given months, otherwise as third Friday of the
* year.
diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp
index 17292ec53..e225edb0c 100644
--- a/libkcal/recurrencerule.cpp
+++ b/libkcal/recurrencerule.cpp
@@ -104,7 +104,7 @@ TQDate DateHelper::getNthWeek( int year, int weeknumber, short weekstart )
{
if ( weeknumber == 0 ) return TQDate();
// Adjust this to the first day of week #1 of the year and add 7*weekno days.
- TQDate dt( year, 1, 4 ); // Week #1 is the week that contains Jan 4
+ TQDate dt( year, 1, 4 ); // Week #1 is the week that tqcontains Jan 4
int adjust = -(7 + dt.dayOfWeek() - weekstart) % 7;
if ( weeknumber > 0 ) {
dt = dt.addDays( 7 * (weeknumber-1) + adjust );
@@ -541,13 +541,13 @@ bool RecurrenceRule::operator==( const RecurrenceRule& r ) const
void RecurrenceRule::addObserver( Observer *observer )
{
- if ( !mObservers.contains( observer ) )
+ if ( !mObservers.tqcontains( observer ) )
mObservers.append( observer );
}
void RecurrenceRule::removeObserver( Observer *observer )
{
- if ( mObservers.contains( observer ) )
+ if ( mObservers.tqcontains( observer ) )
mObservers.remove( observer );
}
diff --git a/libkcal/recurrencerule.h b/libkcal/recurrencerule.h
index 86b8ca8ea..422113b51 100644
--- a/libkcal/recurrencerule.h
+++ b/libkcal/recurrencerule.h
@@ -148,7 +148,7 @@ Q_INLINE_TEMPLATES int removeSorted( TQValueList<T> &lst, const T &value, int st
}
template <class T>
-Q_INLINE_TEMPLATES bool containsSorted( const TQValueList<T> &lst, const T &value )
+Q_INLINE_TEMPLATES bool tqcontainsSorted( const TQValueList<T> &lst, const T &value )
{
return findSorted( lst, value, 0 ) >= 0;
}
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index dacab7e9d..a6365979b 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -49,7 +49,7 @@ using namespace KCal;
static bool m_editoropen = false;
ResourceCached::ResourceCached( const KConfig* config )
- : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+ : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
mReloadPolicy( ReloadNever ), mReloadInterval( 10 ),
mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ),
mSavePolicy( SaveNever ), mSaveInterval( 10 ),
@@ -353,7 +353,7 @@ void ResourceCached::clearJournalsCache()
void ResourceCached::cleanUpEventCache( const Event::List &eventList )
{
- CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+ CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
if ( KStandardDirs::exists( cacheFile() ) )
calendar.load( cacheFile() );
@@ -382,7 +382,7 @@ void ResourceCached::cleanUpEventCache( const Event::List &eventList )
void ResourceCached::cleanUpTodoCache( const Todo::List &todoList )
{
- CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+ CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
if ( KStandardDirs::exists( cacheFile() ) )
calendar.load( cacheFile() );
@@ -427,7 +427,7 @@ TQString ResourceCached::changesCacheFile( const TQString &type ) const
void ResourceCached::saveChangesCache( const TQMap<Incidence*, bool> &map, const TQString &type )
{
- CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+ CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
bool isEmpty = true;
TQMap<Incidence *,bool>::ConstIterator it;
@@ -455,7 +455,7 @@ void ResourceCached::saveChangesCache()
void ResourceCached::loadChangesCache( TQMap<Incidence*, bool> &map, const TQString &type )
{
- CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+ CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
if ( KStandardDirs::exists( changesCacheFile( type ) ) )
calendar.load( changesCacheFile( type ) );
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index f1e00f327..ce9d8c8f1 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -193,7 +193,7 @@ bool ResourceLocalDir::doSave()
bool ResourceLocalDir::doSave( Incidence *incidence )
{
- if ( mDeletedIncidences.contains( incidence ) ) {
+ if ( mDeletedIncidences.tqcontains( incidence ) ) {
mDeletedIncidences.remove( incidence );
return true;
}
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 6e3cf3850..4622716ae 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -133,23 +133,23 @@ TQString Scheduler::methodName(Method method)
{
switch (method) {
case Publish:
- return TQString::fromLatin1("Publish");
+ return TQString::tqfromLatin1("Publish");
case Request:
- return TQString::fromLatin1("Request");
+ return TQString::tqfromLatin1("Request");
case Refresh:
- return TQString::fromLatin1("Refresh");
+ return TQString::tqfromLatin1("Refresh");
case Cancel:
- return TQString::fromLatin1("Cancel");
+ return TQString::tqfromLatin1("Cancel");
case Add:
- return TQString::fromLatin1("Add");
+ return TQString::tqfromLatin1("Add");
case Reply:
- return TQString::fromLatin1("Reply");
+ return TQString::tqfromLatin1("Reply");
case Counter:
- return TQString::fromLatin1("Counter");
+ return TQString::tqfromLatin1("Counter");
case Declinecounter:
- return TQString::fromLatin1("Decline Counter");
+ return TQString::tqfromLatin1("Decline Counter");
default:
- return TQString::fromLatin1("Unknown");
+ return TQString::tqfromLatin1("Unknown");
}
}
@@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
if (attIn->email().lower()==attEv->email().lower()) {
//update attendee-info
kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl;
- attEv->setStatus(attIn->status());
+ attEv->seStatus(attIn->status());
attEv->setDelegate(attIn->delegate());
attEv->setDelegator(attIn->delegator());
ret = true;
diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp
index be70a7c8d..8088c1d64 100644
--- a/libkcal/tests/fbrecurring.cpp
+++ b/libkcal/tests/fbrecurring.cpp
@@ -13,7 +13,7 @@ int main()
{
ICalFormat f;
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
Event *event1 = new Event;
event1->setSummary("A");
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 076f55cbf..a1ab54930 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
kdDebug(5800) << "Output file: " << output << endl;
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 7d781fc54..48fb68aa0 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
Q_UNUSED( args );
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
cal.save("mycal");
}
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index 6e63faa98..a61170888 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -50,9 +50,9 @@ int main(int argc,char **argv)
Q_UNUSED(args)
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
- TQString file = TQString::fromLatin1( INPUT );
+ TQString file = TQString::tqfromLatin1( INPUT );
if (!cal.load( file ) ) {
kdError() << "Can't load " << file << endl;
return 1;
@@ -60,8 +60,8 @@ int main(int argc,char **argv)
// 2 tests... first uid should result in a syncStatus of 0. second uid
// should have a new summary and a 1 for syncStatus.
- TQString uid1 = TQString::fromLatin1("KOrganizer-1345486115.965");
- TQString uid2 = TQString::fromLatin1("KOrganizer-1345486115.967");
+ TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965");
+ TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967");
Event *e = cal.event( uid1 );
if (!e) {
@@ -88,7 +88,7 @@ int main(int argc,char **argv)
e->setSyncStatus(KCal::Incidence::SYNCNONE);
- TQString newSummary = TQString::fromLatin1("Mooo summary");
+ TQString newSummary = TQString::tqfromLatin1("Mooo summary");
Event *f = new Event(*e);
@@ -112,7 +112,7 @@ int main(int argc,char **argv)
// now try to read the file back in and see if our changes made it
- CalendarLocal cal2( TQString::fromLatin1("UTC") );
+ CalendarLocal cal2( TQString::tqfromLatin1("UTC") );
if (!cal2.load( filew ) ) {
kdError() << "Can't load " << filew << endl;
return 1;
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index 2d127d49f..ef9d62c8b 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
outstream = new TQTextStream( &outfile );
}
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 8fc1c5274..4d0a2faec 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
outstream = new TQTextStream( &outfile );
}
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 8fc1c5274..4d0a2faec 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
outstream = new TQTextStream( &outfile );
}
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index 01dfb5f7a..343bad459 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
outstream = new TQTextStream( &outfile );
}
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 7f8b61c09..9e76dcd99 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -75,7 +75,7 @@ int main( int argc, char **argv )
kdDebug(5800) << "Output file: " << output << endl;
- CalendarLocal cal( TQString::fromLatin1("UTC") );
+ CalendarLocal cal( TQString::tqfromLatin1("UTC") );
if ( !cal.load( input ) ) return 1;
TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index b3fe65d9c..c527cbbc7 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -288,7 +288,7 @@ TQDateTime Todo::dtRecurrence() const
bool Todo::recursOn( const TQDate &date ) const
{
- TQDate today = TQDate::currentDate();
+ TQDate today = TQDate::tqcurrentDate();
return ( Incidence::recursOn(date) &&
!( date < today && mDtRecurrence.date() < today &&
mDtRecurrence > recurrence()->startDateTime() ) );
@@ -304,7 +304,7 @@ bool Todo::recurTodo()
if ( ( r->duration() == -1 || ( nextDate.isValid() && endDateTime.isValid()
&& nextDate <= endDateTime ) ) ) {
- while ( !recursAt( nextDate ) || nextDate <= TQDateTime::currentDateTime() ) {
+ while ( !recursAt( nextDate ) || nextDate <= TQDateTime::tqcurrentDateTime() ) {
if ( !nextDate.isValid() ||
( nextDate > endDateTime && r->duration() != -1 ) ) {
@@ -327,7 +327,7 @@ bool Todo::recurTodo()
bool Todo::isOverdue() const
{
- bool inPast = doesFloat() ? dtDue().date() < TQDate::currentDate()
- : dtDue() < TQDateTime::currentDateTime();
+ bool inPast = doesFloat() ? dtDue().date() < TQDate::tqcurrentDate()
+ : dtDue() < TQDateTime::tqcurrentDateTime();
return ( inPast && !isCompleted() );
}
diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp
index 9bcfdb8d4..853c5187e 100644
--- a/libkcal/vcaldrag.cpp
+++ b/libkcal/vcaldrag.cpp
@@ -42,7 +42,7 @@ bool VCalDrag::decode( TQMimeSource *de, Calendar *cal )
{
bool success = false;
- TQByteArray payload = de->encodedData( "text/x-vCalendar" );
+ TQByteArray payload = de->tqencodedData( "text/x-vCalendar" );
if ( payload.size() ) {
TQString txt = TQString::fromUtf8( payload.data() );
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 3e9e613b3..21d8ae4b5 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -356,7 +356,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
tmpStr.sprintf("%lu",anEvent->pilotId());
addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
tmpStr.sprintf("%i",anEvent->syncStatus());
- addPropValue(vtodo, KPilotStatusProp, tmpStr.local8Bit());
+ addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit());
}
return vtodo;
@@ -642,7 +642,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
tmpStr.sprintf("%lu",anEvent->pilotId());
addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit());
tmpStr.sprintf("%i",anEvent->syncStatus());
- addPropValue(vevent, KPilotStatusProp, tmpStr.local8Bit());
+ addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit());
}
return vevent;
@@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
deleteStr(s);
}
else
- anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+ anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
TQTime::currentTime()));
// organizer
@@ -713,7 +713,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
} else {
// just a name
// WTF??? Replacing the spaces of a name and using this as email?
- TQString email = tmpStr.replace( ' ', '.' );
+ TQString email = tmpStr.tqreplace( ' ', '.' );
a = new Attendee(tmpStr,email);
}
@@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
a->setRSVP(vObjectStringZValue(vp));
// is there a status property?
if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
- a->setStatus(readStatus(vObjectStringZValue(vp)));
+ a->seStatus(readStatus(vObjectStringZValue(vp)));
// add the attendee
anEvent->addAttendee(a);
}
@@ -844,7 +844,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
else
anEvent->setPilotId(0);
- if ((vo = isAPropertyOf(vtodo, KPilotStatusProp))) {
+ if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) {
anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
deleteStr(s);
}
@@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
deleteStr(s);
}
else
- anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+ anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
TQTime::currentTime()));
// organizer
@@ -928,7 +928,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
a = new Attendee(0, tmpStr);
} else {
// just a name
- TQString email = tmpStr.replace( ' ', '.' );
+ TQString email = tmpStr.tqreplace( ' ', '.' );
a = new Attendee(tmpStr,email);
}
@@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
a->setRSVP(vObjectStringZValue(vp));
// is there a status property?
if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
- a->setStatus(readStatus(vObjectStringZValue(vp)));
+ a->seStatus(readStatus(vObjectStringZValue(vp)));
// add the attendee
anEvent->addAttendee(a);
}
@@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo)));
deleteStr(s);
// TODO: Define Event status
-// anEvent->setStatus(tmpStr);
+// anEvent->seStatus(tmpStr);
}
else
-// anEvent->setStatus("NEEDS ACTION");
+// anEvent->seStatus("NEEDS ACTION");
#endif
// secrecy
@@ -1310,7 +1310,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
else
anEvent->setPilotId(0);
- if ((vo = isAPropertyOf(vevent, KPilotStatusProp))) {
+ if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) {
anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
deleteStr(s);
}
@@ -1473,7 +1473,7 @@ void VCalFormat::populate(VObject *vcal)
// now, check to see that the object is an event or todo.
if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
- if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) {
+ if ((curVOProp = isAPropertyOf(curVO, KPiloStatusProp)) != 0) {
char *s;
s = fakeCString(vObjectUStringZValue(curVOProp));
// check to see if event was deleted by the kpilot conduit
diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index 0ec8b317b..c84d4c8a7 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -249,12 +249,12 @@ extern "C" {
/* extensions for KOrganizer / KPilot */
#define KPilotIdProp "X-PILOTID"
-#define KPilotStatusProp "X-PILOTSTAT"
+#define KPiloStatusProp "X-PILOTSTAT"
/* extensions for iMIP / iTIP */
#define ICOrganizerProp "X-ORGANIZER"
#define ICMethodProp "X-METHOD"
-#define ICRequestStatusProp "X-REQUEST-STATUS"
+#define ICRequesStatusProp "X-REQUEST-STATUS"
typedef struct VObject VObject;