diff options
Diffstat (limited to 'kresources/slox')
-rw-r--r-- | kresources/slox/kabcresourceslox.cpp | 14 | ||||
-rw-r--r-- | kresources/slox/kcalresourceslox.cpp | 6 | ||||
-rw-r--r-- | kresources/slox/sloxaccounts.cpp | 10 | ||||
-rw-r--r-- | kresources/slox/sloxfolderdialog.cpp | 2 | ||||
-rw-r--r-- | kresources/slox/sloxfoldermanager.cpp | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 82d5c60a5..ba3d41156 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -194,7 +194,7 @@ bool ResourceSlox::asyncLoad() } TQDomDocument doc; - TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->folderId() ); @@ -246,7 +246,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) TQString uid = "kresources_slox_kabc_" + item.sloxId; if ( item.status == SloxItem::Delete ) { TQMap<TQString,Addressee>::Iterator it; - it = mAddrMap.tqfind( uid ); + it = mAddrMap.find( uid ); if ( it != mAddrMap.end() ) { mAddrMap.remove( it ); changed = true; @@ -269,7 +269,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) a.setResource( this ); a.setChanged( false ); - mAddrMap.tqreplace( a.uid(), a ); + mAddrMap.replace( a.uid(), a ); // TODO: Do we need to try to associate addressees with slox accounts? @@ -306,13 +306,13 @@ void ResourceSlox::slotUploadResult( KIO::Job *job ) TQValueList<SloxItem>::ConstIterator it; for( it = items.begin(); it != items.end(); ++it ) { SloxItem item = *it; - if ( !item.response.tqcontains( "200" ) ) { + if ( !item.response.contains( "200" ) ) { savingError( this, item.response + "\n" + item.responseDescription ); continue; } if ( item.status == SloxItem::New ) { TQMap<TQString,Addressee>::Iterator search_res; - search_res = mAddrMap.tqfind( item.clientId ); + search_res = mAddrMap.find( item.clientId ); if ( search_res != mAddrMap.end() ) { // use the id provided by the server Addressee a = *search_res; @@ -320,7 +320,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job ) a.setUid( "kresources_slox_kabc_" + item.sloxId ); a.setResource( this ); a.setChanged( false ); - mAddrMap.tqreplace( a.uid(), a ); + mAddrMap.replace( 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.tqcontains( (*it).type() ) ) { + if ( pnSaveMap.contains( (*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 132f19ca1..cb477038c 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -213,7 +213,7 @@ void KCalResourceSlox::requestEvents() } TQDomDocument doc; - TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->calendarFolderId() ); @@ -258,7 +258,7 @@ void KCalResourceSlox::requestTodos() } TQDomDocument doc; - TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync ); WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->taskFolderId() ); @@ -1113,7 +1113,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job ) if ( !status.isNull() ) { TQDomElement statusElement = status.toElement(); TQString response = statusElement.text(); - if ( !response.tqcontains( "200" ) ) { + if ( !response.contains( "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 de694b4f5..a32df5fa2 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.tqreplace( id, a ); + mUsers.replace( id, a ); TQString email = a.preferredEmail(); @@ -78,7 +78,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a ) KABC::Addressee SloxAccounts::lookupUser( const TQString &id ) { TQMap<TQString, KABC::Addressee>::ConstIterator it; - it = mUsers.tqfind( id ); + it = mUsers.find( id ); if ( it == mUsers.end() ) { requestAccounts(); return KABC::Addressee(); @@ -99,7 +99,7 @@ TQString SloxAccounts::lookupId( const TQString &email ) } requestAccounts(); - int pos = email.tqfind( '@' ); + int pos = email.find( '@' ); if ( pos < 0 ) return email; else return email.left( pos ); } @@ -127,7 +127,7 @@ void SloxAccounts::requestAccounts() url.setPath( "/servlet/webdav.groupuser/" ); TQDomDocument doc; - TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" ); WebdavHandler::addSloxElement( mRes, doc, prop, "user", "*" ); WebdavHandler::addSloxElement( mRes, doc, prop, "group", "*" ); @@ -207,7 +207,7 @@ void SloxAccounts::readAccounts() TQDomElement e = n.toElement(); TQString tag = e.tagName(); // remove XML namespace - tag = tag.right( tag.length() - ( tag.tqfind( ':' ) + 1 ) ); + tag = tag.right( tag.length() - ( tag.find( ':' ) + 1 ) ); TQString value = e.text(); if ( tag == "uid" ) id = value; else if ( tag == "mail" ) a.insertEmail( value, true ); diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp index d58a18e1d..f2fe58a92 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().tqcontains( folder->parentId() ) ) { + if( mManager->folders().contains( folder->parentId() ) ) { SloxFolder *tqparent = mManager->folders()[folder->parentId()]; createFolderViewItem( tqparent ); if ( tqparent->item ) diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp index 7894ec93a..41864caf8 100644 --- a/kresources/slox/sloxfoldermanager.cpp +++ b/kresources/slox/sloxfoldermanager.cpp @@ -65,7 +65,7 @@ void SloxFolderManager::requestFolders() url.setPath( "/servlet/webdav.folders/file.xml" ); TQDomDocument doc; - TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" ); TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" ); WebdavHandler::addSloxElement( mRes, doc, prop, "objectmode", "NEW_AND_MODIFIED" ); WebdavHandler::addSloxElement( mRes, doc, prop, "lastsync", "0" ); |