summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -43,8 +43,4 @@ FormatFactory *FormatFactory::self()
43 if ( !mSelf ) { 43 if ( !mSelf ) {
44#ifdef KAB_EMBEDDED 44//US factoryDeleter.setObject( mSelf, new FormatFactory );
45 mSelf = factoryDeleter.setObject( new FormatFactory ); 45 mSelf = factoryDeleter.setObject( new FormatFactory );
46#else //KAB_EMBEDDED
47 factoryDeleter.setObject( mSelf, new FormatFactory );
48#endif //KAB_EMBEDDED
49
50 } 46 }
@@ -64,2 +60,4 @@ FormatFactory::FormatFactory()
64 60
61/*US lets enter all resources directly instead of using teh desktopfiles.
62
65 QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); 63 QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
@@ -85,2 +83,10 @@ FormatFactory::FormatFactory()
85 } 83 }
84*/
85 //US we already have vcard as default format.
86 info = new FormatInfo;
87 info->library = i18n("microkabcformat_binary");
88 info->nameLabel = i18n( "Binary" );
89 info->descriptionLabel = i18n( "No description available." );
90 mFormatList.insert( "binary", info );
91
86} 92}
@@ -124,3 +130,2 @@ FormatPlugin *FormatFactory::format( const QString& type )
124 format = new VCardFormatPlugin; 130 format = new VCardFormatPlugin;
125 /* // LR
126 format->setType( type ); 131 format->setType( type );
@@ -128,3 +133,2 @@ FormatPlugin *FormatFactory::format( const QString& type )
128 format->setDescriptionLabel( i18n( "vCard Format" ) ); 133 format->setDescriptionLabel( i18n( "vCard Format" ) );
129 */
130 return format; 134 return format;
@@ -141,8 +145,6 @@ FormatPlugin *FormatFactory::format( const QString& type )
141 145
142 void *format_func = library->symbol( "format" ); 146 void *format_func = library->symbol( "format");
143 147
144 if ( format_func ) { 148 if ( format_func ) {
145 format = ((FormatPlugin* (*)())format_func)(); 149 format = ((FormatPlugin* (*)())format_func)();
146 // LR
147 /*
148 format->setType( type ); 150 format->setType( type );
@@ -150,3 +152,2 @@ FormatPlugin *FormatFactory::format( const QString& type )
150 format->setDescriptionLabel( fi->descriptionLabel ); 152 format->setDescriptionLabel( fi->descriptionLabel );
151 */
152 } else { 153 } else {