diff options
Diffstat (limited to 'libkcal/compat.cpp')
| -rw-r--r-- | libkcal/compat.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libkcal/compat.cpp b/libkcal/compat.cpp index a0de0d35a..8268f9785 100644 --- a/libkcal/compat.cpp +++ b/libkcal/compat.cpp @@ -24,13 +24,13 @@ #include <kdebug.h> -#include <qregexp.h> +#include <tqregexp.h> #include "incidence.h" using namespace KCal; -Compat *CompatFactory::createCompat( const QString &productId ) +Compat *CompatFactory::createCompat( const TQString &productId ) { // kdDebug(5800) << "CompatFactory::createCompat(): '" << productId << "'" // << endl; @@ -45,9 +45,9 @@ Compat *CompatFactory::createCompat( const QString &productId ) if ( korg >= 0 ) { int versionStart = productId.find( " ", korg ); if ( versionStart >= 0 ) { - int versionStop = productId.find( QRegExp( "[ /]" ), versionStart + 1 ); + int versionStop = productId.find( TQRegExp( "[ /]" ), versionStart + 1 ); if ( versionStop >= 0 ) { - QString version = productId.mid( versionStart + 1, + TQString version = productId.mid( versionStart + 1, versionStop - versionStart - 1 ); // kdDebug(5800) << "Found KOrganizer version: " << version << endl; @@ -55,7 +55,7 @@ Compat *CompatFactory::createCompat( const QString &productId ) version.section( ".", 1, 1 ).toInt() * 100 + version.section( ".", 2, 2 ).toInt(); int releaseStop = productId.find( "/", versionStop ); - QString release; + TQString release; if ( releaseStop > versionStop ) { release = productId.mid( versionStop+1, releaseStop-versionStop-1 ); } @@ -95,9 +95,9 @@ void Compat::fixEmptySummary( Incidence *incidence ) // line, move it) if (incidence->summary().isEmpty() && !(incidence->description().isEmpty())) { - QString oldDescription = incidence->description().stripWhiteSpace(); - QString newSummary( oldDescription ); - newSummary.remove( QRegExp("\n.*") ); + TQString oldDescription = incidence->description().stripWhiteSpace(); + TQString newSummary( oldDescription ); + newSummary.remove( TQRegExp("\n.*") ); incidence->setSummary( newSummary ); if ( oldDescription == newSummary ) incidence->setDescription(""); @@ -119,7 +119,7 @@ void CompatPre35::fixRecurrence( Incidence *incidence ) { Recurrence* recurrence = incidence->recurrence(); if (recurrence ) { - QDateTime start( incidence->dtStart() ); + TQDateTime start( incidence->dtStart() ); // kde < 3.5 only had one rrule, so no need to loop over all RRULEs. RecurrenceRule *r = recurrence->defaultRRule(); if ( r && !r->dateMatchesRules( start ) ) { @@ -164,7 +164,7 @@ void CompatPre32::fixRecurrence( Incidence *incidence ) However, as all other applications also got this wrong, we'll just leave it as it is and use the wrong interpretation (was also discussed on ietf-calsify)*/ -void CompatPre31::fixFloatingEnd( QDate &endDate ) +void CompatPre31::fixFloatingEnd( TQDate &endDate ) { endDate = endDate.addDays( 1 ); } @@ -184,7 +184,7 @@ void CompatPre31::fixRecurrence( Incidence *incidence ) // with week start always on a Monday. // Convert this to the number of occurrences. r->setDuration( -1 ); - QDate end( r->startDt().date() ); + TQDate end( r->startDt().date() ); bool doNothing = false; // # of periods: int tmp = ( duration - 1 ) * r->frequency(); @@ -204,7 +204,7 @@ void CompatPre31::fixRecurrence( Incidence *incidence ) break; } if ( !doNothing ) { - duration = r->durationTo( QDateTime( end, QTime( 0, 0, 0 ) ) ); + duration = r->durationTo( TQDateTime( end, TQTime( 0, 0, 0 ) ) ); r->setDuration( duration ); } } @@ -212,11 +212,11 @@ void CompatPre31::fixRecurrence( Incidence *incidence ) /* addYearlyNum */ // Dates were stored as day numbers, with a fiddle to take account of leap years. // Convert the day number to a month. - QValueList<int> days = r->byYearDays(); + TQValueList<int> days = r->byYearDays(); if ( !days.isEmpty() ) { - QValueList<int> months = r->byMonths(); - for ( QValueListConstIterator<int> it = days.begin(); it != days.end(); ++it ) { - int newmonth = QDate( r->startDt().date().year(), 1, 1).addDays( (*it) - 1 ).month(); + 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 ) ) months.append( newmonth ); } |