-rw-r--r-- | libopie/pim/ocontact.cpp | 18 | ||||
-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 3473baa..e34feeb 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -475,5 +475,5 @@ QString OContact::toRichText() const | |||
475 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || | 475 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || |
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; |
479 | } | 479 | } |
@@ -491,9 +491,9 @@ QString OContact::toRichText() const | |||
491 | marker = true; | 491 | marker = true; |
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); |
499 | if ( state ) | 499 | if ( state ) |
@@ -567,10 +567,10 @@ QString OContact::toRichText() const | |||
567 | } | 567 | } |
568 | 568 | ||
569 | text += "<br>"; | 569 | // text += "<br>"; |
570 | 570 | ||
571 | // home address | 571 | // home address |
572 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || | 572 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || |
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; |
576 | } | 576 | } |
@@ -587,9 +587,9 @@ QString OContact::toRichText() const | |||
587 | text += "<br>" + Qtopia::escapeString(value) + " "; | 587 | text += "<br>" + Qtopia::escapeString(value) + " "; |
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); |
595 | if ( !state.isEmpty() ) | 595 | if ( !state.isEmpty() ) |
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 | |||
@@ -475,5 +475,5 @@ QString OContact::toRichText() const | |||
475 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || | 475 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || |
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; |
479 | } | 479 | } |
@@ -491,9 +491,9 @@ QString OContact::toRichText() const | |||
491 | marker = true; | 491 | marker = true; |
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); |
499 | if ( state ) | 499 | if ( state ) |
@@ -567,10 +567,10 @@ QString OContact::toRichText() const | |||
567 | } | 567 | } |
568 | 568 | ||
569 | text += "<br>"; | 569 | // text += "<br>"; |
570 | 570 | ||
571 | // home address | 571 | // home address |
572 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || | 572 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || |
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; |
576 | } | 576 | } |
@@ -587,9 +587,9 @@ QString OContact::toRichText() const | |||
587 | text += "<br>" + Qtopia::escapeString(value) + " "; | 587 | text += "<br>" + Qtopia::escapeString(value) + " "; |
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); |
595 | if ( !state.isEmpty() ) | 595 | if ( !state.isEmpty() ) |