diff options
Diffstat (limited to 'libkcal')
| -rw-r--r-- | libkcal/COPYING | 2 | ||||
| -rw-r--r-- | libkcal/calendar.cpp | 6 | ||||
| -rw-r--r-- | libkcal/dndfactory.cpp | 8 | ||||
| -rw-r--r-- | libkcal/icalformat.cpp | 8 | ||||
| -rw-r--r-- | libkcal/resourcecached.cpp | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/libkcal/COPYING b/libkcal/COPYING index 5c8730e0f..21e21126c 100644 --- a/libkcal/COPYING +++ b/libkcal/COPYING @@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure tqlayouts and accessors, and small macros and small inline +structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 9d9b63f4e..a5f919324 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -475,12 +475,12 @@ bool Calendar::deleteIncidence( Incidence *incidence ) if ( beginChange( incidence ) ) { if (incidence->hasRecurrenceID()) { // Delete this event's UID from the tqparent's list of tqchildren - Incidence *tqparentIncidence; + Incidence *parentIncidence; IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - tqparentIncidence = this->incidence(*it); - tqparentIncidence->deleteChildIncidence(incidence->uid()); + parentIncidence = this->incidence(*it); + parentIncidence->deleteChildIncidence(incidence->uid()); } else { // Delete all tqchildren as well diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index fd1ef20d3..9ebae51d4 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -216,7 +216,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime } // All pasted incidences get new uids, must keep track of old uids, - // so we can update child's tqparents + // so we can update child's parents TQMap<TQString,Incidence*> oldUidToNewInc; Incidence::List::ConstIterator it; @@ -233,9 +233,9 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime for ( it = list.constBegin(); it != list.constEnd(); ++it ) { Incidence *inc = *it; if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) { - Incidence *tqparentInc = oldUidToNewInc[inc->relatedToUid()]; - inc->setRelatedToUid( tqparentInc->uid() ); - inc->setRelatedTo( tqparentInc ); + Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()]; + inc->setRelatedToUid( parentInc->uid() ); + inc->setRelatedTo( parentInc ); } else { // not related to anything in the clipboard inc->setRelatedToUid( TQString() ); diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index ce3f8002f..c427b0df2 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -304,9 +304,9 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) IncidenceList il = incidence->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *tqparentIncidence; - tqparentIncidence = calendar->incidence(*it); - il = tqparentIncidence->childIncidences(); + Incidence *parentIncidence; + parentIncidence = calendar->incidence(*it); + il = parentIncidence->childIncidences(); if (il.count() > 0) { for ( it = il.begin(); it != il.end(); ++it ) { component = mImpl->writeIncidence( calendar->incidence(*it) ); @@ -314,7 +314,7 @@ TQString ICalFormat::toString( Incidence *incidence, Calendar *calendar ) icalcomponent_free( component ); } } - component = mImpl->writeIncidence( tqparentIncidence ); + component = mImpl->writeIncidence( parentIncidence ); text = text + TQString::fromUtf8( icalcomponent_as_ical_string( component ) ); icalcomponent_free( component ); } diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 09d1eef7b..82732bab1 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -523,10 +523,10 @@ void ResourceCached::calendarIncidenceDeleted( Incidence *i ) IncidenceList il = i->childIncidences(); IncidenceListIterator it; it = il.begin(); - Incidence *tqparentIncidence; - tqparentIncidence = this->incidence(*it); + Incidence *parentIncidence; + parentIncidence = this->incidence(*it); // Remove the child - calendarIncidenceChanged(tqparentIncidence); + calendarIncidenceChanged(parentIncidence); } else { TQMap<Incidence *,bool>::ConstIterator it; |