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/slox/kabcresourceslox.cpp | 10 +++++----- kresources/slox/kcalresourceslox.cpp | 12 ++++++------ kresources/slox/sloxaccounts.cpp | 2 +- kresources/slox/sloxbase.h | 2 +- kresources/slox/sloxfolderdialog.cpp | 2 +- kresources/slox/webdavhandler.cpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kresources/slox') diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 16d5aced5..433a6adb0 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -218,7 +218,7 @@ bool ResourceSlox::asyncLoad() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelDownload() ) ); - mPrefs->setLastSync( TQDateTime::currentDateTime() ); + mPrefs->setLastSync( TQDateTime::tqcurrentDateTime() ); return true; } @@ -269,7 +269,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) a.setResource( this ); a.setChanged( false ); - mAddrMap.replace( a.uid(), a ); + mAddrMap.tqreplace( a.uid(), a ); // TODO: Do we need to try to associate addressees with slox accounts? @@ -306,7 +306,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job ) TQValueList::ConstIterator it; for( it = items.begin(); it != items.end(); ++it ) { SloxItem item = *it; - if ( !item.response.contains( "200" ) ) { + if ( !item.response.tqcontains( "200" ) ) { savingError( this, item.response + "\n" + item.responseDescription ); continue; } @@ -320,7 +320,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job ) a.setUid( "kresources_slox_kabc_" + item.sloxId ); a.setResource( this ); a.setChanged( false ); - mAddrMap.replace( a.uid(), a ); + mAddrMap.tqreplace( a.uid(), a ); saveCache(); } } @@ -603,7 +603,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop else pnSaveMap = mPhoneNumberSloxMap; for ( PhoneNumber::List::ConstIterator it = pnlist.begin() ; it != pnlist.end(); ++it ) { - if ( pnSaveMap.contains( (*it).type() ) ) { + if ( pnSaveMap.tqcontains( (*it).type() ) ) { TQStringList l = pnSaveMap[(*it).type()]; TQString fn = l.first(); l.remove( l.begin() ); diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index edd13e6f9..668631d37 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoadEvents() ) ); - mPrefs->setLastEventSync( TQDateTime::currentDateTime() ); + mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() ); } void KCalResourceSlox::requestTodos() @@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos() TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), TQT_SLOT( cancelLoadTodos() ) ); - mPrefs->setLastTodoSync( TQDateTime::currentDateTime() ); + mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() ); } void KCalResourceSlox::uploadIncidences() @@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e, TQString status = memberElement.attribute( "confirm" ); if ( !status.isEmpty() ) { if ( status == "accept" ) { - a->setStatus( Attendee::Accepted ); + a->seStatus( Attendee::Accepted ); } else if ( status == "decline" ) { - a->setStatus( Attendee::Declined ); + a->seStatus( Attendee::Declined ); } else { - a->setStatus( Attendee::NeedsAction ); + a->seStatus( Attendee::NeedsAction ); } } } else { @@ -1113,7 +1113,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job ) if ( !status.isNull() ) { TQDomElement statusElement = status.toElement(); TQString response = statusElement.text(); - if ( !response.contains( "200" ) ) { + if ( !response.tqcontains( "200" ) ) { TQString error = "'" + mUploadedIncidence->summary() + "'\n"; error += response; TQDomNode dn = propstat.namedItem( "responsedescription" ); diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp index a32df5fa2..a49594ea7 100644 --- a/kresources/slox/sloxaccounts.cpp +++ b/kresources/slox/sloxaccounts.cpp @@ -65,7 +65,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a ) { kdDebug() << "SloxAccount::insertUser() " << id << endl; - mUsers.replace( id, a ); + mUsers.tqreplace( id, a ); TQString email = a.preferredEmail(); diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h index 7047ed28d..dd96cc496 100644 --- a/kresources/slox/sloxbase.h +++ b/kresources/slox/sloxbase.h @@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase { FolderId, LastSync, ObjectType, - ObjectStatus, + ObjecStatus, CreatedBy, Categories, IncidenceTitle, // incidence fields diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index 4f17ea893..dc3c59dc2 100644 --- a/kresources/slox/sloxfolderdialog.cpp +++ b/kresources/slox/sloxfolderdialog.cpp @@ -70,7 +70,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) return; if ( folder->type() != mFolderType && folder->type() != Unbound ) return; - if( mManager->folders().contains( folder->parentId() ) ) { + if( mManager->folders().tqcontains( folder->parentId() ) ) { SloxFolder *parent = mManager->folders()[folder->parentId()]; createFolderViewItem( parent ); if ( parent->item ) diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp index 3f1b6be86..576def371 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/kresources/slox/webdavhandler.cpp @@ -129,7 +129,7 @@ TQValueList WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc item.status = SloxItem::New; } - TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjectStatus ) ); + TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) ); if ( !sloxStatus.isNull() ) { TQDomElement sloxStatusElement = sloxStatus.toElement(); if ( sloxStatusElement.text() == "DELETE" ) { -- cgit v1.2.1