diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kresources/kolab/shared | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kresources/kolab/shared')
-rw-r--r-- | kresources/kolab/shared/kolabbase.cpp | 32 | ||||
-rw-r--r-- | kresources/kolab/shared/kolabbase.h | 10 | ||||
-rw-r--r-- | kresources/kolab/shared/resourcekolabbase.cpp | 8 |
3 files changed, 25 insertions, 25 deletions
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp index a0f32529f..09ec2cd6b 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/kresources/kolab/shared/kolabbase.cpp @@ -44,10 +44,10 @@ using namespace Kolab; KolabBase::KolabBase( const TQString& tz ) - : mCreationDate( TQDateTime::currentDateTime() ), - mLastModified( TQDateTime::currentDateTime() ), + : mCreationDate( TQDateTime::tqcurrentDateTime() ), + mLastModified( TQDateTime::tqcurrentDateTime() ), mSensitivity( Public ), mTimeZoneId( tz ), - mHasPilotSyncId( false ), mHasPilotSyncStatus( false ) + mHasPilotSyncId( false ), mHasPilotSynctqStatus( false ) { } @@ -58,7 +58,7 @@ KolabBase::~KolabBase() void KolabBase::setFields( const KCal::Incidence* incidence ) { // So far unhandled KCal::IncidenceBase fields: - // mPilotID, mSyncStatus, mFloats + // mPilotID, mSynctqStatus, mFloats setUid( incidence->uid() ); setBody( incidence->description() ); @@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) kdDebug(5006) << "Creation time string: " << creationString << endl; TQDateTime creationDate; if ( creationString.isEmpty() ) { - creationDate = TQDateTime::currentDateTime(); + creationDate = TQDateTime::tqcurrentDateTime(); kdDebug(5006) << "Creation date set to current time\n"; } else { @@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee ) } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) - modified = TQDateTime::currentDateTime(); + modified = TQDateTime::tqcurrentDateTime(); setLastModified( modified ); if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation @@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const return mPilotSyncId; } -void KolabBase::setPilotSyncStatus( int status ) +void KolabBase::setPilotSynctqStatus( int status ) { - mHasPilotSyncStatus = true; - mPilotSyncStatus = status; + mHasPilotSynctqStatus = true; + mPilotSynctqStatus = status; } -bool KolabBase::hasPilotSyncStatus() const +bool KolabBase::hasPilotSynctqStatus() const { - return mHasPilotSyncStatus; + return mHasPilotSynctqStatus; } -int KolabBase::pilotSyncStatus() const +int KolabBase::pilotSynctqStatus() const { - return mPilotSyncStatus; + return mPilotSynctqStatus; } bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email ) @@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element ) return true; } if ( tagName == "pilot-sync-status" ) { - setPilotSyncStatus( element.text().toInt() ); + setPilotSynctqStatus( element.text().toInt() ); return true; } break; @@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const writeString( element, "sensitivity", sensitivityToString( sensitivity() ) ); if ( hasPilotSyncId() ) writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) ); - if ( hasPilotSyncStatus() ) - writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) ); + if ( hasPilotSynctqStatus() ) + writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) ); return true; } diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h index 294a7d81b..d4621c722 100644 --- a/kresources/kolab/shared/kolabbase.h +++ b/kresources/kolab/shared/kolabbase.h @@ -94,9 +94,9 @@ public: virtual bool hasPilotSyncId() const; virtual unsigned long pilotSyncId() const; - virtual void setPilotSyncStatus( int status ); - virtual bool hasPilotSyncStatus() const; - virtual int pilotSyncStatus() const; + virtual void setPilotSynctqStatus( int status ); + virtual bool hasPilotSynctqStatus() const; + virtual int pilotSynctqStatus() const; // String - Date conversion methods static TQString dateTimeToString( const TQDateTime& time ); @@ -167,9 +167,9 @@ protected: TQString mTimeZoneId; // KPilot synchronization stuff - bool mHasPilotSyncId, mHasPilotSyncStatus; + bool mHasPilotSyncId, mHasPilotSynctqStatus; unsigned long mPilotSyncId; - int mPilotSyncStatus; + int mPilotSynctqStatus; }; } diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp index a56383af8..a357b0d62 100644 --- a/kresources/kolab/shared/resourcekolabbase.cpp +++ b/kresources/kolab/shared/resourcekolabbase.cpp @@ -42,7 +42,7 @@ #include <kurl.h> #include <ktempfile.h> #include <kmessagebox.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> using namespace Kolab; @@ -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::fromLatin1( 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 |