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

7 files changed, 37 insertions, 37 deletions

diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index b4b4b9ebf..60ea25ee0 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -88,8 +88,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -103,8 +103,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -113,7 +113,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -164,7 +164,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -199,7 +199,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -215,7 +215,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -226,7 +226,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -234,7 +234,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index bd02d7bb0..3d34d5c67 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -54,13 +54,13 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
   void fromKMailAddSubresource( const TQString& type, const TQString& resource, const TQString& label );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -78,16 +78,16 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index e239bfb3e..9bd0afb83 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -82,7 +82,7 @@ bool ResourceScalixBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceScalixBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -92,20 +92,20 @@ bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceScalixBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceScalixBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
 
 bool ResourceScalixBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index 803ac47b3..e402e4278 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -78,7 +78,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -93,7 +93,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -115,7 +115,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -127,12 +127,12 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -140,7 +140,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 8fb5177b7..e9a5ab8c8 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,8 +42,8 @@ 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 )
 {
@@ -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
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 0acfb0816..02c9e40f6 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -86,7 +86,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -105,12 +105,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index f7898c14f..d7c575daf 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -89,18 +89,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;