summaryrefslogtreecommitdiffstats
path: root/kaddressbook/addresseditwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/addresseditwidget.cpp')
-rw-r--r--kaddressbook/addresseditwidget.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 173411f4..60b81820 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -221,35 +221,12 @@ void AddressEditWidget::updateAddressEdit()
if ( it != mAddressList.end() ) {
TDEABC::Address a = *it;
if ( !a.isEmpty() ) {
-#if TDE_VERSION >= 319
if ( a.type() & TDEABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
mAddressField->setText( a.formattedAddress( mAddressee.realName(),
mAddressee.organization() ) );
} else {
mAddressField->setText( a.formattedAddress( mAddressee.realName() ) );
}
-#else
- TQString text;
- if ( !a.street().isEmpty() )
- text += a.street() + "\n";
-
- if ( !a.postOfficeBox().isEmpty() )
- text += a.postOfficeBox() + "\n";
-
- text += a.locality() + TQString(" ") + a.region();
-
- if ( !a.postalCode().isEmpty() )
- text += TQString(", ") + a.postalCode();
-
- text += "\n";
-
- if ( !a.country().isEmpty() )
- text += a.country() + "\n";
-
- text += a.extended();
-
- mAddressField->setText( text );
-#endif
}
}