From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/slox/kabcresourceslox.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kresources/slox/kabcresourceslox.cpp') diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 433a6adb0..76e233ce8 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, "propfind" ); + TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" ); 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::Iterator it; - it = mAddrMap.find( uid ); + it = mAddrMap.tqfind( uid ); if ( it != mAddrMap.end() ) { mAddrMap.remove( it ); changed = true; @@ -255,7 +255,7 @@ void ResourceSlox::slotResult( KIO::Job *job ) Addressee a; a.setUid( uid ); - mWebdavHandler.clearSloxAttributeStatus(); + mWebdavHandler.clearSloxAttributetqStatus(); TQDomNode n; for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) { @@ -312,7 +312,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job ) } if ( item.status == SloxItem::New ) { TQMap::Iterator search_res; - search_res = mAddrMap.find( item.clientId ); + search_res = mAddrMap.tqfind( item.clientId ); if ( search_res != mAddrMap.end() ) { // use the id provided by the server Addressee a = *search_res; @@ -344,7 +344,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) int pnType = 0; if ( tag == fieldName( Birthday ) ) { - TQDateTime dt = WebdavHandler::sloxToQDateTime( text ); + TQDateTime dt = WebdavHandler::sloxToTQDateTime( text ); a.setBirthday( dt.date() ); } else if ( tag == fieldName( Role ) ) { a.setRole( text ); @@ -400,8 +400,8 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) } else if ( tag == fieldName( SpousesName ) ) { a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text ); } else if ( tag == fieldName( Anniversary ) ) { - TQDateTime dt = WebdavHandler::sloxToQDateTime( text ); - a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) ); + TQDateTime dt = WebdavHandler::sloxToTQDateTime( text ); + a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) ); } else if ( tag == fieldName( Categories ) ) { a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) ); } else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX @@ -576,7 +576,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !anniversary.isEmpty() ) WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ), - WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) ); + WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) ); else WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) ); } @@ -631,14 +631,14 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop } } -void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent, +void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &tqparent, const TQString &prefix, const KABC::Address &addr ) { - WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() ); - WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() ); - WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( City ), addr.locality() ); - WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( State ), addr.region() ); - WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Country ), addr.country() ); + WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Street ), addr.street() ); + WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( PostalCode ), addr.postalCode() ); + WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( City ), addr.locality() ); + WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( State ), addr.region() ); + WebdavHandler::addSloxElement( this, doc, tqparent, prefix + fieldName( Country ), addr.country() ); } void ResourceSlox::slotProgress( KIO::Job *job, unsigned long percent ) -- cgit v1.2.1