diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/urlhandlermanager.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/urlhandlermanager.cpp')
-rw-r--r-- | kmail/urlhandlermanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index e1707b1ba..0ef6bfd24 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -53,7 +53,7 @@ #include <algorithm> using std::for_each; using std::remove; -using std::tqfind; +using std::find; KMail::URLHandlerManager * KMail::URLHandlerManager::self = 0; @@ -561,7 +561,7 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return TQString(); - return i18n("Show certificate 0x%1").arg( keyId ); + return i18n("Show certificate 0x%1").tqarg( keyId ); } } @@ -689,8 +689,8 @@ namespace { if ( name.isEmpty() ) name = msgPart.name(); if ( !name.isEmpty() ) - return i18n( "Attachment: %1" ).arg( name ); - return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) ); + return i18n( "Attachment: %1" ).tqarg( name ); + return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) ); } } @@ -752,7 +752,7 @@ namespace { namespace { bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const { if ( w ) - w->emitUrlClicked( url, TQt::LeftButton ); + w->emitUrlClicked( url, Qt::LeftButton ); return true; } |