summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/formatfactory.cpp21
1 files changed, 11 insertions, 10 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;
@@ -145,4 +149,2 @@ FormatPlugin *FormatFactory::format( const QString& type )
format = ((FormatPlugin* (*)())format_func)();
- // LR
- /*
format->setType( type );
@@ -150,3 +152,2 @@ FormatPlugin *FormatFactory::format( const QString& type )
format->setDescriptionLabel( fi->descriptionLabel );
- */
} else {