diff options
Diffstat (limited to 'kaddressbook/printing/kabentrypainter.cpp')
| -rw-r--r-- | kaddressbook/printing/kabentrypainter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 91bf9f342..d7be5bd53 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, KABC::Address address; // this is used to prepare some fields for printing and decide about - // the tqlayout later: + // the layout later: TQValueList<TQStringList> parts; TQValueList<TQRectList*> contents; @@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, line1 = i18n( "Preferred Address" ); } - line1 += TQString::tqfromLatin1( ":" ); + line1 += TQString::fromLatin1( ":" ); text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); if ( !text.isEmpty() ) { - line1 = line1 + TQString::tqfromLatin1( " (" ) + text + - TQString::tqfromLatin1( ")" ); + line1 = line1 + TQString::fromLatin1( " (" ) + text + + TQString::fromLatin1( ")" ); } line1 = line1.stripWhiteSpace(); line2 = address.street(); if ( !address.postOfficeBox().isEmpty() ) - line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox(); + line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox(); // print address in american style, this will need localisation: line3 = address.locality() + ( address.region().isEmpty() ? - TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) + + TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) + address.region() ) + ( address.postalCode().isEmpty() - ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " ) + ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " ) + address.postalCode() ); line4 = address.country(); |