author | ulf69 <ulf69> | 2004-06-29 05:22:05 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:22:05 (UTC) |
commit | 6cbf4bfe5ee3b706d7b50324b5300db76eef89d6 (patch) (unidiff) | |
tree | 4b5056541b3a83b2c936543782d9a7caac8e22ac /kabc | |
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 | |||
@@ -41,12 +41,8 @@ FormatFactory *FormatFactory::self() | |||
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 | } |
@@ -62,6 +58,8 @@ FormatFactory::FormatFactory() | |||
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 | { |
@@ -83,6 +81,14 @@ FormatFactory::FormatFactory() | |||
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 | ||
88 | FormatFactory::~FormatFactory() | 94 | FormatFactory::~FormatFactory() |
@@ -122,11 +128,9 @@ FormatPlugin *FormatFactory::format( const QString& type ) | |||
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 | ||
@@ -139,16 +143,13 @@ FormatPlugin *FormatFactory::format( const QString& type ) | |||
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; |