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/kolab/knotes/resourcekolab.cpp | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'kresources/kolab/knotes/resourcekolab.cpp') diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index d917d0ac2..38f670871 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar"; ResourceKolab::ResourceKolab( const KConfig *config ) : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ), - mCalendar( TQString::fromLatin1("UTC") ) + mCalendar( TQString::tqfromLatin1("UTC") ) { if ( !config ) { setResourceName( i18n( "Kolab Server" ) ); @@ -105,7 +105,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, return false; } - TQMap lst; + TQMap lst; if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) { kdError(5500) << "Communication problem in " << "ResourceKolab::getIncidenceList()\n"; @@ -117,7 +117,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, // Populate with the new entries const bool silent = mSilent; mSilent = true; - TQMap::ConstIterator it; + TQMap::ConstIterator it; for ( it = lst.constBegin(); it != lst.constEnd(); ++it ) { KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype ); if ( !journal ) @@ -164,7 +164,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal ) } KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource, - Q_UINT32 sernum, const TQString &mimetype ) + TQ_UINT32 sernum, const TQString &mimetype ) { KCal::Journal *journal = 0; @@ -178,12 +178,12 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub Q_ASSERT( journal ); bool addedOk = journal && - !mUidMap.contains( journal->uid() ) && + !mUidMap.tqcontains( journal->uid() ) && addNote( journal, subresource, sernum ); // for debugging - if ( journal && mUidMap.contains( journal->uid() ) ) { - kdDebug(5500) << "mUidMap already contains " << journal->uid() << endl; + if ( journal && mUidMap.tqcontains( journal->uid() ) ) { + kdDebug(5500) << "mUidMap already tqcontains " << journal->uid() << endl; } if ( !addedOk ) { @@ -194,7 +194,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub return journal; } -bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, Q_UINT32 sernum ) +bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, TQ_UINT32 sernum ) { kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n"; @@ -232,7 +232,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource bool ResourceKolab::deleteNote( KCal::Journal* journal ) { const TQString uid = journal->uid(); - if ( !mUidMap.contains( uid ) ) + if ( !mUidMap.tqcontains( uid ) ) // Odd return false; @@ -270,8 +270,8 @@ KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from, const TQDateTim void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i ) { TQString subResource; - Q_UINT32 sernum; - if ( mUidMap.contains( i->uid() ) ) { + TQ_UINT32 sernum; + if ( mUidMap.tqcontains( i->uid() ) ) { subResource = mUidMap[ i->uid() ].resource(); sernum = mUidMap[ i->uid() ].serialNumber(); } else { // can this happen? @@ -293,7 +293,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i ) */ bool ResourceKolab::fromKMailAddIncidence( const TQString& type, const TQString& subResource, - Q_UINT32 sernum, + TQ_UINT32 sernum, int format, const TQString& note ) { @@ -352,7 +352,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type, // Not ours return; - if ( mSubResources.contains( subResource ) ) + if ( mSubResources.tqcontains( subResource ) ) // Already registered return; @@ -372,7 +372,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type, // Not ours return; - if ( !mSubResources.contains( subResource ) ) + if ( !mSubResources.tqcontains( subResource ) ) // Not registered return; @@ -408,7 +408,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type, emit signalSubresourceRemoved( this, type, subResource ); } -void ResourceKolab::fromKMailAsyncLoadResult( const TQMap& map, +void ResourceKolab::fromKMailAsyncLoadResult( const TQMap& map, const TQString& type, const TQString& folder ) { @@ -422,7 +422,7 @@ void ResourceKolab::fromKMailAsyncLoadResult( const TQMap& m mimetype = attachmentMimeType; else mimetype = inlineMimeType; - for( TQMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) { + for( TQMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) { KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype ); if ( !journal ) kdDebug(5500) << "loading note " << it.key() << " failed" << endl; @@ -440,7 +440,7 @@ TQStringList ResourceKolab::subresources() const bool ResourceKolab::subresourceActive( const TQString& res ) const { - if ( mSubResources.contains( res ) ) { + if ( mSubResources.tqcontains( res ) ) { return mSubResources[ res ].active(); } @@ -452,7 +452,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const bool ResourceKolab::subresourceWritable( const TQString& res ) const { - if ( mSubResources.contains( res ) ) { + if ( mSubResources.tqcontains( res ) ) { return mSubResources[ res ].writable(); } -- cgit v1.2.1