summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/shared
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/scalix/shared')
-rw-r--r--kresources/scalix/shared/scalixbase.cpp32
-rw-r--r--kresources/scalix/shared/scalixbase.h10
2 files changed, 21 insertions, 21 deletions
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 5a23623bc..0d305c0af 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,10 +42,10 @@ using namespace Scalix;
ScalixBase::ScalixBase( 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 )
{
}
@@ -56,7 +56,7 @@ ScalixBase::~ScalixBase()
void ScalixBase::setFields( const KCal::Incidence* incidence )
{
// So far unhandled KCal::IncidenceBase fields:
- // mPilotID, mSynctqStatus, mFloats
+ // mPilotID, mSyncStatus, mFloats
setUid( incidence->uid() );
setBody( incidence->description() );
@@ -92,7 +92,7 @@ void ScalixBase::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 {
@@ -101,7 +101,7 @@ void ScalixBase::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
@@ -231,20 +231,20 @@ unsigned long ScalixBase::pilotSyncId() const
return mPilotSyncId;
}
-void ScalixBase::setPilotSynctqStatus( int status )
+void ScalixBase::setPilotSyncStatus( int status )
{
- mHasPilotSynctqStatus = true;
- mPilotSynctqStatus = status;
+ mHasPilotSyncStatus = true;
+ mPilotSyncStatus = status;
}
-bool ScalixBase::hasPilotSynctqStatus() const
+bool ScalixBase::hasPilotSyncStatus() const
{
- return mHasPilotSynctqStatus;
+ return mHasPilotSyncStatus;
}
-int ScalixBase::pilotSynctqStatus() const
+int ScalixBase::pilotSyncStatus() const
{
- return mPilotSynctqStatus;
+ return mPilotSyncStatus;
}
bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -300,7 +300,7 @@ bool ScalixBase::loadAttribute( TQDomElement& element )
else if ( tagName == "pilot-sync-id" )
setPilotSyncId( element.text().toULong() );
else if ( tagName == "pilot-sync-status" )
- setPilotSynctqStatus( element.text().toInt() );
+ setPilotSyncStatus( element.text().toInt() );
else
return false;
@@ -320,8 +320,8 @@ bool ScalixBase::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/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index b837ab03e..7bff80a4b 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -93,9 +93,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 );
@@ -166,9 +166,9 @@ protected:
TQString mTimeZoneId;
// KPilot synchronization stuff
- bool mHasPilotSyncId, mHasPilotSynctqStatus;
+ bool mHasPilotSyncId, mHasPilotSyncStatus;
unsigned long mPilotSyncId;
- int mPilotSynctqStatus;
+ int mPilotSyncStatus;
};
}