Changeset View
Changeset View
Standalone View
Standalone View
src/address.cpp
Show First 20 Lines • Show All 593 Lines • ▼ Show 20 Line(s) | 590 | { | |||
---|---|---|---|---|---|
594 | 594 | | |||
595 | // FIXME: first check for iso-country-field and prefer that one | 595 | // FIXME: first check for iso-country-field and prefer that one | ||
596 | if (!country().isEmpty()) { | 596 | if (!country().isEmpty()) { | ||
597 | ciso = countryToISO(country()); | 597 | ciso = countryToISO(country()); | ||
598 | } else { | 598 | } else { | ||
599 | // fall back to our own country | 599 | // fall back to our own country | ||
600 | ciso = countryCodeFromLocale(); | 600 | ciso = countryCodeFromLocale(); | ||
601 | } | 601 | } | ||
602 | KConfig entry(QStringLiteral(":/org.kde.kcontacts/addressformatrc")); | 602 | static KConfig entry(QStringLiteral(":/org.kde.kcontacts/addressformatrc")); | ||
603 | 603 | | |||
604 | KConfigGroup group = entry.group(ciso); | 604 | KConfigGroup group = entry.group(ciso); | ||
605 | // decide whether this needs special business address formatting | 605 | // decide whether this needs special business address formatting | ||
606 | if (orgaName.isEmpty()) { | 606 | if (orgaName.isEmpty()) { | ||
607 | addrTemplate = group.readEntry("AddressFormat"); | 607 | addrTemplate = group.readEntry("AddressFormat"); | ||
608 | } else { | 608 | } else { | ||
609 | addrTemplate = group.readEntry("BusinessAddressFormat"); | 609 | addrTemplate = group.readEntry("BusinessAddressFormat"); | ||
610 | if (addrTemplate.isEmpty()) { | 610 | if (addrTemplate.isEmpty()) { | ||
▲ Show 20 Lines • Show All 115 Lines • Show Last 20 Lines |