removed dead code from opiconverter

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
@@ -61,25 +61,25 @@ bool OpieConverter::init()
 
 }
 
 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();
@@ -220,33 +220,29 @@ bool OpieConverter::opieToAddressee( OContact &contact, Addressee &addr )
     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());
@@ -331,45 +327,22 @@ bool OpieConverter::addresseeToOpie( const Addressee &addr, OContact &contact )
     
     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
@@ -51,25 +51,25 @@ public:
    */
   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;