diff options
Diffstat (limited to 'kword/mailmerge/kabc')
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.cpp | 10 | ||||
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp | 2 | ||||
| -rw-r--r-- | kword/mailmerge/kabc/addresspicker.ui | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 7b8feb70..1886207c 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if( !uidAvailable ) { - return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) ); + return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) ); } @@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const TQString lat; TQString longi; if( geo.latitude()<0 ) - lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() ); + lat = TQString( i18n("%1 South") ).arg( -geo.latitude() ); else - lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() ); + lat = TQString( i18n("%1 North") ).arg( geo.latitude() ); if( geo.longitude()<0 ) // There is something going wrong, because "W" is replaced by "q ". // Needs fix. - longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() ); + longi = TQString( i18n("%1 West") ).arg( -geo.longitude() ); else - longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() ); + longi = TQString( i18n("%1 East") ).arg( geo.longitude() ); return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi ); } diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index d1c03809..24daac3f 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList() KMessageBox::information( 0, i18n( "<qt>Distribution list with the given name <b>%1</b> " "already exists. Please select a different name.</qt>" ) - .tqarg( listName ) ); + .arg( listName ) ); return; } KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index e9d389ad..46ced301 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -217,7 +217,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -236,7 +236,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> |