diff options
Diffstat (limited to 'certmanager/lib/ui/keyselectiondialog.cpp')
| -rw-r--r-- | certmanager/lib/ui/keyselectiondialog.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 1ff68570..22737199 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -24,11 +24,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. @@ -64,7 +64,7 @@ #include <kactivelabel.h> #include <kurl.h> -// Qt +// TQt #include <tqcheckbox.h> #include <tqtoolbutton.h> #include <tqlabel.h> @@ -198,7 +198,7 @@ namespace { switch ( col ) { case 0: return i18n("Key ID"); case 1: return i18n("User ID"); - default: return TQString::null; + default: return TQString(); } } @@ -227,12 +227,12 @@ namespace { { const char * uid = key.userID(0).id(); if ( key.protocol() == GpgME::Context::OpenPGP ) - return uid && *uid ? TQString::fromUtf8( uid ) : TQString::null ; + return uid && *uid ? TQString::fromUtf8( uid ) : TQString() ; else // CMS return Kleo::DN( uid ).prettyDN(); } break; - default: return TQString::null; + default: return TQString(); } } @@ -301,9 +301,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -311,7 +311,7 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, mKeyUsage( keyUsage ), mCurrentContextMenuItem( 0 ) { - init( rememberChoice, extendedSelection, text, TQString::null ); + init( rememberChoice, extendedSelection, text, TQString() ); } Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, @@ -321,9 +321,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -342,9 +342,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -562,14 +562,14 @@ void Kleo::KeySelectionDialog::slotStartCertificateManager( const TQString &quer #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( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) .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__ |