diff options
Diffstat (limited to 'certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp')
-rw-r--r-- | certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index 89d9dda36..5f6296781 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -126,26 +126,26 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin TQString Kleo::QGpgMEProgressTokenMapper::map( const char * tokenUtf8, int subtoken, int cur, int tot ) const { if ( !tokenUtf8 || !*tokenUtf8 ) - return TQString::null; + return TQString(); if ( qstrcmp( tokenUtf8, "file:" ) == 0 ) - return TQString::null; // gpgme's job + return TQString(); // gpgme's job return map( TQString::fromUtf8( tokenUtf8 ), subtoken, cur, tot ); } TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subtoken, int cur, int tot ) const { if ( token.startsWith( "file:" ) ) - return TQString::null; // gpgme's job + return TQString(); // gpgme's job static const Map & tokenMap = makeMap(); - const Map::const_iterator it1 = tokenMap.find( token.lower() ); + const Map::const_iterator it1 = tokenMap.tqfind( token.lower() ); if ( it1 == tokenMap.end() ) return token; - std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken ); + std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken ); if ( it2 == it1->second.end() ) - it2 = it1->second.find( 0 ); + it2 = it1->second.tqfind( 0 ); if ( it2 == it1->second.end() ) return token; const Desc & desc = it2->second; |