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
@@ -38,18 +38,14 @@ static KStaticDeleter<FormatFactory> factoryDeleter;
38 38
39FormatFactory *FormatFactory::self() 39FormatFactory *FormatFactory::self()
40{ 40{
41 kdDebug(5700) << "FormatFactory::self()" << endl; 41 kdDebug(5700) << "FormatFactory::self()" << endl;
42 42
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 }
51 return mSelf; 47 return mSelf;
52} 48}
53 49
54FormatFactory::FormatFactory() 50FormatFactory::FormatFactory()
55{ 51{
@@ -59,12 +55,14 @@ FormatFactory::FormatFactory()
59 FormatInfo *info = new FormatInfo; 55 FormatInfo *info = new FormatInfo;
60 info->library = "<NoLibrary>"; 56 info->library = "<NoLibrary>";
61 info->nameLabel = i18n( "vCard" ); 57 info->nameLabel = i18n( "vCard" );
62 info->descriptionLabel = i18n( "vCard Format" ); 58 info->descriptionLabel = i18n( "vCard Format" );
63 mFormatList.insert( "vcard", info ); 59 mFormatList.insert( "vcard", info );
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 );
66 for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) 64 for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
67 { 65 {
68//US KSimpleConfig config( *it, true ); 66//US KSimpleConfig config( *it, true );
69 KConfig config( *it ); 67 KConfig config( *it );
70 68
@@ -80,12 +78,20 @@ FormatFactory::FormatFactory()
80 config.setGroup( "Misc" ); 78 config.setGroup( "Misc" );
81 info->nameLabel = config.readEntry( "Name" ); 79 info->nameLabel = config.readEntry( "Name" );
82 info->descriptionLabel = config.readEntry( "Comment", i18n( "No description available." ) ); 80 info->descriptionLabel = config.readEntry( "Comment", i18n( "No description available." ) );
83 81
84 mFormatList.insert( type, info ); 82 mFormatList.insert( type, info );
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}
87 93
88FormatFactory::~FormatFactory() 94FormatFactory::~FormatFactory()
89{ 95{
90 mFormatList.clear(); 96 mFormatList.clear();
91} 97}
@@ -119,39 +125,34 @@ FormatPlugin *FormatFactory::format( const QString& type )
119 125
120 if ( type.isEmpty() ) 126 if ( type.isEmpty() )
121 return 0; 127 return 0;
122 128
123 if ( type == "vcard" ) { 129 if ( type == "vcard" ) {
124 format = new VCardFormatPlugin; 130 format = new VCardFormatPlugin;
125 /* // LR
126 format->setType( type ); 131 format->setType( type );
127 format->setNameLabel( i18n( "vCard" ) ); 132 format->setNameLabel( i18n( "vCard" ) );
128 format->setDescriptionLabel( i18n( "vCard Format" ) ); 133 format->setDescriptionLabel( i18n( "vCard Format" ) );
129 */
130 return format; 134 return format;
131 } 135 }
132 136
133 FormatInfo *fi = mFormatList[ type ]; 137 FormatInfo *fi = mFormatList[ type ];
134 if (!fi) 138 if (!fi)
135 return 0; 139 return 0;
136 QString libName = fi->library; 140 QString libName = fi->library;
137#ifndef DESKTOP_VERSION 141#ifndef DESKTOP_VERSION
138 KLibrary *library = openLibrary( libName ); 142 KLibrary *library = openLibrary( libName );
139 if ( !library ) 143 if ( !library )
140 return 0; 144 return 0;
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 );
149 format->setNameLabel( fi->nameLabel ); 151 format->setNameLabel( fi->nameLabel );
150 format->setDescriptionLabel( fi->descriptionLabel ); 152 format->setDescriptionLabel( fi->descriptionLabel );
151 */
152 } else { 153 } else {
153 kdDebug( 5700 ) << "'" << libName << "' is not a format plugin." << endl; 154 kdDebug( 5700 ) << "'" << libName << "' is not a format plugin." << endl;
154 return 0; 155 return 0;
155 } 156 }
156#endif 157#endif
157 return format; 158 return format;