summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/formatfactory.cpp25
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
@@ -41,12 +41,8 @@ FormatFactory *FormatFactory::self()
kdDebug(5700) << "FormatFactory::self()" << endl;
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
-
}
return mSelf;
}
@@ -62,6 +58,8 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );
+/*US lets enter all resources directly instead of using teh desktopfiles.
+
QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
@@ -83,6 +81,14 @@ FormatFactory::FormatFactory()
mFormatList.insert( type, info );
}
+*/
+ //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 );
+
}
FormatFactory::~FormatFactory()
@@ -122,11 +128,9 @@ FormatPlugin *FormatFactory::format( const QString& type )
if ( type == "vcard" ) {
format = new VCardFormatPlugin;
- /* // LR
format->setType( type );
format->setNameLabel( i18n( "vCard" ) );
format->setDescriptionLabel( i18n( "vCard Format" ) );
- */
return format;
}
@@ -139,16 +143,13 @@ FormatPlugin *FormatFactory::format( const QString& type )
if ( !library )
return 0;
- void *format_func = library->symbol( "format" );
-
+ void *format_func = library->symbol( "format");
+
if ( format_func ) {
format = ((FormatPlugin* (*)())format_func)();
- // LR
- /*
format->setType( type );
format->setNameLabel( fi->nameLabel );
format->setDescriptionLabel( fi->descriptionLabel );
- */
} else {
kdDebug( 5700 ) << "'" << libName << "' is not a format plugin." << endl;
return 0;