author | zautrix <zautrix> | 2005-06-03 14:15:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-03 14:15:57 (UTC) |
commit | 0207d193bdb6c66201562a17e68872e018ec223c (patch) (unidiff) | |
tree | c2b15d8acd9bdc7adee3d074551396d98599966f /kaddressbook | |
parent | 7aa43257ffb63e772342f24c1f7945e285171ee6 (diff) | |
download | kdepimpi-0207d193bdb6c66201562a17e68872e018ec223c.zip kdepimpi-0207d193bdb6c66201562a17e68872e018ec223c.tar.gz kdepimpi-0207d193bdb6c66201562a17e68872e018ec223c.tar.bz2 |
formateed name fix
-rw-r--r-- | kaddressbook/nameeditdialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index f5dba0f..199f3d6 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp | |||
@@ -223,33 +223,38 @@ bool NameEditDialog::changed() const | |||
223 | return mChanged; | 223 | return mChanged; |
224 | } | 224 | } |
225 | 225 | ||
226 | QString NameEditDialog::formattedName( const KABC::Addressee &addr, int type ) | 226 | QString NameEditDialog::formattedName( const KABC::Addressee &addr, int type ) |
227 | { | 227 | { |
228 | QString retval; | 228 | QString retval; |
229 | switch ( type ) { | 229 | switch ( type ) { |
230 | case SimpleName: | 230 | case SimpleName: |
231 | retval = addr.givenName() + " " + addr.familyName(); | 231 | retval = addr.givenName() + " " + addr.familyName(); |
232 | break; | 232 | break; |
233 | case FullName: | 233 | case FullName: |
234 | retval =addr.prefix() + " " + addr.givenName() + " " + | 234 | retval =addr.prefix() + " " + addr.givenName() + " " + |
235 | addr.additionalName() + " " + addr.familyName() + " " + | 235 | addr.additionalName() + " " + addr.familyName() + " " + |
236 | addr.suffix(); | 236 | addr.suffix(); |
237 | break; | 237 | break; |
238 | case ReverseName: | 238 | case ReverseName: |
239 | retval = addr.familyName() + ", " + addr.givenName(); | 239 | if ( !addr.familyName().isEmpty() ) { |
240 | retval = addr.familyName(); | ||
241 | if ( !addr.givenName().isEmpty() ) | ||
242 | retval += ", " + addr.givenName(); | ||
243 | } else | ||
244 | retval = addr.givenName(); | ||
240 | break; | 245 | break; |
241 | default: | 246 | default: |
242 | return ""; | 247 | return ""; |
243 | break; | 248 | break; |
244 | } | 249 | } |
245 | return retval.stripWhiteSpace (); | 250 | return retval.stripWhiteSpace (); |
246 | } | 251 | } |
247 | 252 | ||
248 | void NameEditDialog::parseBoxChanged( bool value ) | 253 | void NameEditDialog::parseBoxChanged( bool value ) |
249 | { | 254 | { |
250 | //AddresseeConfig::instance()->setUid( addr.uid() ); | 255 | //AddresseeConfig::instance()->setUid( addr.uid() ); |
251 | AddresseeConfig::instance()->setAutomaticNameParsing( value ); | 256 | AddresseeConfig::instance()->setAutomaticNameParsing( value ); |
252 | } | 257 | } |
253 | 258 | ||
254 | void NameEditDialog::typeChanged( int pos ) | 259 | void NameEditDialog::typeChanged( int pos ) |
255 | { | 260 | { |