4 files changed, 49 insertions, 35 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index aaba10a..3160017 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -4,3 +4,4 @@ DISTDIR = $(shell basename $(DISTPATH))
 SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
-   libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
+   libkcal libkdepim kabc kabc/converter/opie kabc/converter/qtopia kabc/formats/binary \
+   kabc/plugins/file kabc/plugins/dir \
    kabc/plugins/ldap kabc/plugins/opie kabc/plugins/qtopia \
@@ -43,2 +44,3 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        kabc/converter/opie/Makefile$(PLATFORM) \
+       kabc/converter/qtopia/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
@@ -48,3 +50,4 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
-       kabc/plugins/qtopia/Makefile$(PLATFORM) kaddressbook/xxport/opie/Makefile$(PLATFORM) \
+       kabc/plugins/qtopia/Makefile$(PLATFORM) \
+       kaddressbook/xxport/opie/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM)
@@ -81,5 +84,8 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro
 
-kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
-        cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
-  
+kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieE.pro
+        cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
+
+kabc/converter/qtopia/Makefile$(PLATFORM): kabc/converter/qtopia/qtopiaE.pro
+        cd kabc/converter/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
+    
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
diff --git a/kabc/converter/qtopia/qtopiaE.pro b/kabc/converter/qtopia/qtopiaE.pro
index e026f2a..4241b8b 100644
--- a/kabc/converter/qtopia/qtopiaE.pro
+++ b/kabc/converter/qtopia/qtopiaE.pro
@@ -1,3 +1,3 @@
 TEMPLATE = lib
-INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(OPIEDIR)/include $(OPEDIR)/include
+INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
 #CONFIG += staticlib 
@@ -16,8 +16,6 @@ LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
-LIBS += -lopie
+LIBS += -lqpepim
 LIBS += -lqpe
-LIBS += -lqte
 
-
-TARGET  = microkabc_opieconverter
+TARGET  = microkabc_qtopiaconverter
 
@@ -26,3 +24,3 @@ TARGET  = microkabc_opieconverter
 HEADERS += \
-  opieconverter.h \
+  qtopiaconverter.h \
   
@@ -30,3 +28,3 @@ HEADERS += \
 SOURCES += \
-  opieconverter.cpp \
+  qtopiaconverter.cpp \
   
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp
index 7aa76fe..e3dd3e6 100644
--- a/kabc/converter/qtopia/qtopiaconverter.cpp
+++ b/kabc/converter/qtopia/qtopiaconverter.cpp
@@ -33,3 +33,3 @@ $Id$
 
-//US #include <qpe/categories.h>
+#include <qpe/categories.h>
 //US #include <qpe/categoryselect.h>
@@ -50,3 +50,2 @@ bool QtopiaConverter::init()
 {
-/*US
   catDB = new Categories();
@@ -61,4 +60,2 @@ bool QtopiaConverter::init()
   }
-*/
-return true;
 }
@@ -67,3 +64,2 @@ void QtopiaConverter::deinit()
 {
-/*US
   if (catDB) 
@@ -73,3 +69,2 @@ void QtopiaConverter::deinit()
   }
-*/
 }
@@ -83,3 +78,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     addr.setAdditionalName( contact.middleName() );
-    addr.setPrefix( contact.title() );
+    addr.setPrefix( contact.nameTitle() );
     addr.setSuffix( contact.suffix() );
@@ -206,4 +201,9 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() );
-    addr.insertCustom( "KADDRESSBOOK", "X-Gender", contact.gender() );
-    
+    // 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()) {
@@ -233,8 +233,10 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
 
-    
-    QStringList cats = contact.categoryNames("Contacts");
-    addr.setCategories( cats );
-//    for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
-//      qDebug("Cat: %s", (*it).latin1());
-//    }
+    QArray<int> catArray = contact.categories();
+    QString cat;
+
+    for ( unsigned int i=0; i < catArray.size(); i++ ) {
+      cat = catDB->label("contact", catArray[i]);
+      if ( !cat.isEmpty() )
+        addr.insertCategory( cat );
+    }
 
@@ -249,3 +251,3 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     contact.setMiddleName(addr.additionalName());
-    contact.setTitle(addr.prefix());
+    contact.setNameTitle(addr.prefix());
     contact.setSuffix(addr.suffix());
@@ -324,4 +326,13 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     contact.setSpouse(addr.custom( "KADDRESSBOOK", "X-Spouse" ));
-    contact.setGender(addr.custom( "KADDRESSBOOK", "X-Gender" ));
-    
+    // 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( 
@@ -342,3 +353,2 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
 
-/*US    
     QStringList cats = addr.categories();
@@ -347,6 +357,6 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     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/qtopia/qtopiaconverter.h b/kabc/converter/qtopia/qtopiaconverter.h
index aaa267a..7397113 100644
--- a/kabc/converter/qtopia/qtopiaconverter.h
+++ b/kabc/converter/qtopia/qtopiaconverter.h
@@ -34,3 +34,3 @@ $Id$
 
-//US class Categories;
+class Categories;
 
@@ -72,3 +72,3 @@ public:
   private:
-//US    Categories* catDB;
+    Categories* catDB;