diff options
Diffstat (limited to 'libtdepim/addresseeview.cpp')
| -rw-r--r-- | libtdepim/addresseeview.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 15c7215ed..23f01eb5e 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -161,17 +161,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the global background color). // TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name(); - TQString cellStyle = TQString::tqfromLatin1( + TQString cellStyle = TQString::fromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").tqarg(backgroundColor); TQString backgroundColor2 = KGlobalSettings::baseColor().name(); - TQString cellStyle2 = TQString::tqfromLatin1( + TQString cellStyle2 = TQString::fromLatin1( "style=\"" "padding-left: 2px; " "background: %1;\"").tqarg(backgroundColor2); - TQString tableStyle = TQString::tqfromLatin1( + TQString tableStyle = TQString::fromLatin1( "style=\"" "border: solid 1px; " "margin: 0em;\""); @@ -179,17 +179,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // We'll be building a table to display the vCard in. // Each row of the table will be built using this string for its HTML. // - TQString rowFmtStr = TQString::tqfromLatin1( + TQString rowFmtStr = TQString::fromLatin1( "<tr>" "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed rowFmtStr.append( cellStyle ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "<b>%1</b>" "</td>" "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed rowFmtStr.append( cellStyle2 ); - rowFmtStr.append( TQString::tqfromLatin1( + rowFmtStr.append( TQString::fromLatin1( ">" // Close tag "%2" "</td>" @@ -228,9 +228,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQString url; if ( (*phoneIt).type() & KABC::PhoneNumber::Fax ) - url = TQString::tqfromLatin1( "fax:" ) + number; + url = TQString::fromLatin1( "fax:" ) + number; else - url = TQString::tqfromLatin1( "phone:" ) + number; + url = TQString::fromLatin1( "phone:" ) + number; if ( linkMask & PhoneLinks ) { TQString smsURL; @@ -239,7 +239,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .tqarg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); + .tqarg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).tqarg( url ).tqarg( number ).tqarg( smsURL ) ); } else { dynamicPart += rowFmtStr .tqarg( (*phoneIt).typeLabel().replace( " ", " " ) ) @@ -258,7 +258,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & EmailLinks ) { dynamicPart += rowFmtStr.tqarg( type ) - .tqarg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .tqarg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) .tqarg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { dynamicPart += rowFmtStr.tqarg( type ).tqarg( *emailIt ); @@ -393,22 +393,22 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // set image source to either a TQMimeSourceFactory key or a data:/ URL TQString imgSrc; if ( internalLoading ) { - imgSrc = TQString::tqfromLatin1( "im_status_%1_image").tqarg( addr.uid() ); + imgSrc = TQString::fromLatin1( "im_status_%1_image").tqarg( addr.uid() ); TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) ); } else imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); // make the status a link, if required - TQString imtqStatus; + TQString imStatus; if ( linkMask & IMLinks ) - imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); + imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); else - imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); + imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr .tqarg( i18n( "Presence" ) ) - .tqarg( imtqStatus + .tqarg( imStatus .tqarg( imgSrc ) .tqarg( proxy->presenceString( addr.uid() ) ) ); @@ -421,51 +421,51 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // do it this way to avoid cases where the substituted string // contains %1 and the like. // - TQString strAddr = TQString::tqfromLatin1( + TQString strAddr = TQString::fromLatin1( "<div align=\"center\">" "<table cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr>").tqarg(tableStyle); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") .tqarg( image ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") .tqarg( name ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%3</td>" // role "</tr>") .tqarg( role ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .tqarg( cellStyle2 ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "%4</td>" // organization "</tr>") .tqarg( organization ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( "<tr><td %2>") .tqarg( cellStyle ) ); - strAddr.append( TQString::tqfromLatin1( + strAddr.append( TQString::fromLatin1( " </td><td %2> </td></tr>") .tqarg( cellStyle2 ) ); strAddr.append( dynamicPart ); strAddr.append( notes ); strAddr.append( customData ); - strAddr.append( TQString::tqfromLatin1( "</table></div>\n" ) ); + strAddr.append( TQString::fromLatin1( "</table></div>\n" ) ); if ( addr.resource() ) { TQString addrBookName = addr.resource()->resourceName(); @@ -526,7 +526,7 @@ void AddresseeView::updateView() TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask, true, (FieldMask)fieldMask ); - strAddr = TQString::tqfromLatin1( + strAddr = TQString::fromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "%3" // dynamic part |