Diffstat (limited to 'libopie2/opiepim/ocontact.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index 3473baa..e34feeb 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp | |||
@@ -476,3 +476,3 @@ QString OContact::toRichText() const | |||
476 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { | 476 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { |
477 | text += QObject::tr( "<br><br><b>Work Address:</b>" ); | 477 | text += QObject::tr( "<br><b>Work Address:</b>" ); |
478 | marker = true; | 478 | marker = true; |
@@ -492,7 +492,7 @@ QString OContact::toRichText() const | |||
492 | 492 | ||
493 | } else | 493 | } |
494 | text += "<br>"; | ||
495 | |||
496 | if ( !(value = businessCity()).isEmpty() ) { | 494 | if ( !(value = businessCity()).isEmpty() ) { |
497 | marker = true; | 495 | marker = true; |
496 | if ( businessZip().isEmpty() && !businessStreet().isEmpty() ) | ||
497 | text += "<br>"; | ||
498 | text += Qtopia::escapeString(value); | 498 | text += Qtopia::escapeString(value); |
@@ -568,3 +568,3 @@ QString OContact::toRichText() const | |||
568 | 568 | ||
569 | text += "<br>"; | 569 | // text += "<br>"; |
570 | 570 | ||
@@ -573,3 +573,3 @@ QString OContact::toRichText() const | |||
573 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { | 573 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { |
574 | text += QObject::tr( "<br><br><b>Home Address:</b>" ); | 574 | text += QObject::tr( "<br><b>Home Address:</b>" ); |
575 | marker = true; | 575 | marker = true; |
@@ -588,7 +588,7 @@ QString OContact::toRichText() const | |||
588 | marker = true; | 588 | marker = true; |
589 | } else | 589 | } |
590 | text += "<br>"; | ||
591 | |||
592 | if ( !(value = homeCity()).isEmpty() ) { | 590 | if ( !(value = homeCity()).isEmpty() ) { |
593 | marker = true; | 591 | marker = true; |
592 | if ( homeZip().isEmpty() && !homeStreet().isEmpty() ) | ||
593 | text += "<br>"; | ||
594 | text += Qtopia::escapeString(value); | 594 | text += Qtopia::escapeString(value); |