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 --- certmanager/lib/ui/keyrequester.cpp | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'certmanager/lib/ui/keyrequester.cpp') diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 27d9d8739..7a56ab5af 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.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. @@ -70,7 +70,7 @@ #include #include -// Qt +// TQt #include #include #include @@ -82,8 +82,8 @@ #include Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, - TQWidget * parent, const char * name ) - : TQWidget( parent, name ), + TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( multipleKeys ), @@ -94,8 +94,8 @@ Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, init(); } -Kleo::KeyRequester::KeyRequester( TQWidget * parent, const char * name ) - : TQWidget( parent, name ), +Kleo::KeyRequester::KeyRequester( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( false ), @@ -171,7 +171,7 @@ void Kleo::KeyRequester::setKey( const GpgME::Key & key ) { TQString Kleo::KeyRequester::fingerprint() const { if ( mKeys.empty() ) - return TQString::null; + return TQString(); else return mKeys.front().primaryFingerprint(); } @@ -226,14 +226,14 @@ void Kleo::KeyRequester::updateKeys() { #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) .arg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); + KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ @@ -430,15 +430,15 @@ static inline unsigned int signingKeyUsage( bool openpgp, bool smime, bool trust } Kleo::EncryptionKeyRequester::EncryptionKeyRequester( bool multi, unsigned int proto, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( encryptionKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - parent, name ) + tqparent, name ) { } -Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * parent, const char * name ) - : KeyRequester( 0, false, parent, name ) +Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * tqparent, const char * name ) + : KeyRequester( 0, false, tqparent, name ) { } @@ -451,15 +451,15 @@ void Kleo::EncryptionKeyRequester::setAllowedKeys( unsigned int proto, bool only } Kleo::SigningKeyRequester::SigningKeyRequester( bool multi, unsigned int proto, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( signingKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - parent, name ) + tqparent, name ) { } -Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * parent, const char * name ) - : KeyRequester( 0, false, parent, name ) +Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * tqparent, const char * name ) + : KeyRequester( 0, false, tqparent, name ) { } -- cgit v1.2.1