diff options
Diffstat (limited to 'kword/mailmerge/kabc/KWMailMergeKABC.cpp')
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 411ee5e5..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 ); } @@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) ); + addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); } } else if( rec.nodeName() == "LIST" ) @@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) ); + addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); } } else @@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool ) void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent) { - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); TQValueList<TQString>::ConstIterator it = _individualUIDs.begin(); for( ; it != _individualUIDs.end(); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("uid"),*it); rec.appendChild(recEnt); } it = _lists.begin(); for( ; !(it == _lists.end()); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("listid"),*it); rec.appendChild(recEnt); } } |