From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/scalix/kabc/resourcescalix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kresources/scalix/kabc/resourcescalix.h') diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 25eca7e49..70eb7c92b 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -112,12 +112,12 @@ public: void fromKMailDelSubresource( const TQString& type, const TQString& id ); bool fromKMailAddIncidence( const TQString& type, const TQString& resource, - Q_UINT32 sernum, int format, const TQString& contact ); + TQ_UINT32 sernum, int format, const TQString& contact ); void fromKMailDelIncidence( const TQString& type, const TQString& resource, const TQString& contact ); void fromKMailRefresh( const TQString& type, const TQString& resource ); - void fromKMailAsyncLoadResult( const TQMap& map, + void fromKMailAsyncLoadResult( const TQMap& map, const TQString& type, const TQString& folder ); @@ -153,7 +153,7 @@ protected: bool loadSubResource( const TQString& subResource ); bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format ); TQString loadContact( const TQString& contactData, const TQString& subResource, - Q_UINT32 sernum, const KMailICalIface::StorageFormat format ); + TQ_UINT32 sernum, const KMailICalIface::StorageFormat format ); TQString configFile() const { return Scalix::ResourceScalixBase::configFile( "kabc" ); -- cgit v1.2.1