summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/shared
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/kolab/shared')
-rw-r--r--kresources/kolab/shared/kolabbase.cpp32
-rw-r--r--kresources/kolab/shared/kolabbase.h10
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp8
3 files changed, 25 insertions, 25 deletions
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index 09ec2cd6b..a0f32529f 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::tqcurrentDateTime() ),
- mLastModified( TQDateTime::tqcurrentDateTime() ),
+ : mCreationDate( TQDateTime::currentDateTime() ),
+ mLastModified( TQDateTime::currentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
- mHasPilotSyncId( false ), mHasPilotSynctqStatus( false )
+ mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
{
}
@@ -58,7 +58,7 @@ KolabBase::~KolabBase()
void KolabBase::setFields( const KCal::Incidence* incidence )
{
// So far unhandled KCal::IncidenceBase fields:
- // mPilotID, mSynctqStatus, mFloats
+ // mPilotID, mSyncStatus, 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::tqcurrentDateTime();
+ creationDate = TQDateTime::currentDateTime();
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::tqcurrentDateTime();
+ modified = TQDateTime::currentDateTime();
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::setPilotSynctqStatus( int status )
+void KolabBase::setPilotSyncStatus( int status )
{
- mHasPilotSynctqStatus = true;
- mPilotSynctqStatus = status;
+ mHasPilotSyncStatus = true;
+ mPilotSyncStatus = status;
}
-bool KolabBase::hasPilotSynctqStatus() const
+bool KolabBase::hasPilotSyncStatus() const
{
- return mHasPilotSynctqStatus;
+ return mHasPilotSyncStatus;
}
-int KolabBase::pilotSynctqStatus() const
+int KolabBase::pilotSyncStatus() const
{
- return mPilotSynctqStatus;
+ return mPilotSyncStatus;
}
bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element )
return true;
}
if ( tagName == "pilot-sync-status" ) {
- setPilotSynctqStatus( element.text().toInt() );
+ setPilotSyncStatus( 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 ( hasPilotSynctqStatus() )
- writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
+ if ( hasPilotSyncStatus() )
+ writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
return true;
}
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index d4621c722..294a7d81b 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 setPilotSynctqStatus( int status );
- virtual bool hasPilotSynctqStatus() const;
- virtual int pilotSynctqStatus() const;
+ virtual void setPilotSyncStatus( int status );
+ virtual bool hasPilotSyncStatus() const;
+ virtual int pilotSyncStatus() const;
// String - Date conversion methods
static TQString dateTimeToString( const TQDateTime& time );
@@ -167,9 +167,9 @@ protected:
TQString mTimeZoneId;
// KPilot synchronization stuff
- bool mHasPilotSyncId, mHasPilotSynctqStatus;
+ bool mHasPilotSyncId, mHasPilotSyncStatus;
unsigned long mPilotSyncId;
- int mPilotSynctqStatus;
+ int mPilotSyncStatus;
};
}
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index a357b0d62..a56383af8 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 <tqtextstream.h>
+#include <textstream.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::tqfromLatin1( firstPartTextToTranslate ).tqarg( url );
- TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url );
+ TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+ TQString firstPartText = i18n( firstPartTextToTranslate ).arg( 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" ).tqarg( type ) );
+ TQString( "kresources/kolab/%1rc" ).arg( type ) );
}
bool ResourceKolabBase::connectToKMail() const