author | ulf69 <ulf69> | 2004-06-29 05:22:05 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:22:05 (UTC) |
commit | 6cbf4bfe5ee3b706d7b50324b5300db76eef89d6 (patch) (side-by-side diff) | |
tree | 4b5056541b3a83b2c936543782d9a7caac8e22ac | |
parent | beccf25496b482fa9eccd41f13c07e67e32f3a52 (diff) | |
download | kdepimpi-6cbf4bfe5ee3b706d7b50324b5300db76eef89d6.zip kdepimpi-6cbf4bfe5ee3b706d7b50324b5300db76eef89d6.tar.gz kdepimpi-6cbf4bfe5ee3b706d7b50324b5300db76eef89d6.tar.bz2 |
*** empty log message ***
-rw-r--r-- | kabc/formatfactory.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp index 2b073d7..f107ebf 100644 --- a/kabc/formatfactory.cpp +++ b/kabc/formatfactory.cpp @@ -43,8 +43,4 @@ FormatFactory *FormatFactory::self() if ( !mSelf ) { -#ifdef KAB_EMBEDDED +//US factoryDeleter.setObject( mSelf, new FormatFactory ); mSelf = factoryDeleter.setObject( new FormatFactory ); -#else //KAB_EMBEDDED - factoryDeleter.setObject( mSelf, new FormatFactory ); -#endif //KAB_EMBEDDED - } @@ -64,2 +60,4 @@ FormatFactory::FormatFactory() +/*US lets enter all resources directly instead of using teh desktopfiles. + QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); @@ -85,2 +83,10 @@ FormatFactory::FormatFactory() } +*/ + //US we already have vcard as default format. + info = new FormatInfo; + info->library = i18n("microkabcformat_binary"); + info->nameLabel = i18n( "Binary" ); + info->descriptionLabel = i18n( "No description available." ); + mFormatList.insert( "binary", info ); + } @@ -124,3 +130,2 @@ FormatPlugin *FormatFactory::format( const QString& type ) format = new VCardFormatPlugin; - /* // LR format->setType( type ); @@ -128,3 +133,2 @@ FormatPlugin *FormatFactory::format( const QString& type ) format->setDescriptionLabel( i18n( "vCard Format" ) ); - */ return format; @@ -141,8 +145,6 @@ FormatPlugin *FormatFactory::format( const QString& type ) - void *format_func = library->symbol( "format" ); - + void *format_func = library->symbol( "format"); + if ( format_func ) { format = ((FormatPlugin* (*)())format_func)(); - // LR - /* format->setType( type ); @@ -150,3 +152,2 @@ FormatPlugin *FormatFactory::format( const QString& type ) format->setDescriptionLabel( fi->descriptionLabel ); - */ } else { |