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

4 files changed, 36 insertions, 36 deletions

diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 26a91e679..e3032d118 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -57,7 +57,7 @@ Contact::Contact( const KABC::Addressee* addr )
 }
 
 // loading (xml->addressee)
-Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
   : mHasGeo( false )
 {
   load( xml );
@@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const
       writeString( element, (*it).name, (*it).value );
     } else {
       // skip writing the freebusyurl as it is a hack we need to remove eventually
-      if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) {
+      if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) {
         continue;
       }
 
@@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   //    (includes e.g. crypto settings, and extra im addresses)
   TQStringList knownCustoms;
   for ( const char** p = s_knownCustomFields; *p; ++p )
-    knownCustoms << TQString::fromLatin1( *p );
+    knownCustoms << TQString::tqfromLatin1( *p );
   TQStringList customs = addressee->customs();
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
@@ -1124,7 +1124,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
-    if ( !knownCustoms.contains( name ) ) {
+    if ( !knownCustoms.tqcontains( name ) ) {
       //kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
       Custom c;
       if ( app != "KADDRESSBOOK" ) // that's the default
@@ -1162,8 +1162,8 @@ void Contact::saveTo( KABC::Addressee* addressee )
     for ( ; mit != mDistrListMembers.end(); ++mit ) {
       TQString displayName = (*mit).displayName;
       // fixup the display name DistributionList::assumes neither ',' nor ';' is present
-      displayName.replace( ',', ' ' );
-      displayName.replace( ';', ' ' );
+      displayName.tqreplace( ',', ' ' );
+      displayName.tqreplace( ';', ' ' );
       distrList.insertEntry( displayName, (*mit).email );
     }
     addressee->insertCustom( "KADDRESSBOOK", "DistributionList", distrList.custom( "KADDRESSBOOK", "DistributionList" ) );
@@ -1253,13 +1253,13 @@ void Contact::saveTo( KABC::Addressee* addressee )
   }
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
-    TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
+    TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app;
     addressee->insertCustom( app, (*it).name, (*it).value );
   }
   //kdDebug(5006) << addressee->customs() << endl;
 }
 
-TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQImage img;
   KURL url;
@@ -1285,7 +1285,7 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   return img;
 }
 
-TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQByteArray data;
   KURL url;
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index a9465642f..66a7c418a 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -69,7 +69,7 @@ public:
   };
 
   explicit Contact( const KABC::Addressee* address );
-  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   ~Contact();
 
   void saveTo( KABC::Addressee* address );
@@ -221,10 +221,10 @@ private:
   void loadDistrListMember( const TQDomElement& element );
   void saveDistrListMembers( TQDomElement& element ) const;
 
-  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQImage loadPictureFromAddressee( const KABC::Picture& picture );
 
-  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
 
   TQString productID() const;
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ae8e225fb..e9c481bfb 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -151,7 +151,7 @@ void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat format )
 {
   KABC::Addressee addr;
@@ -215,7 +215,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
     for ( int indexFormat = 0; indexFormat < 3; ++indexFormat ) {
       const char* mimetype = s_formats[indexFormat].mimetype;
       KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
-      TQMap<Q_UINT32, TQString> lst;
+      TQMap<TQ_UINT32, TQString> lst;
       if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
         kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
         if ( progressId )
@@ -223,7 +223,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
         return false;
       }
 
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         loadContact( it.data(), subResource, it.key(), format );
       }
 
@@ -334,7 +334,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -416,7 +416,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -453,7 +453,7 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -468,8 +468,8 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -490,11 +490,11 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -523,7 +523,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -540,7 +540,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -575,13 +575,13 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -597,7 +597,7 @@ TQStringList KABC::ResourceKolab::subresources() const
 
 bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -609,7 +609,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 
 bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -617,7 +617,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
 
 int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -628,7 +628,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
 
 TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -638,7 +638,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -657,7 +657,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
 
 void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 9158375a1..2288bf258 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.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<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -158,7 +158,7 @@ protected:
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   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 Kolab::ResourceKolabBase::configFile( "kabc" );