From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/addresseeview.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libkdepim/addresseeview.cpp') diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index d5b3e6e2..d8ead42b 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -50,9 +50,9 @@ using namespace KPIM; -AddresseeView::AddresseeView( TQWidget *parent, const char *name, +AddresseeView::AddresseeView( TQWidget *tqparent, const char *name, KConfig *config ) - : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ), + : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ), mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); @@ -359,7 +359,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr customEntry.remove( "KADDRESSBOOK-X-" ); customEntry.remove( "KADDRESSBOOK-" ); - int pos = customEntry.find( ':' ); + int pos = customEntry.tqfind( ':' ); TQString key = customEntry.left( pos ); const TQString value = customEntry.mid( pos + 1 ); @@ -367,7 +367,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( key == "BlogFeed" || key == "IMAddress" ) continue; - const TQMap::ConstIterator keyIt = titleMap.find( key ); + const TQMap::ConstIterator keyIt = titleMap.tqfind( key ); if ( keyIt != titleMap.end() ) key = keyIt.data(); @@ -399,16 +399,16 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); // make the status a link, if required - TQString imStatus; + TQString imtqStatus; if ( linkMask & IMLinks ) - imStatus = TQString::tqfromLatin1( " (%2)" ); + imtqStatus = TQString::tqfromLatin1( " (%2)" ); else - imStatus = TQString::tqfromLatin1( " (%2)" ); + imtqStatus = TQString::tqfromLatin1( " (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr .arg( i18n( "Presence" ) ) - .arg( imStatus + .arg( imtqStatus .arg( imgSrc ) .arg( proxy->presenceString( addr.uid() ) ) ); @@ -495,7 +495,7 @@ TQString AddresseeView::pixmapAsDataUrl( const TQPixmap& pixmap ) void AddresseeView::updateView() { // clear view - setText( TQString::null ); + setText( TQString() ); if ( mAddressee.isEmpty() ) return; @@ -575,9 +575,9 @@ void AddresseeView::urlClicked( const TQString &url ) void AddresseeView::emailClicked( const TQString &email ) { if ( email.startsWith( "mailto:" ) ) - kapp->invokeMailer( email.mid( 7 ), TQString::null ); + kapp->invokeMailer( email.mid( 7 ), TQString() ); else - kapp->invokeMailer( email, TQString::null ); + kapp->invokeMailer( email, TQString() ); } void AddresseeView::phoneNumberClicked( const TQString &number ) -- cgit v1.2.3