summaryrefslogtreecommitdiffstats
path: root/libkcal/icalformat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal/icalformat.cpp')
-rw-r--r--libkcal/icalformat.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 76898ec09..8c1cd3b0b 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -267,7 +267,7 @@ TQString ICalFormat::toString( Calendar *cal )
if (!text) {
setException(new ErrorFormat(ErrorFormat::SaveError,
i18n("libical error")));
- return TQString::null;
+ return TQString();
}
return text;
@@ -298,15 +298,15 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar )
icalcomponent *component;
TQString text = "";
- // See if there are any parent or child events that must be added to the string
+ // See if there are any tqparent or child events that must be added to the string
if ( incidence->hasRecurrenceID() ) {
- // Get the parent
+ // Get the tqparent
IncidenceList il = incidence->childIncidences();
IncidenceListIterator it;
it = il.begin();
- Incidence *parentIncidence;
- parentIncidence = calendar->incidence(*it);
- il = parentIncidence->childIncidences();
+ Incidence *tqparentIncidence;
+ tqparentIncidence = calendar->incidence(*it);
+ il = tqparentIncidence->childIncidences();
if (il.count() > 0) {
for ( it = il.begin(); it != il.end(); ++it ) {
component = mImpl->writeIncidence( calendar->incidence(*it) );
@@ -314,12 +314,12 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar )
icalcomponent_free( component );
}
}
- component = mImpl->writeIncidence( parentIncidence );
+ component = mImpl->writeIncidence( tqparentIncidence );
text = text + TQString::fromUtf8( icalcomponent_as_ical_string( component ) );
icalcomponent_free( component );
}
else {
- // This incidence is a potential parent
+ // This incidence is a potential tqparent
IncidenceList il = incidence->childIncidences();
if (il.count() > 0) {
IncidenceListIterator it;
@@ -377,7 +377,7 @@ TQString ICalFormat::createScheduleMessage(IncidenceBase *incidence,
// We have a separation of scheduling ID and UID
i = i->clone();
i->setUid( i->schedulingID() );
- i->setSchedulingID( TQString::null );
+ i->setSchedulingID( TQString() );
// Build the message with the cloned incidence
message = mImpl->createScheduleComponent( i, method );
@@ -577,7 +577,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
kdDebug(5800) << "ICalFormat::parseScheduleMessage() returning..." << endl;
kdDebug(5800) << "ICalFormat::parseScheduleMessage(), result = " << result << endl;
- ScheduleMessage::Status status;
+ ScheduleMessage::tqStatus status;
switch (result) {
case ICAL_XLICCLASS_PUBLISHNEW: