From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/kolab/kcal/incidence.cpp | 2 +- kresources/kolab/kcal/resourcekolab.cpp | 16 ++++++++-------- kresources/kolab/knotes/note.cpp | 2 +- kresources/kolab/shared/kolabbase.cpp | 10 +++++----- kresources/kolab/shared/resourcekolabbase.cpp | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kresources/kolab') diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp index 0d99780a4..602321795 100644 --- a/kresources/kolab/kcal/incidence.cpp +++ b/kresources/kolab/kcal/incidence.cpp @@ -1030,7 +1030,7 @@ void Incidence::loadAttachments() TQString Incidence::productID() const { - return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion ); + return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion ); } // Unhandled KCal::Incidence fields: diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index 59f6a3558..da2cee412 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre addedIncidence = inc; } else if ( result == 0 ) { // take both addedIncidence = inc; - addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) ); + addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) ); addedIncidence->setUid( CalFormat::createUniqueId() ); localIncidence = local; } @@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s } text += "
"; if ( !incidence->summary().isEmpty() ) - text += i18n( "Summary: %1" ).arg( incidence->summary() ) + "
"; + text += i18n( "Summary: %1" ).tqarg( incidence->summary() ) + "
"; if ( !incidence->location().isEmpty() ) - text += i18n( "Location: %1" ).arg( incidence->location() ); + text += i18n( "Location: %1" ).tqarg( incidence->location() ); text += "
"; if ( !incidence->doesFloat() ) text += i18n( "Start: %1, %2" ) - .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); + .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); else - text += i18n( "Start: %1" ).arg( incidence->dtStartDateStr() ); + text += i18n( "Start: %1" ).tqarg( incidence->dtStartDateStr() ); text += "
"; if ( incidence->type() == "Event" ) { Event* event = static_cast( incidence ); if ( event->hasEndDate() ) { if ( !event->doesFloat() ) { text += i18n( "End: %1, %2" ) - .arg( event->dtEndDateStr(), event->dtEndTimeStr() ); + .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() ); } else { - text += i18n( "End: %1" ).arg( event->dtEndDateStr() ); + text += i18n( "End: %1" ).tqarg( event->dtEndDateStr() ); } } text += "
"; @@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s /* Will be needed when kmail triggers a delete, so we don't delete the inocent * incidence that's sharing the uid with this one */ - mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid; + mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid; } } /* Add to the cache if the add didn't come from KOrganizer, in which case diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp index e456e43be..ea5f6b285 100644 --- a/kresources/kolab/knotes/note.cpp +++ b/kresources/kolab/knotes/note.cpp @@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal ) TQString Note::productID() const { - return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION ); + return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION ); } diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp index cb04d12be..3341ee35f 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/kresources/kolab/shared/kolabbase.cpp @@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree() TQString KolabBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( TQt::ISODate ) + 'Z'; + return time.toString( Qt::ISODate ) + 'Z'; } TQString KolabBase::dateToString( const TQDate& date ) { - return date.toString( TQt::ISODate ); + return date.toString( Qt::ISODate ); } TQDateTime KolabBase::stringToDateTime( const TQString& _date ) @@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date ) //Deal with data from some clients that always append a Z to dates. if ( date.endsWith( "ZZ" ) ) date.truncate( date.length() - 2 ); - //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found. + //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found. else if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, TQt::ISODate ); + return TQDateTime::fromString( date, Qt::ISODate ); } TQDate KolabBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, TQt::ISODate ); + return TQDate::fromString( date, Qt::ISODate ); } TQString KolabBase::sensitivityToString( Sensitivity s ) diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index cf81f4518..90464b6b0 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -126,8 +126,8 @@ static TQString plainTextBody() " Groupware format.\nFor a list of such email clients please" " visit\n%1" ); const char * url = "http://www.kolab.org/kolab2-clients.html"; - TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url ); - TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url ); + TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).tqarg( url ); + TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url ); if ( firstPartText != firstPartTextUntranslated ) { firstPartText.append("\n\n-----------------------------------------------------\n\n"); firstPartText.append( firstPartTextUntranslated ); @@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource, TQString ResourceKolabBase::configFile( const TQString& type ) const { return locateLocal( "config", - TQString( "kresources/kolab/%1rc" ).arg( type ) ); + TQString( "kresources/kolab/%1rc" ).tqarg( type ) ); } bool ResourceKolabBase::connectToKMail() const -- cgit v1.2.1