summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/shared
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kresources/scalix/shared
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-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/scalix/shared')
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp4
-rw-r--r--kresources/scalix/shared/scalixbase.cpp32
-rw-r--r--kresources/scalix/shared/scalixbase.h10
3 files changed, 23 insertions, 23 deletions
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index 5f1c36497..c9bfca350 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -41,7 +41,7 @@
#include <kurl.h>
#include <ktempfile.h>
#include <kmessagebox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
using namespace Scalix;
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
TQString ResourceScalixBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- TQString( "kresources/scalix/%1rc" ).arg( type ) );
+ TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
}
bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 0d305c0af..5a23623bc 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::currentDateTime() ),
- mLastModified( TQDateTime::currentDateTime() ),
+ : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+ mLastModified( TQDateTime::tqcurrentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
- mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
+ mHasPilotSyncId( false ), mHasPilotSynctqStatus( false )
{
}
@@ -56,7 +56,7 @@ ScalixBase::~ScalixBase()
void ScalixBase::setFields( const KCal::Incidence* incidence )
{
// So far unhandled KCal::IncidenceBase fields:
- // mPilotID, mSyncStatus, mFloats
+ // mPilotID, mSynctqStatus, 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::currentDateTime();
+ creationDate = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ modified = TQDateTime::tqcurrentDateTime();
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::setPilotSyncStatus( int status )
+void ScalixBase::setPilotSynctqStatus( int status )
{
- mHasPilotSyncStatus = true;
- mPilotSyncStatus = status;
+ mHasPilotSynctqStatus = true;
+ mPilotSynctqStatus = status;
}
-bool ScalixBase::hasPilotSyncStatus() const
+bool ScalixBase::hasPilotSynctqStatus() const
{
- return mHasPilotSyncStatus;
+ return mHasPilotSynctqStatus;
}
-int ScalixBase::pilotSyncStatus() const
+int ScalixBase::pilotSynctqStatus() const
{
- return mPilotSyncStatus;
+ return mPilotSynctqStatus;
}
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" )
- setPilotSyncStatus( element.text().toInt() );
+ setPilotSynctqStatus( 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 ( 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/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index 7bff80a4b..b837ab03e 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 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 );
@@ -166,9 +166,9 @@ protected:
TQString mTimeZoneId;
// KPilot synchronization stuff
- bool mHasPilotSyncId, mHasPilotSyncStatus;
+ bool mHasPilotSyncId, mHasPilotSynctqStatus;
unsigned long mPilotSyncId;
- int mPilotSyncStatus;
+ int mPilotSynctqStatus;
};
}