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/kcal/resourcescalix.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kresources/scalix/kcal/resourcescalix.h') diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h index 11baa5ec..e00909c7 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/kresources/scalix/kcal/resourcescalix.h @@ -105,7 +105,7 @@ public: /// The ResourceScalixBase methods called by KMail bool fromKMailAddIncidence( const TQString& type, const TQString& subResource, - Q_UINT32 sernum, int format, const TQString& data ); + TQ_UINT32 sernum, int format, const TQString& data ); void fromKMailDelIncidence( const TQString& type, const TQString& subResource, const TQString& uid ); void fromKMailRefresh( const TQString& type, const TQString& subResource ); @@ -115,7 +115,7 @@ public: const TQString& label, bool writable ); void fromKMailDelSubresource( const TQString& type, const TQString& subResource ); - void fromKMailAsyncLoadResult( const TQMap& map, + void fromKMailAsyncLoadResult( const TQMap& map, const TQString& type, const TQString& folder ); @@ -141,20 +141,20 @@ protected slots: private: void removeIncidences( const TQCString& incidenceType ); - void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum ); + void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum ); void addIncidence( const char* mimetype, const TQString& xml, - const TQString& subResource, Q_UINT32 sernum ); + const TQString& subResource, TQ_UINT32 sernum ); bool addIncidence( KCal::Incidence* i, const TQString& subresource, - Q_UINT32 sernum ); + TQ_UINT32 sernum ); /* void addEvent( const TQString& xml, const TQString& subresource, - Q_UINT32 sernum ); + TQ_UINT32 sernum ); void addTodo( const TQString& xml, const TQString& subresource, - Q_UINT32 sernum ); + TQ_UINT32 sernum ); void addJournal( const TQString& xml, const TQString& subresource, - Q_UINT32 sernum ); + TQ_UINT32 sernum ); */ bool loadAllEvents(); @@ -180,7 +180,7 @@ private: Scalix::ResourceMap* subResourceMap( const TQString& contentsType ); bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource, - Q_UINT32 sernum ); + TQ_UINT32 sernum ); KCal::CalendarLocal mCalendar; @@ -194,11 +194,11 @@ private: ICalFormat mFormat; /** - This map contains the association between a new added incidence + This map tqcontains the association between a new added incidence and the subresource it belongs to. That's needed to return the correct mapping in subresourceIdentifier(). - We can't trust on mUidMap here, because it contains only non-pending uids. + We can't trust on mUidMap here, because it tqcontains only non-pending uids. */ TQMap mNewIncidencesMap; int mProgressDialogIncidenceLimit; -- cgit v1.2.3