| -rw-r--r-- | Makefile.Embedded | 8 | ||||
| -rw-r--r-- | kabc/converter/opie/opieconverter.h | 4 | ||||
| -rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 19 | ||||
| -rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.h | 4 | ||||
| -rw-r--r-- | kaddressbook/xxportmanager.cpp | 10 |
5 files changed, 26 insertions, 19 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded index 3160017..143e965 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -6,5 +6,5 @@ SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ kabc/plugins/file kabc/plugins/dir \ kabc/plugins/ldap kabc/plugins/opie kabc/plugins/qtopia \ - korganizer kalarmd kaddressbook/xxport/opie kaddressbook + korganizer kalarmd kaddressbook/xxport/opie kaddressbook/xxport/qtopia kaddressbook all: tmake for i in $(SUBDIRS); do pushd $$i; \ @@ -51,4 +51,5 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ kabc/plugins/qtopia/Makefile$(PLATFORM) \ kaddressbook/xxport/opie/Makefile$(PLATFORM) \ + kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \ kaddressbook/Makefile$(PLATFORM) @@ -109,5 +110,8 @@ kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) - + +kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro + cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) + kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) diff --git a/kabc/converter/opie/opieconverter.h b/kabc/converter/opie/opieconverter.h index c7e691f..d251a24 100644 --- a/kabc/converter/opie/opieconverter.h +++ b/kabc/converter/opie/opieconverter.h @@ -52,6 +52,6 @@ public: virtual ~OpieConverter(); - virtual bool init(); - virtual void deinit(); + bool init(); + void deinit(); /** diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp index e3dd3e6..f451b8b 100644 --- a/kabc/converter/qtopia/qtopiaconverter.cpp +++ b/kabc/converter/qtopia/qtopiaconverter.cpp @@ -50,13 +50,10 @@ bool QtopiaConverter::init() { catDB = new Categories(); - if (catDB) - { - catDB->load( categoryFileName() ); - return true; - } - else - { + + if (!catDB) return false; - } + + catDB->load( categoryFileName() ); + return true; } @@ -210,5 +207,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); //US - qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1()); + qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1()); addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); } @@ -231,5 +228,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a //US QString groups() const { return find( Qtopia::Groups ); } //US QStringList groupList() const; - + QArray<int> catArray = contact.categories(); QString cat; @@ -240,5 +237,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a addr.insertCategory( cat ); } - + return true; } diff --git a/kabc/converter/qtopia/qtopiaconverter.h b/kabc/converter/qtopia/qtopiaconverter.h index 7397113..8f4c698 100644 --- a/kabc/converter/qtopia/qtopiaconverter.h +++ b/kabc/converter/qtopia/qtopiaconverter.h @@ -51,6 +51,6 @@ public: virtual ~QtopiaConverter(); - virtual bool init(); - virtual void deinit(); + bool init(); + void deinit(); /** diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 248fcab..4798ffe 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -197,5 +197,5 @@ void XXPortManager::loadPlugins() factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); - //now add the opie import library dynamically + //add the opie import library dynamically KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); if ( factory ) { @@ -204,4 +204,11 @@ void XXPortManager::loadPlugins() } + //add the qtopia import library dynamically + factory = KLibLoader::self()->factory( "microkaddrbk_qtopia_xxport" ); + if ( factory ) { + XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); + factorylist.append(xxportFactory); + } + QListIterator<XXPortFactory> it(factorylist); for ( ; it.current(); ++it ) @@ -220,5 +227,4 @@ void XXPortManager::loadPlugins() } } - } |