summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/shared/scalixbase.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kresources/scalix/shared/scalixbase.h
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/scalix/shared/scalixbase.h')
-rw-r--r--kresources/scalix/shared/scalixbase.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index 2db064f79..b837ab03e 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -53,8 +53,8 @@ class ScalixBase {
public:
struct Email {
public:
- Email( const TQString& name = TQString::null,
- const TQString& email = TQString::null )
+ Email( const TQString& name = TQString(),
+ const TQString& email = TQString() )
: displayName( name ), smtpAddress( email )
{
}
@@ -65,7 +65,7 @@ public:
enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
- explicit ScalixBase( const TQString& timezone = TQString::null );
+ explicit ScalixBase( const TQString& timezone = TQString() );
virtual ~ScalixBase();
// Return a string identifying this type
@@ -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 );
@@ -115,7 +115,7 @@ public:
bool load( const TQString& xml );
bool load( TQFile& xml );
- // Load this QDomDocument
+ // Load this TQDomDocument
virtual bool loadXML( const TQDomDocument& xml ) = 0;
// Serialize this object to an XML string
@@ -166,9 +166,9 @@ protected:
TQString mTimeZoneId;
// KPilot synchronization stuff
- bool mHasPilotSyncId, mHasPilotSyncStatus;
+ bool mHasPilotSyncId, mHasPilotSynctqStatus;
unsigned long mPilotSyncId;
- int mPilotSyncStatus;
+ int mPilotSynctqStatus;
};
}