| -rw-r--r-- | kabc/plugins/qtopia/qtopiaE.pro | 1 | ||||
| -rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp | 839 | ||||
| -rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.h | 66 | ||||
| -rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 101 | ||||
| -rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.h | 1 |
5 files changed, 707 insertions, 301 deletions
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro index a15e9ba..d66c719 100644 --- a/kabc/plugins/qtopia/qtopiaE.pro +++ b/kabc/plugins/qtopia/qtopiaE.pro @@ -1,27 +1,26 @@ TEMPLATE = lib CONFIG += qt warn_on TARGET = microkabc_qtopia INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib LIBS += -lmicrokde LIBS += -lkamicrokabc LIBS += -L$(QPEDIR)/lib -LIBS += -lqpepim LIBS += -lqpe INTERFACES = \ HEADERS = \ resourceqtopia.h \ resourceqtopiaconfig.h \ qtopiaconverter.h SOURCES = \ resourceqtopia.cpp \ resourceqtopiaconfig.cpp \ qtopiaconverter.cpp diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index 5eab1be..040226c 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp @@ -1,376 +1,671 @@ /* This file is part of libkabc. Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Enhanced Version of the file for platform independent KDE tools. Copyright (c) 2004 Ulf Schenk $Id$ */ //US #include "kglobal.h" +#include "klocale.h" #include "qtopiaconverter.h" -#include <qpe/categories.h> +#include <qfile.h> +#include <qdir.h> +#include <qtextstream.h> +//#include <.h> + +//#include <qpe/categories.h> #include <libkdepim/ksyncprofile.h> //US #include <qpe/categoryselect.h> using namespace KABC; -QtopiaConverter::QtopiaConverter() : catDB(0) +QtopiaConverter::QtopiaConverter() { + m_edit = 0; } QtopiaConverter::~QtopiaConverter() { deinit(); } bool QtopiaConverter::init() { - catDB = new Categories(); - - if (!catDB) - return false; - - catDB->load( categoryFileName() ); - return true; + QString fn = QDir::homeDirPath() +"/Settings/Categories.xml"; + m_edit = new CategoryEdit( fn); + return true; } void QtopiaConverter::deinit() { - if (catDB) + if (m_edit) { - delete catDB; - catDB = 0; + delete m_edit; + m_edit = 0; } } - -bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &addr ) +QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app ) { - // name - addr.setFormattedName(contact.fileAs()); - addr.setFamilyName( contact.lastName() ); - addr.setGivenName( contact.firstName() ); - addr.setAdditionalName( contact.middleName() ); - addr.setPrefix( contact.nameTitle() ); - addr.setSuffix( contact.suffix() ); - - addr.setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); - QString exuid = contact.uid().toString(); - addr.setOriginalExternalUID( exuid ); - int ente = exuid.find( "-0000"); - if ( exuid.left(1) == "{" ) - exuid = exuid.mid(1); - if ( ente > -1 ) - exuid = exuid.left( ente-1 ); - addr.setExternalUID( exuid ); - // qDebug("QtopiaConverter:set %s uid %s ",addr.originalExternalUID().latin1(),addr.externalUID().latin1() ); - - // email - QStringList emails = contact.emailList(); - for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { - addr.insertEmail( *it, ((*it) == contact.defaultEmail()) ); + startover: + QStringList dummy; + QValueList<OpieCategories>::ConstIterator catIt; + QValueList<OpieCategories> categories = m_edit->categories(); + bool found = false; + for ( QStringList::ConstIterator listIt = list.begin(); listIt != list.end(); ++listIt ) { + /* skip empty category name */ + if ( (*listIt).isEmpty() ) continue; + + found = false; + for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { + /* + * We currently do not take app into account + * if name matches and the id isn't already in dummy we'll add it + */ + if ( (*catIt).name() == (*listIt) && !dummy.contains(( *catIt).id() ) ) { // the same name + found= true; + dummy << (*catIt).id(); + } + } + /* if not found and the category is not empty + * + * generate a new category and start over again + * ugly goto to reiterate + */ + + if ( !found && !(*listIt).isEmpty() ){ + m_edit->addCategory( app, (*listIt) ); // generate a new category + goto startover; + } } - if (!contact.defaultEmail().isEmpty()) - addr.insertEmail(contact.defaultEmail(), true); - - // home - if ((!contact.homeStreet().isEmpty()) || - (!contact.homeCity().isEmpty()) || - (!contact.homeState().isEmpty()) || - (!contact.homeZip().isEmpty()) || - (!contact.homeCountry().isEmpty())) - { - Address homeaddress; - homeaddress.setType(Address::Home); -//US homeaddress.setPostOfficeBox( "" ); -//US homeaddress.setExtended( "" ); - homeaddress.setStreet( contact.homeStreet() ); - homeaddress.setLocality( contact.homeCity() ); - homeaddress.setRegion( contact.homeState() ); - homeaddress.setPostalCode( contact.homeZip() ); - homeaddress.setCountry( contact.homeCountry() ); - - addr.insertAddress( homeaddress ); - } + return dummy.join(";"); +} - if (!contact.homePhone().isEmpty()) - { - PhoneNumber homephone; - homephone.setType( PhoneNumber::Home ); - homephone.setNumber( contact.homePhone() ); - addr.insertPhoneNumber( homephone ); - } - if (!contact.homeFax().isEmpty()) - { - PhoneNumber homefax; - homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); - homefax.setNumber( contact.homeFax() ); - addr.insertPhoneNumber( homefax ); - } +// FROM TT timeconversion.cpp GPLed +QDate QtopiaConverter::fromString( const QString &datestr ) +{ + if (datestr.isEmpty() ) + return QDate(); - if (!contact.homeMobile().isEmpty()) - { - PhoneNumber homemobile; - homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); - homemobile.setNumber( contact.homeMobile() ); - addr.insertPhoneNumber( homemobile ); + int monthPos = datestr.find('.'); + int yearPos = datestr.find('.', monthPos+1 ); + if ( monthPos == -1 || yearPos == -1 ) { + return QDate(); } + int d = datestr.left( monthPos ).toInt(); + int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt(); + int y = datestr.mid( yearPos+1 ).toInt(); + QDate date ( y,m,d ); - addr.setUrl( contact.homeWebpage() ); - - - // business - if ((!contact.businessStreet().isEmpty()) || - (!contact.businessCity().isEmpty()) || - (!contact.businessState().isEmpty()) || - (!contact.businessZip().isEmpty()) || - (!contact.businessCountry().isEmpty())) - { - Address businessaddress; - businessaddress.setType(Address::Work); -//US businessaddress.setPostOfficeBox( "" ); -//US businessaddress.setExtended( "" ); - businessaddress.setStreet( contact.businessStreet() ); - businessaddress.setLocality( contact.businessCity() ); - businessaddress.setRegion( contact.businessState() ); - businessaddress.setPostalCode( contact.businessZip() ); - businessaddress.setCountry( contact.businessCountry() ); - - addr.insertAddress( businessaddress ); - } + return date; +} - if (!contact.businessPhone().isEmpty()) - { - PhoneNumber businessphone; - businessphone.setType( PhoneNumber::Work ); - businessphone.setNumber( contact.businessPhone() ); - addr.insertPhoneNumber( businessphone ); - } +QDate QtopiaConverter::dateFromString( const QString& s ) +{ + QDate date; - if (!contact.businessFax().isEmpty()) - { - PhoneNumber businessfax; - businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); - businessfax.setNumber( contact.businessFax() ); - addr.insertPhoneNumber( businessfax ); - } + if ( s.isEmpty() ) + return date; - if (!contact.businessMobile().isEmpty()) - { - PhoneNumber businessmobile; - businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); - businessmobile.setNumber( contact.businessMobile() ); - addr.insertPhoneNumber( businessmobile ); - } + // Be backward compatible to old Opie format: + // Try to load old format. If it fails, try new ISO-Format! + date = fromString ( s ); + if ( date.isValid() ) + return date; - if (!contact.businessPager().isEmpty()) - { - PhoneNumber businesspager; - businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); - businesspager.setNumber( contact.businessPager() ); - addr.insertPhoneNumber( businesspager ); - } + // Read ISO-Format (YYYYMMDD) + int year = s.mid(0, 4).toInt(); + int month = s.mid(4,2).toInt(); + int day = s.mid(6,2).toInt(); - addr.setRole( contact.jobTitle() ); //? - addr.setOrganization( contact.company() ); - addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() ); - addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() ); - addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() ); - addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() ); - addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() ); - - //personal - addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() ); - // qtopia uses this categorization: - // enum GenderType { UnspecifiedGender=0, Male, Female }; - if (contact.gender() == PimContact::Male) - addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); - else if (contact.gender() == PimContact::Female) - addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); - - if (contact.anniversary().isValid()) { - QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); -//US -// qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1()); - addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); - } + // do some quick sanity checking + if ( year < 1900 || year > 3000 ) + return date; + + if ( month < 0 || month > 12 ) + return date; - addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); - if (contact.birthday().isValid()) - addr.setBirthday( contact.birthday() ); + if ( day < 0 || day > 31 ) + return date; - addr.setNickName( contact.nickname() ); - // others - //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. - QString notes = contact.notes(); - notes += "\nBusinessWebPage: " + contact.businessWebpage() + "\n"; + date.setYMD( year, month, day ); - addr.setNote( contact.notes() ); + if ( !date.isValid() ) + return QDate(); + return date; +} +QString QtopiaConverter::dateToString( const QDate &d ) +{ + if ( d.isNull() || !d.isValid() ) + return QString::null; -//US QString groups() const { return find( Qtopia::Groups ); } -//US QStringList groupList() const; + // ISO format in year, month, day (YYYYMMDD); e.g. 20021231 + QString year = QString::number( d.year() ); + QString month = QString::number( d.month() ); + month = month.rightJustify( 2, '0' ); + QString day = QString::number( d.day() ); + day = day.rightJustify( 2, '0' ); - QArray<int> catArray = contact.categories(); - QString cat; + QString str = year + month + day; - for ( unsigned int i=0; i < catArray.size(); i++ ) { - cat = catDB->label("contact", catArray[i]); - if ( cat.isEmpty() ) - addr.insertCategory(QString::number(catArray[i])); - else - addr.insertCategory( cat ); - } + return str; +} +bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr ) +{ + { //LR + + adr.setUid( el.attribute("Uid" ) ); + adr.setFamilyName( el.attribute( "LastName" ) ); + adr.setGivenName( el.attribute( "FirstName" ) ); + adr.setAdditionalName( el.attribute( "MiddleName" ) ); + adr.setSuffix( el.attribute( "Suffix" ) ); + adr.setNickName( el.attribute( "Nickname" ) ); + + QDate date = dateFromString( el.attribute( "Birthday" ) ); + if ( date.isValid() ) + adr.setBirthday( date ); + + adr.setRole( el.attribute( "JobTitle" ) ); + if ( !el.attribute( "FileAs" ).isEmpty() ) + adr.setFormattedName( el.attribute( "FileAs" ) ); + + adr.setOrganization( el.attribute( "Company" ) ); + + KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ), + KABC::PhoneNumber::Work ); + KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ), + KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); + KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ), + KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell ); + KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ), + KABC::PhoneNumber::Work | KABC::PhoneNumber::Pager ); + if ( !businessPhoneNum.number().isEmpty() ) + adr.insertPhoneNumber( businessPhoneNum ); + if ( !businessFaxNum.number().isEmpty() ) + adr.insertPhoneNumber( businessFaxNum ); + if ( !businessMobile.number().isEmpty() ) + adr.insertPhoneNumber( businessMobile ); + if ( !businessPager.number().isEmpty() ) + adr.insertPhoneNumber( businessPager ); + + // Handle multiple mail addresses + QString DefaultEmail = el.attribute( "DefaultEmail" ); + if ( !DefaultEmail.isEmpty() ) + adr.insertEmail( DefaultEmail, true ); // preferred + + QStringList Emails = QStringList::split(" ",el.attribute("Emails")); + int i; + for (i = 0;i < Emails.count();++i) { + if ( Emails[i] != DefaultEmail ) + adr.insertEmail( Emails[i], false ); + } + + KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ), + KABC::PhoneNumber::Home ); + KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ), + KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); + + KABC::PhoneNumber homeMobile( el.attribute( "HomeMobile" ), + KABC::PhoneNumber::Cell ); + + if ( !homePhoneNum.number().isEmpty() ) + adr.insertPhoneNumber( homePhoneNum ); + if ( !homeFax.number().isEmpty() ) + adr.insertPhoneNumber( homeFax ); + if ( !homeMobile.number().isEmpty() ) + adr.insertPhoneNumber( homeMobile ); + + KABC::Address business( KABC::Address::Work ); + business.setStreet( el.attribute( "BusinessStreet" ) ); + business.setLocality( el.attribute( "BusinessCity" ) ); + business.setRegion( el.attribute( "BusinessState" ) ); + business.setPostalCode( el.attribute( "BusinessZip" ) ); + business.setCountry( el.attribute( "BusinessCountry" ) ); + + if ( !business.isEmpty() ) + adr.insertAddress( business ); + + KABC::Address home( KABC::Address::Home ); + home.setStreet( el.attribute( "HomeStreet" ) ); + home.setLocality( el.attribute( "HomeCity" ) ); + home.setRegion( el.attribute( "HomeState" ) ); + home.setPostalCode( el.attribute( "HomeZip" ) ); + home.setCountry( el.attribute( "HomeCountry" ) ); + + if ( !home.isEmpty() ) + adr.insertAddress( home ); + + adr.setNickName( el.attribute( "Nickname" ) ); + adr.setNote( el.attribute( "Notes" ) ); + + { + QStringList categories = QStringList::split(";", el.attribute("Categories" ) ); + QString cat; + QStringList added; + for ( uint i = 0; i < categories.count(); i++ ) { + cat = m_edit->categoryById( categories[ i ], "Contacts" ); + + // if name is not empty and we did not add the + // cat try to repair broken files + if ( !cat.isEmpty() && !added.contains( cat ) ) { + adr.insertCategory( cat ); + added << cat; + } + } + } + + if ( !el.attribute( "Department" ).isEmpty() ) + adr.insertCustom( "KADDRESSBOOK", "X-Department", el.attribute( "Department" ) ); + if ( !el.attribute( "HomeWebPage" ).isEmpty() ) + adr.insertCustom( "opie", "HomeWebPage", el.attribute( "HomeWebPage" ) ); + if ( !el.attribute( "Spouse" ).isEmpty() ) + adr.insertCustom( "KADDRESSBOOK", "X-SpousesName", el.attribute( "Spouse" ) ); + if ( !el.attribute( "Gender" ).isEmpty() ) + adr.insertCustom( "opie", "Gender", el.attribute( "Gender" ) ); + + QDate ann = dateFromString( el.attribute( "Anniversary" ) ); + if ( ann.isValid() ) { + QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate); + adr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt ); + } + + if ( !el.attribute( "Children" ).isEmpty() ) + adr.insertCustom("opie", "Children", el.attribute("Children") ); + if ( !el.attribute( "Office" ).isEmpty() ) + adr.insertCustom("KADDRESSBOOK", "X-Office", el.attribute("Office") ); + if ( !el.attribute( "Profession" ).isEmpty() ) + adr.insertCustom("KADDRESSBOOK", "X-Profession", el.attribute("Profession") ); + if ( !el.attribute( "Assistant" ).isEmpty() ) + adr.insertCustom("KADDRESSBOOK", "X-AssistantsName", el.attribute("Assistant") ); + if ( !el.attribute( "Manager" ).isEmpty() ) + adr.insertCustom("KADDRESSBOOK", "X-ManagersName", el.attribute("Manager") ); + + + } return true; } -bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &contact ) +bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream ) { + *stream << "<Contact "; + *stream << "FirstName=\"" << escape(ab.givenName()) << "\" "; + *stream << "MiddleName=\"" << escape(ab.additionalName()) << "\" "; + *stream << "LastName=\"" << escape(ab.familyName()) << "\" "; + *stream << "Suffix=\"" << escape(ab.suffix()) << "\" "; + + QString sortStr; + sortStr = ab.formattedName(); + /* is formattedName is empty we use the assembled name as fallback */ + if (sortStr.isEmpty() ) + sortStr = ab.assembledName(); + *stream << "FileAs=\"" << escape(sortStr) << "\" "; + + *stream << "JobTitle=\"" << escape(ab.role()) << "\" "; + *stream << "Department=\"" << escape(ab.custom( "KADDRESSBOOK", "X-Department" )) << "\" "; + *stream << "Company=\"" << escape(ab.organization()) << "\" "; + + KABC::PhoneNumber businessPhoneNum = ab.phoneNumber(KABC::PhoneNumber::Work ); + *stream << "BusinessPhone=\"" << escape( businessPhoneNum.number() ) << "\" "; + + KABC::PhoneNumber businessFaxNum = ab.phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); + *stream << "BusinessFax=\"" << escape( businessFaxNum.number() )<< "\" "; + + KABC::PhoneNumber businessMobile = ab.phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell ); + *stream << "BusinessMobile=\"" << escape( businessMobile.number() ) << "\" "; + + *stream << "DefaultEmail=\"" << escape( ab.preferredEmail() ) << "\" "; + QStringList list = ab.emails(); + if ( list.count() > 0 ) { + QStringList::Iterator it = list.begin(); + *stream << "Emails=\"" << escape( *it ); + while (++it != list.end()) + *stream << ' ' << escape( *it ); + *stream << "\" "; + } + + KABC::PhoneNumber homePhoneNum = ab.phoneNumber(KABC::PhoneNumber::Home ); + *stream << "HomePhone=\"" << escape( homePhoneNum.number() ) << "\" "; + + KABC::PhoneNumber homeFax = ab.phoneNumber( KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); + *stream << "HomeFax=\"" << escape( homeFax.number() ) << "\" "; + + KABC::PhoneNumber homeMobile = ab.phoneNumber( KABC::PhoneNumber::Cell ); + *stream << "HomeMobile=\"" << escape( homeMobile.number() ) << "\" "; + + KABC::Address business = ab.address(KABC::Address::Work ); + *stream << "BusinessStreet=\"" << escape( business.street() ) << "\" "; + *stream << "BusinessCity=\"" << escape( business.locality() ) << "\" "; + *stream << "BusinessZip=\"" << escape( business.postalCode() ) << "\" "; + *stream << "BusinessCountry=\"" << escape( business.country() ) << "\" "; + *stream << "BusinessState=\"" << escape( business.region() ) << "\" "; + //stream << "BusinessPager=\"" << << "\" "; + *stream << "Office=\"" << escape( ab.custom( "KADDRESSBOOK", "X-Office" ) ) << "\" "; + *stream << "Profession=\"" << escape( ab.custom( "KADDRESSBOOK", "X-Profession" ) ) << "\" "; + *stream << "Assistant=\"" << escape( ab.custom( "KADDRESSBOOK", "X-AssistantsName") ) << "\" "; + *stream << "Manager=\"" << escape( ab.custom( "KADDRESSBOOK", "X-ManagersName" ) ) << "\" "; + + KABC::Address home = ab.address( KABC::Address::Home ); + *stream << "HomeStreet=\"" << escape( home.street() ) << "\" "; + *stream << "HomeCity=\"" << escape( home.locality() ) << "\" "; + *stream << "HomeState=\"" << escape( home.region() ) << "\" "; + *stream << "HomeZip=\"" << escape( home.postalCode() ) << "\" "; + *stream << "HomeCountry=\"" << escape( home.country() ) << "\" "; + + *stream << "HomeWebPage=\"" << escape( ab.custom( "opie", "HomeWebPage" ) ) << "\" "; + *stream << "Spouse=\"" << escape( ab.custom( "KADDRESSBOOK", "X-SpousesName") ) << "\" "; + *stream << "Gender=\"" << escape( ab.custom( "opie", "Gender") ) << "\" "; + + if ( ab.birthday().date().isValid() ) + *stream << "Birthday=\"" << escape( dateToString(ab.birthday().date() ) ) << "\" "; + + /* + * Anniversary block again + * Go from ISO -> QDate -> toString and then escape + */ + { + QDate ann = KGlobal::locale()->readDate( ab.custom("KADDRESSBOOK", "X-Anniversary" ), + "%Y-%m-%d"); + if (ann.isValid() ) { + *stream << "Anniversary=\"" << escape( dateToString( ann ) ) << "\" "; + } + } + *stream << "Nickname=\"" << escape( ab.nickName() ) << "\" "; + *stream << "Children=\"" << escape( ab.custom("opie", "Children" ) ) << "\" "; + *stream << "Notes=\"" << escape( ab.note() ) << "\" "; + *stream << "Categories=\"" << categoriesToNumber( ab.categories(), "Contacts") << "\" "; + + QString uid = ab.uid(); + *stream << "Uid=\"" << uid << "\" "; + //*stream << map.toString( "addressbook", uid ); + *stream << " />" << "\n"; - - - // name - contact.setLastName(addr.familyName()); - contact.setFirstName(addr.givenName()); - contact.setMiddleName(addr.additionalName()); - contact.setNameTitle(addr.prefix()); - contact.setSuffix(addr.suffix()); - contact.setFileAs(); + return true; +} - // email - QStringList emails = addr.emails(); - for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { - contact.insertEmail(*it); - } - contact.setDefaultEmail( addr.preferredEmail() ); +#if 0 +KTempFile* AddressBook::fromKDE( KSync::AddressBookSyncee *syncee, ExtraMap& map ) +{ + +} - // home - const Address homeaddress = addr.address(Address::Home); - if (!homeaddress.isEmpty()) { - contact.setHomeStreet(homeaddress.street()); - contact.setHomeCity(homeaddress.locality()); - contact.setHomeState(homeaddress.region()); - contact.setHomeZip(homeaddress.postalCode()); - contact.setHomeCountry(homeaddress.country()); - } - - PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); - if (!homephone.number().isEmpty()) - contact.setHomePhone(homephone.number()); +QStringList AddressBook::attributes()const { + QStringList lst; + lst << "FirstName"; + lst << "MiddleName"; + lst << "LastName"; + lst << "Suffix"; + lst << "FileAs"; + lst << "JobTitle"; + lst << "Department"; + lst << "Company"; + lst << "BusinessPhone"; + lst << "BusinessFax"; + lst << "BusinessMobile"; + lst << "DefaultEmail"; + lst << "Emails"; + lst << "HomePhone"; + lst << "HomeFax"; + lst << "HomeMobile"; + lst << "BusinessStreet"; + lst << "BusinessCity"; + lst << "BusinessZip"; + lst << "BusinessCountry"; + lst << "BusinessState"; + lst << "Office"; + lst << "Profession"; + lst << "Assistant"; + lst << "Manager"; + lst << "HomeStreet"; + lst << "HomeCity"; + lst << "HomeState"; + lst << "HomeZip"; + lst << "HomeCountry"; + lst << "HomeWebPage"; + lst << "Spouse"; + lst << "Gender"; + lst << "Anniversary"; + lst << "Nickname"; + lst << "Children"; + lst << "Notes"; + lst << "Categories"; + lst << "Uid"; + lst << "Birthday"; + + return lst; +} - PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); - if (!homefax.number().isEmpty()) - contact.setHomeFax(homefax.number()); - PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); - if (!homemobile.number().isEmpty()) - contact.setHomeMobile(homemobile.number()); - contact.setHomeWebpage(addr.url().url()); +#endif - // business - const Address businessaddress = addr.address(Address::Work); - if (!businessaddress.isEmpty()) { - contact.setBusinessStreet(businessaddress.street()); - contact.setBusinessCity(businessaddress.locality()); - contact.setBusinessState(businessaddress.region()); - contact.setBusinessZip(businessaddress.postalCode()); - contact.setBusinessCountry(businessaddress.country()); +CategoryEdit::CategoryEdit(){ +} +CategoryEdit::CategoryEdit(const QString &fileName){ + parse( fileName ); +} +CategoryEdit::~CategoryEdit(){ +} +void CategoryEdit::save(const QString& fileName)const{ + QFile file( fileName ); + QString endl = "\n"; + if ( file.open( IO_WriteOnly ) ) { + QTextStream stream( &file ); + stream.setEncoding( QTextStream::UnicodeUTF8 ); + stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; + stream << "<!DOCTYPE CategoryList>" << endl; + stream << "<Categories>" << endl; + for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin(); + it != m_categories.end(); ++it ) + { + stream << "<Category id=\""<< ( (*it).id() ) << "\" "; + + if ( !(*it).app().isEmpty() ) + stream << " app=\""<< ( (*it).app() ) << "\" "; + + stream << "name=\"" << ( (*it).name() ) << "\" "; + stream << " />" << endl; + } + stream << "</Categories>" << endl; + file.close(); } +} +int CategoryEdit::addCategory( const QString &name, int id ){ + return addCategory( QString::null, name, id ); +} +int CategoryEdit::addCategory( const QString &appName, const QString &name, int id ){ + if ( id == 0 ) { + // code from tt + //generate uid + QDateTime dt = QDateTime::currentDateTime(); + id = -1 * (int) dt.secsTo( QDateTime(QDate( 2000,1,1)) ); + while ( ids.contains( id ) ){ + id += -1; + if ( id > 0 ) + id = -1; + } + } + ids.insert( id, TRUE ); + OpieCategories categories(QString::number(id), name, appName); + //pending FIXME LR m_categories.remove( categories); + m_categories.append( categories); + return id; +} +/* + * we parse the simple Category File here + * We also keep track of global Cats + * and Of Organizer and Contact cats and then + * we will add them to the kde side... + */ +void CategoryEdit::parse( const QString &tempFile ){ + clear(); + + QDomDocument doc( "mydocument" ); + QFile f( tempFile ); + if ( !f.open( IO_ReadOnly ) ) + return; + + if ( !doc.setContent( &f ) ) { + f.close(); + return; + } + f.close(); + + QStringList global, contact, organizer; + + // print out the element names of all elements that are a direct child + // of the outermost element. + QDomElement docElem = doc.documentElement(); + QDomNode n = docElem.firstChild(); + if( docElem.nodeName() == QString::fromLatin1("Categories") ){ + while( !n.isNull() ) { + QDomElement e = n.toElement(); // try to convert the node to an element. + if( !e.isNull() ) { // the node was really an element. + QString id = e.attribute("id" ); + QString app = e.attribute("app" ); + QString name = e.attribute("name"); + + /* + * see where it belongs default to global + */ + if (app == QString::fromLatin1("Calendar") || app == QString::fromLatin1("Todo List") ) + organizer.append( name ); + else if ( app == QString::fromLatin1("Contacts") ) + contact.append( name ); + else + global.append( name ); + + OpieCategories category( id, name, app ); + m_categories.append( category ); // cheater + } + n = n.nextSibling(); + } + } + updateKDE( "kaddressbookrc", global + contact ); + updateKDE( "korganizerrc", global + organizer ); - PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); - if (!businessphone.number().isEmpty()) - contact.setBusinessPhone(businessphone.number()); - - PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); - if (!businessfax.number().isEmpty()) - contact.setBusinessFax(businessfax.number()); - - PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); - if (!businessmobile.number().isEmpty()) - contact.setBusinessMobile(businessmobile.number()); - - PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); - if (!businesspager.number().isEmpty()) - contact.setBusinessPager(businesspager.number()); - - contact.setJobTitle(addr.role()); - contact.setCompany(addr.organization()); - - contact.setProfession(addr.custom( "KADDRESSBOOK", "X-Profession" )); - contact.setAssistant(addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); - contact.setDepartment(addr.custom( "KADDRESSBOOK", "X-Department" )); - contact.setManager(addr.custom( "KADDRESSBOOK", "X-ManagersName" )); - contact.setOffice(addr.custom( "KADDRESSBOOK", "X-Office" )); - - //personal - contact.setSpouse(addr.custom( "KADDRESSBOOK", "X-Spouse" )); - // qtopia uses this categorization: - // enum GenderType { UnspecifiedGender=0, Male, Female }; - QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); - if (gt = "male") - contact.setGender(PimContact::Male); - else if (gt = "female") - contact.setGender(PimContact::Female); - else - contact.setGender(PimContact::UnspecifiedGender); - - - QDate dt = KGlobal::locale()->readDate( - addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate - contact.setAnniversary( dt ); - - contact.setChildren(addr.custom( "KADDRESSBOOK", "X-Children" )); +} +void CategoryEdit::clear() +{ + ids.clear(); + m_categories.clear(); +} +QString CategoryEdit::categoryById( const QString &id, const QString &app )const +{ + QValueList<OpieCategories>::ConstIterator it; + QString category; + QString fallback; + for( it = m_categories.begin(); it != m_categories.end(); ++it ){ + if( id.stripWhiteSpace() == (*it).id().stripWhiteSpace() ){ + if( app == (*it).app() ){ + category = (*it).name(); + break; + }else{ + fallback = (*it).name(); + } + } + } + return category.isEmpty() ? fallback : category; +} +QStringList CategoryEdit::categoriesByIds( const QStringList& ids, + const QString& app) { + + QStringList list; + QStringList::ConstIterator it; + QString temp; + for ( it = ids.begin(); it != ids.end(); ++it ) { + temp = categoryById( (*it), app ); + if (!temp.isEmpty() ) + list << temp; + } - contact.setBirthday(addr.birthday().date()); - contact.setNickname(addr.nickName()); + return list; +} +void CategoryEdit::updateKDE( const QString& configFile, const QStringList& cats ) { + KConfig conf(configFile); + conf.setGroup("General"); + QStringList avail = conf.readListEntry("Custom Categories"); + for (QStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it ) { + if (!avail.contains( (*it) ) ) + avail << (*it); + } + conf.writeEntry("Custom Categories", avail ); +} - // other - contact.setNotes(addr.note()); -//US QString groups() const { return find( Qtopia::Groups ); } -//US QStringList groupList() const; +OpieCategories::OpieCategories() +{ - QStringList cats = addr.categories(); +} +OpieCategories::OpieCategories(const QString &id, const QString &name, const QString &app ) +{ + m_name = name; + m_id = id; + m_app = app; +} +OpieCategories::OpieCategories(const OpieCategories &op ) +{ + (*this) = op; +} +QString OpieCategories::id() const +{ + return m_id; +} +QString OpieCategories::name() const +{ + return m_name; +} +QString OpieCategories::app() const +{ + return m_app; +} +OpieCategories &OpieCategories::operator=(const OpieCategories &op ) +{ + m_name = op.m_name; + m_app = op.m_app; + m_id = op.m_id; + return (*this); +} - QArray<int> iar; - if ( !cats.isEmpty() ) { - QArray<int> iar = catDB->ids("contact", cats); - contact.setCategories(iar); - } - return true; +bool operator== (const OpieCategories& a, const OpieCategories &b ) +{ + if ( a.id() == b.id() && a.name() == b.name() && a.app() == b.app() ) + return true; + return false; } + diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h index 012a6e2..d318ded 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.h +++ b/kabc/plugins/qtopia/qtopiaconverter.h @@ -1,80 +1,132 @@ /* This file is part of libkabc. Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Enhanced Version of the file for platform independent KDE tools. Copyright (c) 2004 Ulf Schenk $Id$ */ #ifndef KABC_QTOPIACONVERTER_H #define KABC_QTOPIACONVERTER_H #include <qstring.h> #include "addressee.h" -#include <qpe/pim/contact.h> -#include <qpe/quuid.h> +//#include <qpe/pim/contact.h> +//#include <qpe/quuid.h> +#include <xml/qdom.h> class Categories; namespace KABC { + + +class OpieCategories { + public: + //friend class KSync::OpieSocket; + friend bool operator== ( const OpieCategories &a, const OpieCategories &b ); + OpieCategories(); + OpieCategories(const QString &id, const QString &name, const QString &app ); + OpieCategories(const OpieCategories & ); + ~OpieCategories() {}; + OpieCategories &operator=(const OpieCategories & ); + QString id()const; + QString name()const; + QString app()const; + + private: + QString m_name; + QString m_app; + QString m_id; +}; + + + class CategoryEdit { + public: + CategoryEdit(); + CategoryEdit(const QString &fileName); + ~CategoryEdit(); + + void save(const QString&) const; + int addCategory( const QString &name, int id = 0 ); + int addCategory(const QString &appName, const QString &name, int id = 0); + void parse( const QString &fileName ); + + QString categoryById(const QString &id, const QString &app )const; + QStringList categoriesByIds( const QStringList& ids, const QString& app ); + + void clear(); + QValueList<OpieCategories> categories()const { return m_categories; }; + private: + /** + * this function will be used internally to update the kde categories... + */ + void updateKDE( const QString& app, const QStringList& categories ); + QMap<int, bool> ids; // from tt Qtopia::UidGen + QValueList<OpieCategories> m_categories; + }; + + class QtopiaConverter { public: /** * Constructor. */ QtopiaConverter(); /** * Destructor. */ virtual ~QtopiaConverter(); bool init(); void deinit(); /** * Converts a vcard string to an addressee. * * @param contact The qtopia contact. * @param addr The addressee. */ - bool qtopiaToAddressee( const PimContact &contact, Addressee &addr ); - + bool qtopiaToAddressee( const QDomElement& el, Addressee &adr ); /** * Converts an addressee to a vcard string. * * @param addr The addressee. * @param contact The qtopia contact. */ - bool addresseeToQtopia( const Addressee &addr, PimContact &contact ); + bool addresseeToQtopia( const Addressee &ab, QTextStream *stream ); private: - Categories* catDB; + QString categoriesToNumber( const QStringList &list, const QString &app ); + QString escape( const QString& s){ return s;}; + CategoryEdit *m_edit; + QDate fromString( const QString& ); + QDate dateFromString( const QString& ); + QString dateToString( const QDate& ); }; - } #endif diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index deb218b..b7263bb 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp @@ -1,269 +1,330 @@ /* This file is part of libkabc. Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Enhanced Version of the file for platform independent KDE tools. Copyright (c) 2004 Ulf Schenk $Id$ */ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <qdir.h> #include <qfile.h> +#include <qtextstream.h> #include <qfileinfo.h> #include <qregexp.h> //US #include <qtimer.h> #include <kapplication.h> #include <kconfig.h> #include <kdebug.h> #include <klocale.h> //US #include <ksavefile.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <qpe/pim/addressbookaccess.h> #include "resourceqtopiaconfig.h" #include "stdaddressbook.h" #include "qtopiaconverter.h" #include "resourceqtopia.h" using namespace KABC; extern "C" { void *init_microkabc_qtopia() { return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); } } ResourceQtopia::ResourceQtopia( const KConfig *config ) : Resource( config ), mConverter (0) { // we can not choose the filename. Therefore use the default to display QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; init( fileName ); } ResourceQtopia::ResourceQtopia( const QString &fileName ) : Resource( 0 ) { init( fileName ); } void ResourceQtopia::init( const QString &fileName ) { connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); setFileName( fileName ); } ResourceQtopia::~ResourceQtopia() { if (mConverter != 0) delete mConverter; - if(mAccess != 0) - delete mAccess; } void ResourceQtopia::writeConfig( KConfig *config ) { Resource::writeConfig( config ); } Ticket *ResourceQtopia::requestSaveTicket() { kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl; qDebug("ResourceQtopia::requestSaveTicket: %s", fileName().latin1()); if ( !addressBook() ) return 0; if ( !lock( fileName() ) ) { kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '" << fileName() << "'" << endl; return 0; } return createTicket( this ); } bool ResourceQtopia::doOpen() { qDebug("ResourceQtopia::doOpen(): %s", fileName().latin1()); - mAccess = new AddressBookAccess(); - - if ( !mAccess ) { - qDebug("Unable to load file() %s", fileName().latin1()); - return false; - } - if (mConverter == 0) { mConverter = new QtopiaConverter(); bool res = mConverter->init(); if ( !res ) { QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file"); qDebug(msg); - delete mAccess; - mAccess = 0; return false; } } return true; } void ResourceQtopia::doClose() { qDebug("ResourceQtopia::doClose: %s", fileName().latin1()); - if(mAccess) - { - delete mAccess; - mAccess = 0; - } + // it seems so, that deletion of access deletes backend as well //delete backend; return; } bool ResourceQtopia::load() { + + QFile file( fileName() ); + if ( !file.open(IO_ReadOnly ) ) { + return false; + } + + QDomDocument doc("mydocument" ); + if ( !doc.setContent( &file ) ) { + file.close(); + return false; + } + bool res; + QDomElement docElem = doc.documentElement( ); + QDomNode n = docElem.firstChild(); + while ( !n.isNull() ) { + QDomElement e = n.toElement(); + if ( !e.isNull() ) { + if ( e.tagName() == QString::fromLatin1( "Contacts" ) ) { // we're looking for them + QDomNode no = e.firstChild(); + while ( !no.isNull() ) { + QDomElement el = no.toElement(); + if ( !el.isNull() ) { + KABC::Addressee addressee; + res = mConverter->qtopiaToAddressee( el, addressee ); + if ( !addressee.isEmpty() && res ) + { + addressee.setResource( this ); + addressBook()->insertAddressee( addressee ); + } + } + + no = no.nextSibling(); + } + } + } + + n = n.nextSibling(); + } + +#if 0 +/ old code qDebug("ResourceQtopia::load: %s", fileName().latin1()); AddressBookIterator it(*mAccess); const PimContact* contact; bool res; for (contact=it.toFirst(); it.current(); ++it) { contact = it.current(); KABC::Addressee addressee; - res = mConverter->qtopiaToAddressee( (*contact), addressee ); + //LRres = mConverter->qtopiaToAddressee( (*contact), addressee ); if ( !addressee.isEmpty() && res ) { addressee.setResource( this ); addressBook()->insertAddressee( addressee ); } } - +#endif return true; } bool ResourceQtopia::save( Ticket *ticket ) { + + mDirWatch.stopScan(); + KABC::AddressBook::Iterator it; + bool res; + //pending open file for stream + QTextStream *stream;// = tempFile->textStream(); + stream->setEncoding( QTextStream::UnicodeUTF8 ); + *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl; + *stream << " <Groups>" << endl; + *stream << " </Groups>" << endl; + *stream << " <Contacts> " << endl; + // for all entries + KABC::Addressee ab; + for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { + KABC::Addressee addressee = (*it); + res = mConverter->addresseeToQtopia( addressee, stream ); + if (!res == true) + { + qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); + } + } + + + *stream << "</Contacts>" << endl; + *stream << "</AddressBook>" << endl; + //pending close file + mDirWatch.startScan(); + + delete ticket; + unlock( fileName() ); + + +#if 0 + //old code qDebug("ResourceQtopia::save: %s", fileName().latin1()); mDirWatch.stopScan(); KABC::AddressBook::Iterator it; bool res; for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { PimContact c; KABC::Addressee addressee = (*it); - res = mConverter->addresseeToQtopia( *it, c ); + //res = mConverter->addresseeToQtopia( *it, c ); if (res == true) { mAccess->addContact(c); // if (res == false) // qDebug("Unable to append Contact %s", c.fullName().latin1()); } else { qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); } } // mAccess->addressBookUpdated(); mDirWatch.startScan(); delete ticket; unlock( fileName() ); - +#endif return true; } bool ResourceQtopia::lock( const QString &lockfileName ) { qDebug("ResourceQtopia::lock: %s", fileName().latin1()); kdDebug(5700) << "ResourceQtopia::lock()" << endl; QString fn = lockfileName; KURL url(fn); QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); kdDebug(5700) << "-- lock name: " << lockName << endl; if (QFile::exists( lockName )) { qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1()); return false; } QString lockUniqueName; lockUniqueName = fn + KApplication::randomString( 8 ); url = lockUniqueName; //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; // Create unique file QFile file( mLockUniqueName ); file.open( IO_WriteOnly ); file.close(); // Create lock file int result = 0; #ifndef _WIN32_ result = ::link( QFile::encodeName( mLockUniqueName ), QFile::encodeName( lockName ) ); #endif if ( result == 0 ) { addressBook()->emitAddressBookLocked(); return true; } // TODO: check stat diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h index ff6350d..31b95f2 100644 --- a/kabc/plugins/qtopia/resourceqtopia.h +++ b/kabc/plugins/qtopia/resourceqtopia.h @@ -87,59 +87,58 @@ public: virtual void doClose(); /** * Requests a save ticket, that is used by @ref save() */ virtual Ticket *requestSaveTicket(); /** * Loads all addressees from file to the address book. * Returns true if all addressees could be loaded otherwise false. */ virtual bool load(); /** * Saves all addresses from address book to file. * Returns true if all addressees could be saved otherwise false. * * @param ticket The ticket returned by @ref requestSaveTicket() */ virtual bool save( Ticket *ticket ); /** * Remove a addressee from its source. * This method is mainly called by KABC::AddressBook. */ virtual void removeAddressee( const Addressee& addr ); /** * Set name of file to be used for saving. */ virtual void setFileName( const QString & ); /** * This method is called by an error handler if the application * crashed */ virtual void cleanUp(); protected slots: void fileChanged(); protected: void init( const QString &fileName ); bool lock( const QString &fileName ); void unlock( const QString &fileName ); private: - AddressBookAccess* mAccess; QtopiaConverter* mConverter; QString mLockUniqueName; KDirWatch mDirWatch; }; } #endif |