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

1 files changed, 11 insertions, 11 deletions

diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index dda5ba32..fd4c3b57 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -106,7 +106,7 @@ public:
 
   /// The ResourceKolabBase 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 );
@@ -117,7 +117,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -165,23 +165,23 @@ protected:
 
 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 );
 
 
   /**
      Caller guarantees i is not null.
    */
   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();
@@ -209,7 +209,7 @@ private:
   Kolab::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -223,11 +223,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<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;