2 files changed, 4 insertions, 31 deletions

diff --git a/kabc/converter/opie/opieconverter.cpp b/kabc/converter/opie/opieconverter.cpp
index b4e9f1c..0b6a55e 100644
--- a/kabc/converter/opie/opieconverter.cpp
+++ b/kabc/converter/opie/opieconverter.cpp
@@ -9,129 +9,129 @@
 
     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 "opieconverter.h"
 
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 
 OpieConverter::OpieConverter() : catDB(0)
 {
 }
 
 OpieConverter::~OpieConverter()
 {
   deinit();
 }
 
 bool OpieConverter::init()
 {
   catDB = new Categories();
   if (catDB) 
   {
     catDB->load( categoryFileName() );
     return true;
   }
   else 
   {
     return false;
   }
 
 }
 
 void OpieConverter::deinit()
 {
   if (catDB) 
   {
     delete catDB;
     catDB = 0;
   }
 }
   
-bool OpieConverter::opieToAddressee( OContact &contact, Addressee &addr )
+bool OpieConverter::opieToAddressee( const OContact &contact, Addressee &addr )
 {
     // name
     addr.setFormattedName(contact.fileAs());
     addr.setFamilyName( contact.lastName() );
     addr.setGivenName( contact.firstName() );
     addr.setAdditionalName( contact.middleName() );
     addr.setPrefix( contact.title() );
     addr.setSuffix( contact.suffix() );
   
     
     // email
     QStringList emails = contact.emailList();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
     }
 
     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 );
     }
     
     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 );
     }
     
     if (!contact.homeMobile().isEmpty())
     {
       PhoneNumber homemobile;
       homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
       homemobile.setNumber( contact.homeMobile() );
       addr.insertPhoneNumber( homemobile );
     }
     
     addr.setUrl( contact.homeWebpage() );
@@ -168,208 +168,181 @@ bool OpieConverter::opieToAddressee( OContact &contact, Addressee &addr )
     
     if (!contact.businessFax().isEmpty())
     {
       PhoneNumber businessfax;
       businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
       businessfax.setNumber( contact.businessFax() );
       addr.insertPhoneNumber( businessfax );
     }
     
     if (!contact.businessMobile().isEmpty())
     {
       PhoneNumber businessmobile;
       businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
       businessmobile.setNumber( contact.businessMobile() );
       addr.insertPhoneNumber( businessmobile );
     }
 
     if (!contact.businessPager().isEmpty())
     {
       PhoneNumber businesspager;
       businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
       businesspager.setNumber( contact.businessPager() );
       addr.insertPhoneNumber( businesspager );
     }
         
     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() );
     addr.insertCustom( "KADDRESSBOOK", "X-Gender", contact.gender() );
     
     if (contact.anniversary().isValid()) {
       QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate);
 //US      
       qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
     }
     
     addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() );
     if (contact.birthday().isValid())
       addr.setBirthday( contact.birthday() );
      
     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";
         
     addr.setNote( contact.notes() );
 
     
         
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
     
     QStringList cats = contact.categoryNames("Contacts");
+    addr.setCategories( cats );
 //    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
 //      qDebug("Cat: %s", (*it).latin1());
 //    }
-
         
-    addr.setCategories( contact.categoryNames("Contacts") );
-//    qDebug("Groups: %s", contact.groups().latin1());
-//    addr.setCategories( contact.groupList() );
-
 
     return true;
 }
 
 bool OpieConverter::addresseeToOpie( const Addressee &addr, OContact &contact )
 {
     // name
     contact.setLastName(addr.familyName());
     contact.setFirstName(addr.givenName());
     contact.setMiddleName(addr.additionalName());
     contact.setTitle(addr.prefix());
     contact.setSuffix(addr.suffix());
     contact.setFileAs();
     
     
     // email
     QStringList emails = addr.emails();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       contact.insertEmail(*it);
     }
     contact.setDefaultEmail( addr.preferredEmail() );
     
 
     // 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());
     
     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());
                 
 
     // 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());
     }
 
     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" ));
     contact.setGender(addr.custom( "KADDRESSBOOK", "X-Gender" ));
     
     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" ));
     
     contact.setBirthday(addr.birthday().date());
     contact.setNickname(addr.nickName());
 
     // other
     contact.setNotes(addr.note());
     
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
-/*US    
-    QStringList cats = contact.categoryNames("Contacts");
-    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
-      qDebug("Cat: %s", (*it).latin1());
-    }
-*/    
-    
-//    addr.setCategories( contact.categoryNames("Contacts") );
-//    contact.categoryNames("Contacts");
-//    contact.setCategoryNames(addr.categories());
-
-/*US
-    QStringList cats = addr.categories();
-    QArray<int> cat(cats.count());
-    int counter = 0;
-    for ( QStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it )
-        cat[counter] = (*it).toInt();
-
-    contact.setCategories( cat );
-*/    
-
-    Categories catDB;
-    catDB.load( categoryFileName() );
     QStringList cats = addr.categories();
     
     QArray<int> iar;
     if ( !cats.isEmpty() ) {
-      QArray<int> iar = catDB.ids("contact", cats);
+      QArray<int> iar = catDB->ids("contact", cats);
       contact.setCategories(iar);
     }
 
     return true;
 }
diff --git a/kabc/converter/opie/opieconverter.h b/kabc/converter/opie/opieconverter.h
index 7d2ad85..c7e691f 100644
--- a/kabc/converter/opie/opieconverter.h
+++ b/kabc/converter/opie/opieconverter.h
@@ -1,80 +1,80 @@
 /*
     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_OPIECONVERTER_H
 #define KABC_OPIECONVERTER_H
 
 #include <qstring.h>
 
 #include "addressee.h"
 #include <opie/ocontact.h>
 
 class Categories;
 
 namespace KABC {
 
 class OpieConverter
 {
 public:
 
   /**
    * Constructor.
    */
   OpieConverter();
 
   /**
    * Destructor.
    */
   virtual ~OpieConverter();
   
   virtual bool init();
   virtual void deinit();
   
   /**
    * Converts a vcard string to an addressee.
    *
    * @param contact The opie contact.
    * @param addr    The addressee.
    */
-  bool opieToAddressee( OContact &contact, Addressee &addr );
+  bool opieToAddressee( const OContact &contact, Addressee &addr );
 
   /**
    * Converts an addressee to a vcard string.
    *
    * @param addr    The addressee.
    * @param contact The opie contact.
    */
   bool addresseeToOpie( const Addressee &addr, OContact &contact );
 
   private:
     Categories* catDB;
   
     
 };
 
 }
 #endif