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.cpp | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kresources/scalix/kabc/resourcescalix.cpp') diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp index 31ccdf2c9..55b2ed2ec 100644 --- a/kresources/scalix/kabc/resourcescalix.cpp +++ b/kresources/scalix/kabc/resourcescalix.cpp @@ -155,7 +155,7 @@ void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket ) TQString KABC::ResourceScalix::loadContact( const TQString& contactData, const TQString& subResource, - Q_UINT32 sernum, + TQ_UINT32 sernum, KMailICalIface::StorageFormat ) { KABC::Addressee addr = Contact::fromXml( contactData ); @@ -204,7 +204,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, } for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) { - TQMap lst; + TQMap lst; if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) { kdError() << "Communication problem in ResourceScalix::load()\n"; @@ -213,7 +213,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, return false; } - for( TQMap::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + for( TQMap::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { loadContact( it.data(), subResource, it.key(), format ); } if ( progressId ) { @@ -316,7 +316,7 @@ bool KABC::ResourceScalix::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 ) ) { @@ -377,7 +377,7 @@ void KABC::ResourceScalix::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 ); @@ -414,7 +414,7 @@ void KABC::ResourceScalix::removeAddressee( const Addressee& addr ) */ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type, const TQString& subResource, - Q_UINT32 sernum, + TQ_UINT32 sernum, int format, const TQString& contactXML ) { @@ -429,8 +429,8 @@ bool KABC::ResourceScalix::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 ); @@ -451,11 +451,11 @@ void KABC::ResourceScalix::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 ); @@ -483,7 +483,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type, { if( type != s_kmailContentsType ) return; - if ( mSubResources.contains( subResource ) ) + if ( mSubResources.tqcontains( subResource ) ) // Already registered return; @@ -500,7 +500,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type, { if( type != s_kmailContentsType ) return; - if ( !mSubResources.contains( subResource ) ) + if ( !mSubResources.tqcontains( subResource ) ) // Not registered return; @@ -535,13 +535,13 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type, -void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap& map, +void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap& map, const TQString& /* type */, const TQString& folder ) { // FIXME KMailICalIface::StorageFormat format = KMailICalIface::StorageXML; - for( TQMap::ConstIterator it = map.begin(); it != map.end(); ++it ) { + for( TQMap::ConstIterator it = map.begin(); it != map.end(); ++it ) { loadContact( it.data(), folder, it.key(), format ); } if ( !addressBook() ){ @@ -557,7 +557,7 @@ TQStringList KABC::ResourceScalix::subresources() const bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const { - if ( mSubResources.contains( subresource ) ) { + if ( mSubResources.tqcontains( subresource ) ) { return mSubResources[ subresource ].active(); } @@ -569,7 +569,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const { - if ( mSubResources.contains( subresource ) ) { + if ( mSubResources.tqcontains( subresource ) ) { return mSubResources[ subresource ].writable(); } return false; //better a safe default @@ -577,7 +577,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const { - if ( mSubResources.contains( subresource ) ) { + if ( mSubResources.tqcontains( subresource ) ) { return mSubResources[ subresource ].completionWeight(); } @@ -588,7 +588,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const { - if ( mSubResources.contains( subresource ) ) { + if ( mSubResources.tqcontains( subresource ) ) { return mSubResources[ subresource ].label(); } @@ -598,7 +598,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c void KABC::ResourceScalix::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; @@ -617,7 +617,7 @@ TQMap KABC::ResourceScalix::uidToResourceMap() const void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active ) { - if ( mSubResources.contains( subresource ) ) { + if ( mSubResources.tqcontains( subresource ) ) { mSubResources[ subresource ].setActive( active ); load(); } else { -- cgit v1.2.1