summaryrefslogtreecommitdiff
authoreilers <eilers>2003-09-08 12:42:26 (UTC)
committer eilers <eilers>2003-09-08 12:42:26 (UTC)
commit913788f77c3f501778b7653317a4a6b06452961d (patch) (unidiff)
treeb9393e5b7eefb87f3a421a17035b702a6b688eb7
parent7fb091e12eec52e3d73896c728fc011fe40a3eb4 (diff)
downloadopie-913788f77c3f501778b7653317a4a6b06452961d.zip
opie-913788f77c3f501778b7653317a4a6b06452961d.tar.gz
opie-913788f77c3f501778b7653317a4a6b06452961d.tar.bz2
Fixing bug #1161: No space between jobtitle and organization
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp12
-rw-r--r--libopie2/opiepim/ocontact.cpp12
2 files changed, 8 insertions, 16 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 0f05b65..fcf3b26 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -443,29 +443,25 @@ QString OContact::toRichText() const
443 cfg.setGroup("Appearance"); 443 cfg.setGroup("Appearance");
444 int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State ); 444 int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
445 445
446 // name, jobtitle and company 446 // name, jobtitle and company
447 if ( !(value = fullName()).isEmpty() ) 447 if ( !(value = fullName()).isEmpty() )
448 text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>"; 448 text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
449 449
450 if ( !(value = jobTitle()).isEmpty() ) 450 if ( !(value = jobTitle()).isEmpty() )
451 text += Qtopia::escapeString(value); 451 text += Qtopia::escapeString(value) + " ";
452 452
453 comp = company(); 453 comp = company();
454 if ( !(value = department()).isEmpty() ) { 454 if ( !(value = department()).isEmpty() ) {
455 text += Qtopia::escapeString(value); 455 text += Qtopia::escapeString(value);
456 if ( comp ) 456 if ( comp )
457 text += ", "; 457 text += ", " + Qtopia::escapeString(comp);
458 else 458 }else if ( comp )
459 text += "<br>"; 459 text += "<br>" + Qtopia::escapeString(comp);
460 }
461 if ( !comp.isEmpty() )
462 text += Qtopia::escapeString(comp);
463
464 text += "<br><hr>"; 460 text += "<br><hr>";
465 461
466 // defailt email 462 // defailt email
467 QString defEmail = defaultEmail(); 463 QString defEmail = defaultEmail();
468 if ( !defEmail.isEmpty() ){ 464 if ( !defEmail.isEmpty() ){
469 text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>" 465 text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
470 + Qtopia::escapeString(defEmail); 466 + Qtopia::escapeString(defEmail);
471 marker = true; 467 marker = true;
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 0f05b65..fcf3b26 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -443,29 +443,25 @@ QString OContact::toRichText() const
443 cfg.setGroup("Appearance"); 443 cfg.setGroup("Appearance");
444 int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State ); 444 int addressformat = cfg.readNumEntry( "AddressFormat", Zip_City_State );
445 445
446 // name, jobtitle and company 446 // name, jobtitle and company
447 if ( !(value = fullName()).isEmpty() ) 447 if ( !(value = fullName()).isEmpty() )
448 text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>"; 448 text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>";
449 449
450 if ( !(value = jobTitle()).isEmpty() ) 450 if ( !(value = jobTitle()).isEmpty() )
451 text += Qtopia::escapeString(value); 451 text += Qtopia::escapeString(value) + " ";
452 452
453 comp = company(); 453 comp = company();
454 if ( !(value = department()).isEmpty() ) { 454 if ( !(value = department()).isEmpty() ) {
455 text += Qtopia::escapeString(value); 455 text += Qtopia::escapeString(value);
456 if ( comp ) 456 if ( comp )
457 text += ", "; 457 text += ", " + Qtopia::escapeString(comp);
458 else 458 }else if ( comp )
459 text += "<br>"; 459 text += "<br>" + Qtopia::escapeString(comp);
460 }
461 if ( !comp.isEmpty() )
462 text += Qtopia::escapeString(comp);
463
464 text += "<br><hr>"; 460 text += "<br><hr>";
465 461
466 // defailt email 462 // defailt email
467 QString defEmail = defaultEmail(); 463 QString defEmail = defaultEmail();
468 if ( !defEmail.isEmpty() ){ 464 if ( !defEmail.isEmpty() ){
469 text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>" 465 text += "<b><img src=\"addressbook/email\"> " + QObject::tr("Default Email: ") + "</b>"
470 + Qtopia::escapeString(defEmail); 466 + Qtopia::escapeString(defEmail);
471 marker = true; 467 marker = true;