diff options
Diffstat (limited to 'certmanager/lib/ui')
33 files changed, 404 insertions, 379 deletions
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui index f15d2d20..121f5b1a 100644 --- a/certmanager/lib/ui/adddirectoryservicedialog.ui +++ b/certmanager/lib/ui/adddirectoryservicedialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddDirectoryServiceDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddDirectoryServiceDialog</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>serverNameLA</cstring> </property> @@ -36,12 +36,12 @@ <cstring>serverNameED</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>descriptionED</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>portED</cstring> </property> @@ -49,12 +49,12 @@ <string>389</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>serverNameED</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>usernameLA</cstring> </property> @@ -82,7 +82,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>passwordLA</cstring> </property> @@ -93,7 +93,7 @@ <cstring>passwordED</cstring> </property> </widget> - <widget class="QPushButton" row="8" column="2"> + <widget class="TQPushButton" row="8" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -104,7 +104,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="8" column="3"> + <widget class="TQPushButton" row="8" column="3"> <property name="name"> <cstring>PushButton4</cstring> </property> @@ -143,12 +143,12 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>usernameED</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>passwordED</cstring> </property> @@ -156,7 +156,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>descriptionLA</cstring> </property> @@ -167,7 +167,7 @@ <cstring>descriptionED</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>portLA</cstring> </property> diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 7567be71..a6210cab 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.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. @@ -40,14 +40,14 @@ #include <klineedit.h> /* - * Constructs a AddDirectoryServiceDialogImpl which is a child of 'parent', with the + * Constructs a AddDirectoryServiceDialogImpl which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : AddDirectoryServiceDialog( parent, name, modal, fl ) +AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : AddDirectoryServiceDialog( tqparent, name, modal, fl ) { portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); } @@ -57,7 +57,7 @@ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, */ AddDirectoryServiceDialogImpl::~AddDirectoryServiceDialogImpl() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } #include "adddirectoryservicedialogimpl.moc" diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index 3fc0d6a5..d6ad086d 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -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. @@ -37,9 +37,10 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog { Q_OBJECT + TQ_OBJECT public: - AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddDirectoryServiceDialogImpl(); }; diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 720525a1..b1a135a9 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -21,11 +21,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. @@ -76,8 +76,8 @@ namespace Kleo { class Kleo::BackendListView : public KListView { public: - BackendListView( BackendConfigWidget* parent, const char* name = 0 ) - : KListView( parent, name ) {} + BackendListView( BackendConfigWidget* tqparent, const char* name = 0 ) + : KListView( tqparent, name ) {} /// return backend for currently selected (/current) item. Used by Configure button. const Kleo::CryptoBackend* currentBackend() const; @@ -92,7 +92,7 @@ public: }; // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2") -class Kleo::BackendListViewItem : public QListViewItem +class Kleo::BackendListViewItem : public TQListViewItem { public: BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) @@ -110,7 +110,7 @@ private: // Checklist item under a BackendListViewItem // (e.g. "GpgME supports protocol OpenPGP") -class Kleo::ProtocolCheckListItem : public QCheckListItem +class Kleo::ProtocolCheckListItem : public TQCheckListItem { public: ProtocolCheckListItem( BackendListViewItem* blvi, @@ -162,7 +162,7 @@ const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const { if ( !curItem ) // can't happen return 0; if ( lvi_cast<Kleo::ProtocolCheckListItem>( curItem ) ) - curItem = curItem->parent(); + curItem = curItem->tqparent(); if ( const Kleo::BackendListViewItem * blvi = lvi_cast<Kleo::BackendListViewItem>( curItem ) ) return blvi->cryptoBackend(); return 0; @@ -175,9 +175,9 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr it.current() ; ++it ) if ( ProtocolCheckListItem * p = lvi_cast<ProtocolCheckListItem>( it.current() ) ) if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) { - // OK that's the one. Now go up to the parent backend + // OK that's the one. Now go up to the tqparent backend // (need to do that in the listview since Protocol doesn't know it) - if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->parent() ) ) + if ( const BackendListViewItem * parItem = lvi_cast<BackendListViewItem>( it.current()->tqparent() ) ) return parItem->cryptoBackend(); } return 0; @@ -196,8 +196,8 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListI //// -Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent, const char * name, WFlags f ) - : TQWidget( parent, name, f ), d( 0 ) +Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent, const char * name, WFlags f ) + : TQWidget( tqparent, name, f ), d( 0 ) { assert( factory ); d = new Private(); diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index c8b45848..83b2eea0 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -21,11 +21,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. @@ -47,8 +47,9 @@ namespace Kleo { class KDE_EXPORT BackendConfigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 ); + BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); ~BackendConfigWidget(); void load(); diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 0d383083..169af00b 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -19,11 +19,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. @@ -34,11 +34,11 @@ #include <klocale.h> #include <kaccelmanager.h> -Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) +Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent, const char* name ) : KDialogBase( Swallow, // Remove the "whats's this" button since we have no support for it WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | WStyle_Title | WStyle_SysMenu, - parent, name, true /*modal*/, + tqparent, name, true /*modal*/, i18n( "Configure" ), Default|Cancel|Apply|Ok|User1, Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) ) { diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index d25cdc16..05bb1c39 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -19,11 +19,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. @@ -46,8 +46,9 @@ namespace Kleo { class KDE_EXPORT CryptoConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 ); + CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent = 0, const char* name = 0 ); protected: virtual void slotOk(); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 3bed433e..dd92b160 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -19,11 +19,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. @@ -80,8 +80,8 @@ static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * c : KJanusWidget::IconList ; } -Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent, const char * name ) - : KJanusWidget( parent, name, determineJanusFace( config ) ), mConfig( config ) +Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent, const char * name ) + : KJanusWidget( tqparent, name, determineJanusFace( config ) ), mConfig( config ) { TQWidget * vbox = 0; if ( face() == Plain ) { @@ -98,7 +98,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg if ( comp->groupList().empty() ) continue; if ( face() != Plain ) { - vbox = addVBoxPage( comp->description(), TQString::null, loadIcon( comp->iconName() ) ); + vbox = addVBoxPage( comp->description(), TQString(), loadIcon( comp->iconName() ) ); } TQScrollView * scrollView = new TQScrollView( vbox ); @@ -125,7 +125,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg TQSize sz = scrollView->tqsizeHint(); scrollView->setMinimumSize( sz.width() + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent), - QMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); + TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { Q_ASSERT( face() == Plain ); @@ -182,8 +182,8 @@ void Kleo::CryptoConfigModule::cancel() Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* parent, const char* name ) - : TQWidget( parent, name ), + TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), mComponent( component ) { TQGridLayout * glay = new TQGridLayout( this, 1, 3, 0, KDialog::spacingHint() ); @@ -262,7 +262,7 @@ Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI( TQLabel * l = new TQLabel( widget ); l->setPixmap( loadIcon( iconName ) ); - glay->addMultiCellWidget( l, startRow, endRow, 0, 0, Qt::AlignTop ); + glay->addMultiCellWidget( l, startRow, endRow, 0, 0, TQt::AlignTop ); } bool Kleo::CryptoConfigGroupGUI::save() diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 167c3ac8..46606c55 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -19,11 +19,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. @@ -47,8 +47,9 @@ namespace Kleo { */ class CryptoConfigModule : public KJanusWidget { Q_OBJECT + TQ_OBJECT public: - CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 ); + CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent=0, const char * name=0 ); bool hasError() const; diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index cce1afea..fb9acc6c 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -19,11 +19,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. @@ -58,10 +58,11 @@ namespace Kleo { */ class CryptoConfigComponentGUI : public TQWidget { Q_OBJECT + TQ_OBJECT public: CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); bool save(); void load(); @@ -77,10 +78,11 @@ namespace Kleo { */ class CryptoConfigGroupGUI : public TQObject { Q_OBJECT + TQ_OBJECT public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* tqparent, const char* name = 0 ); bool save(); void load(); @@ -108,6 +110,7 @@ namespace Kleo { */ class CryptoConfigEntryGUI : public TQObject { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, @@ -145,13 +148,14 @@ namespace Kleo { */ class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -164,13 +168,14 @@ namespace Kleo { */ class CryptoConfigEntryPath : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -183,13 +188,14 @@ namespace Kleo { */ class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -202,13 +208,14 @@ namespace Kleo { */ class CryptoConfigEntryURL : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -221,13 +228,14 @@ namespace Kleo { */ class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -240,13 +248,14 @@ namespace Kleo { */ class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -258,13 +267,14 @@ namespace Kleo { */ class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI { Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private slots: diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 3f99ddb9..3dc3cd10 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.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. @@ -48,7 +48,7 @@ using namespace Kleo; -class QX500ListViewItem : public QListViewItem +class QX500ListViewItem : public TQListViewItem { public: QX500ListViewItem( TQListView* lv, TQListViewItem* prev, @@ -63,7 +63,7 @@ public: void setPassword( const TQString& pass ) { mPassword = pass; - setText( 4, pass.isEmpty() ? TQString::null : TQString::tqfromLatin1( "******" ) ); + setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) ); } const TQString& password() const { return mPassword; } @@ -92,8 +92,8 @@ private: Kleo::DirectoryServicesWidget::DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* parent, const char* name, WFlags fl ) - : DirectoryServicesWidgetBase( parent, name, fl ), + TQWidget* tqparent, const char* name, WFlags fl ) + : DirectoryServicesWidgetBase( tqparent, name, fl ), mConfigEntry( configEntry ) { x500LV->setSorting( -1 ); @@ -112,7 +112,7 @@ Kleo::DirectoryServicesWidget::DirectoryServicesWidget( */ DirectoryServicesWidget::~DirectoryServicesWidget() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 5c58dc09..8a275f67 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -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. @@ -44,11 +44,12 @@ class CryptoConfigEntry; class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { Q_OBJECT + TQ_OBJECT public: DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~DirectoryServicesWidget(); void load(); diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index c2c22501..9ecc87f1 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DirectoryServicesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DirectoryServicesWidgetBase</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>x500LA</cstring> </property> @@ -42,7 +42,7 @@ <cstring>x500LV</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout2</cstring> </property> @@ -50,7 +50,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Server Name</string> @@ -124,7 +124,7 @@ If you do not use a directory service, you can still use local certificates. </qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -132,7 +132,7 @@ If you do not use a directory service, you can still use local certificates. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>upButton</cstring> </property> @@ -140,7 +140,7 @@ If you do not use a directory service, you can still use local certificates. <string></string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>downButton</cstring> </property> @@ -169,7 +169,7 @@ If you do not use a directory service, you can still use local certificates. </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout3</cstring> </property> @@ -194,7 +194,7 @@ If you do not use a directory service, you can still use local certificates. </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addServicePB</cstring> </property> @@ -228,7 +228,7 @@ By clicking this button, you can select a new directory service to be used for r </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeServicePB</cstring> </property> @@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service <slot>slotMoveDown()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotAddService()</slot> <slot access="protected">slotDeleteService()</slot> <slot access="protected">slotServiceChanged( QListViewItem* )</slot> <slot access="protected">slotServiceSelected( QListViewItem* )</slot> <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 8f2bc6ec..6f42393f 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.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,12 +70,12 @@ static void prepare( TQListView * lv ) { lv->setAllColumnsShowFocus( true ); lv->setResizeMode( TQListView::LastColumn ); lv->header()->setClickEnabled( false ); - lv->addColumn( TQString::null ); + lv->addColumn( TQString() ); lv->addColumn( i18n("Description") ); } -Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent, const char * name, WFlags f ) - : TQWidget( parent, name, f ), d( 0 ) +Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent, const char * name, WFlags f ) + : TQWidget( tqparent, name, f ), d( 0 ) { assert( mapper ); d = new Private(); @@ -173,7 +173,7 @@ void Kleo::DNAttributeOrderConfigWidget::load() { const TQStringList all = Kleo::DNAttributeMapper::instance()->names(); for ( TQStringList::const_iterator it = all.begin() ; it != all.end() ; ++it ) - if ( order.find( *it ) == order.end() ) + if ( order.tqfind( *it ) == order.end() ) (void)new TQListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) ); if ( !d->placeHolderItem->listView() ) diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b33c0077..a0867c4f 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -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. @@ -45,9 +45,10 @@ namespace Kleo { class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ - DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 ); + /*! Use Kleo::DNAttributeMapper::instance()->configWidget( tqparent, name ) instead. */ + DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); ~DNAttributeOrderConfigWidget(); void load(); diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index bb9432a9..4f212517 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -1,5 +1,5 @@ /* -*- Mode: C++ -*- - KD Tools - a set of useful widgets for Qt + KD Tools - a set of useful widgets for TQt */ /**************************************************************************** @@ -27,11 +27,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 +** 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 your +** 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. @@ -42,23 +42,23 @@ #include <tqstyle.h> #include <tqpainter.h> -#ifdef QT_ACCESSIBILITY_SUPPORT +#ifdef TQT_ACCESSIBILITY_SUPPORT #include <tqaccessible.h> #endif #include <tqfontmetrics.h> #include <tqapplication.h> -KDHorizontalLine::KDHorizontalLine( TQWidget * parent, const char * name, WFlags f ) - : TQFrame( parent, name, f ), - mAlign( Qt::AlignAuto ), +KDHorizontalLine::KDHorizontalLine( TQWidget * tqparent, const char * name, WFlags f ) + : TQFrame( tqparent, name, f ), + mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { TQFrame::setFrameStyle( HLine | Sunken ); } -KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * parent, const char * name, WFlags f ) - : TQFrame( parent, name, f ), - mAlign( Qt::AlignAuto ), +KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * tqparent, const char * name, WFlags f ) + : TQFrame( tqparent, name, f ), + mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { TQFrame::setFrameStyle( HLine | Sunken ); @@ -78,7 +78,7 @@ void KDHorizontalLine::setTitle( const TQString & title ) { calculateFrame(); update(); updateGeometry(); -#ifdef QT_ACCESSIBILITY_SUPPORT +#ifdef TQT_ACCESSIBILITY_SUPPORT TQAccessible::updateAccessibility( this, 0, TQAccessible::NameChanged ); #endif } @@ -123,7 +123,7 @@ TQSize KDHorizontalLine::tqminimumSizeHint() const { const int w = fontMetrics().width( mTitle, mLenVisible ) + fontMetrics().width( TQChar( ' ' ) ); const int h = fontMetrics().height(); - return TQSize( QMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() ); + return TQSize( TQMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() ); } void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { @@ -150,11 +150,9 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (QRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); -#if QT_VERSION >= 0x030300 + const TQColor pen( (TQRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; -#endif style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 0b857bac..fe286801 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -1,5 +1,5 @@ /* -*- Mode: C++ -*- - KD Tools - a set of useful widgets for Qt + KD Tools - a set of useful widgets for TQt */ /**************************************************************************** @@ -27,11 +27,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 +** 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 your +** 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. @@ -46,10 +46,11 @@ class KDHorizontalLine : public TQFrame { Q_OBJECT - Q_PROPERTY( TQString title READ title WRITE setTitle ) + TQ_OBJECT + TQ_PROPERTY( TQString title READ title WRITE setTitle ) public: - KDHorizontalLine( TQWidget * parent=0, const char * name=0, WFlags f=0 ); - KDHorizontalLine( const TQString & title, TQWidget * parent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( const TQString & title, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); ~KDHorizontalLine(); TQString title() const { return mTitle; } @@ -74,7 +75,7 @@ private: private: TQString mTitle; - Qt::AlignmentFlags mAlign; + TQt::AlignmentFlags mAlign; int mLenVisible; }; diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 8c48f896..5bdadfd0 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.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. @@ -106,9 +106,9 @@ struct Kleo::KeyApprovalDialog::Private { Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - TQWidget * parent, const char * name, + TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), + : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), d( 0 ) { assert( !recipients.empty() ); diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index b596fc7c..993db126 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -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. @@ -57,6 +57,7 @@ namespace Kleo { class KDE_EXPORT KeyApprovalDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: struct Item { Item() : pref( UnknownPreference ) {} @@ -70,7 +71,7 @@ namespace Kleo { KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool modal=true ); ~KeyApprovalDialog(); diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index d8afcc59..7519f7e8 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.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. @@ -63,15 +63,15 @@ namespace { class ItemToolTip : public TQToolTip { public: - ItemToolTip( Kleo::KeyListView * parent ); + ItemToolTip( Kleo::KeyListView * tqparent ); protected: void maybeTip( const TQPoint & p ); private: Kleo::KeyListView * mKeyListView; }; - ItemToolTip::ItemToolTip( Kleo::KeyListView * parent ) - : TQToolTip( parent->viewport() ), mKeyListView( parent ) {} + ItemToolTip::ItemToolTip( Kleo::KeyListView * tqparent ) + : TQToolTip( tqparent->viewport() ), mKeyListView( tqparent ) {} void ItemToolTip::maybeTip( const TQPoint & p ) { if ( !mKeyListView ) @@ -117,7 +117,7 @@ struct Kleo::KeyListView::Private { std::map<TQCString,KeyListViewItem*> itemMap; }; -// a list of signals where we want to tqreplace TQListViewItem with +// a list of signals where we want to replace TQListViewItem with // Kleo:KeyListViewItem: static const struct { const char * source; @@ -135,8 +135,8 @@ static const struct { static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; -Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) - : KListView( parent, name ), +Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * tqparent, const char * name, WFlags f ) + : KListView( tqparent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), mHierarchical( false ) @@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis Kleo::KeyListView::~KeyListView() { d->updateTimer->stop(); - // need to clear here, since in ~TQListView, our children won't have + // need to clear here, since in ~TQListView, our tqchildren won't have // a valid listView() pointing to us anymore, and their dtors try to // unregister from us. clear(); @@ -261,7 +261,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) { if ( !item ) return; std::map<TQCString,KeyListViewItem*>::iterator it - = d->itemMap.find( item->key().primaryFingerprint() ); + = d->itemMap.tqfind( item->key().primaryFingerprint() ); if ( it == d->itemMap.end() ) return; Q_ASSERT( it->second == item ); @@ -276,9 +276,9 @@ void Kleo::KeyListView::doHierarchicalInsert( const GpgME::Key & key ) { return; KeyListViewItem * item = 0; if ( !key.isRoot() ) - if ( KeyListViewItem * parent = itemByFingerprint( key.chainID() ) ) { - item = new KeyListViewItem( parent, key ); - parent->setOpen( true ); + if ( KeyListViewItem * tqparent = itemByFingerprint( key.chainID() ) ) { + item = new KeyListViewItem( tqparent, key ); + tqparent->setOpen( true ); } if ( !item ) item = new KeyListViewItem( this, key ); // top-level (for now) @@ -293,12 +293,12 @@ void Kleo::KeyListView::gatherScattered() { item = item->nextSibling(); if ( cur->key().isRoot() ) continue; - if ( KeyListViewItem * parent = itemByFingerprint( cur->key().chainID() ) ) { - // found a new parent... + if ( KeyListViewItem * tqparent = itemByFingerprint( cur->key().chainID() ) ) { + // found a new tqparent... // ### todo: optimize by suppressing removing/adding the item to the itemMap... takeItem( cur ); - parent->insertItem( cur ); - parent->setOpen( true ); + tqparent->insertItem( cur ); + tqparent->setOpen( true ); } } } @@ -313,8 +313,8 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { assert( cur->childCount() == 0 ); // ### todo: optimize by suppressing removing/adding the item to the itemMap... - if ( cur->parent() ) - cur->parent()->takeItem( cur ); + if ( cur->tqparent() ) + cur->tqparent()->takeItem( cur ); else takeItem( cur ); insertItem( cur ); @@ -324,7 +324,7 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const { if ( s.isEmpty() ) return 0; - const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s ); + const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.tqfind( s ); if ( it == d->itemMap.end() ) return 0; return it->second; @@ -370,39 +370,39 @@ void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, // // -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, const GpgME::Key & key ) - : TQListViewItem( parent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ) + : TQListViewItem( tqparent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( parent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( tqparent, after ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ) - : TQListViewItem( parent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ) + : TQListViewItem( tqparent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( parent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( tqparent, after ) { setKey( key ); } Kleo::KeyListViewItem::~KeyListViewItem() { - // delete the children first... When children are deleted in the - // QLVI dtor, they don't have listView() anymore, thus they don't + // delete the tqchildren first... When tqchildren are deleted in the + // TQLVI dtor, they don't have listView() anymore, thus they don't // call deregister( this ), leading to stale entries in the // itemMap... while ( TQListViewItem * item = firstChild() ) delete item; // better do this here, too, since deletion is top-down and thus - // we're deleted when our parent item is no longer a + // we're deleted when our tqparent item is no longer a // KeyListViewItem, but a mere TQListViewItem, so our takeItem() // overload is gone by that time... if ( KeyListView * lv = listView() ) @@ -434,7 +434,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { TQString Kleo::KeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->toolTip( key(), col ) - : TQString::null ; + : TQString() ; } int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const { @@ -483,45 +483,45 @@ void Kleo::KeyListViewItem::takeItem( TQListViewItem * qlvi ) { // // -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ) - : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ) + : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ) - : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ) + : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) { } void Kleo::SubkeyKeyListViewItem::setSubkey( const GpgME::Subkey & subkey ) { mSubkey = subkey; - setKey( subkey.parent() ); + setKey( subkey.tqparent() ); } TQString Kleo::SubkeyKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->subkeyText( subkey(), col ) - : TQString::null ; + : TQString() ; } TQString Kleo::SubkeyKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->subkeyToolTip( subkey(), col ) - : TQString::null ; + : TQString() ; } const TQPixmap * Kleo::SubkeyKeyListViewItem::pixmap( int col ) const { @@ -561,45 +561,45 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userID ) - : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userID ) + : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userID ) - : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userID ) + : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) { } void Kleo::UserIDKeyListViewItem::setUserID( const GpgME::UserID & userID ) { mUserID = userID; - setKey( userID.parent() ); + setKey( userID.tqparent() ); } TQString Kleo::UserIDKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->userIDText( userID(), col ) - : TQString::null ; + : TQString() ; } TQString Kleo::UserIDKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->userIDToolTip( userID(), col ) - : TQString::null ; + : TQString() ; } const TQPixmap * Kleo::UserIDKeyListViewItem::pixmap( int col ) const { @@ -640,45 +640,45 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) { } void Kleo::SignatureKeyListViewItem::setSignature( const GpgME::UserID::Signature & signature ) { mSignature = signature; - setKey( signature.parent().parent() ); + setKey( signature.tqparent().tqparent() ); } TQString Kleo::SignatureKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->signatureText( signature(), col ) - : TQString::null ; + : TQString() ; } TQString Kleo::SignatureKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->signatureToolTip( signature(), col ) - : TQString::null ; + : TQString() ; } const TQPixmap * Kleo::SignatureKeyListViewItem::pixmap( int col ) const { diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 986ed267..6161bfe8 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -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. @@ -64,10 +64,10 @@ namespace Kleo { class KDE_EXPORT KeyListViewItem : public TQListViewItem { public: - KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); - KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ); + KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ); ~KeyListViewItem(); void setKey( const GpgME::Key & key ); @@ -103,10 +103,10 @@ namespace Kleo { class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: - SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); void setSubkey( const GpgME::Subkey & subkey ); const GpgME::Subkey & subkey() const { return mSubkey; } @@ -135,10 +135,10 @@ namespace Kleo { class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: - UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); void setUserID( const GpgME::UserID & userid ); const GpgME::UserID userID() const { return mUserID; } @@ -167,10 +167,10 @@ namespace Kleo { class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: - SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); void setSignature( const GpgME::UserID::Signature & sig ); const GpgME::UserID::Signature & signature() const { return mSignature; } @@ -200,6 +200,7 @@ namespace Kleo { class KDE_EXPORT KeyListView : public KListView { Q_OBJECT + TQ_OBJECT friend class KeyListViewItem; public: @@ -215,17 +216,17 @@ namespace Kleo { virtual const TQPixmap * pixmap( const GpgME::Key &, int ) const { return 0; } virtual int compare( const GpgME::Key & key1, const GpgME::Key & key2, const int column ) const; - virtual TQString subkeyText( const GpgME::Subkey &, int ) const { return TQString::null; } + virtual TQString subkeyText( const GpgME::Subkey &, int ) const { return TQString(); } virtual TQString subkeyToolTip( const GpgME::Subkey & subkey, int column ) const; virtual const TQPixmap * subkeyPixmap( const GpgME::Subkey &, int ) const { return 0; } virtual int subkeyCompare( const GpgME::Subkey & subkey1, const GpgME::Subkey & subkey2, const int column ) const; - virtual TQString userIDText( const GpgME::UserID &, int ) const { return TQString::null; } + virtual TQString userIDText( const GpgME::UserID &, int ) const { return TQString(); } virtual TQString userIDToolTip( const GpgME::UserID & userID, int column ) const; virtual const TQPixmap * userIDPixmap( const GpgME::UserID &, int ) const { return 0; } virtual int userIDCompare( const GpgME::UserID & userID1, const GpgME::UserID & userID2, const int column ) const; - virtual TQString signatureText( const GpgME::UserID::Signature &, int ) const { return TQString::null; } + virtual TQString signatureText( const GpgME::UserID::Signature &, int ) const { return TQString(); } virtual TQString signatureToolTip( const GpgME::UserID::Signature & sig, int column ) const; virtual const TQPixmap * signaturePixmap( const GpgME::UserID::Signature &, int ) const { return 0; } virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const; @@ -253,7 +254,7 @@ namespace Kleo { KeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display=0, - TQWidget * parent=0, const char * name=0, WFlags f=0 ); + TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); ~KeyListView(); diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 27d9d873..7a56ab5a 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 <kmessagebox.h> #include <kpushbutton.h> -// Qt +// TQt #include <tqapplication.h> #include <tqlayout.h> #include <tqtooltip.h> @@ -82,8 +82,8 @@ #include <assert.h> 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( "<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__ @@ -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 ) { } diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 07f01b64..5c7913dd 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -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. @@ -75,11 +75,12 @@ namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester class KDE_EXPORT KeyRequester : public TQWidget { Q_OBJECT + TQ_OBJECT public: KeyRequester( unsigned int allowedKeys, bool multipleKeys=false, - TQWidget * parent=0, const char * name=0 ); - // Constructor for Qt Designer - KeyRequester( TQWidget * parent=0, const char * name=0 ); + TQWidget * tqparent=0, const char * name=0 ); + // Constructor for TQt Designer + KeyRequester( TQWidget * tqparent=0, const char * name=0 ); ~KeyRequester(); const GpgME::Key & key() const; @@ -160,6 +161,7 @@ namespace Kleo { class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { Q_OBJECT + TQ_OBJECT public: enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME }; @@ -167,12 +169,12 @@ namespace Kleo { * Preferred constructor */ EncryptionKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** - * Constructor for Qt designer + * Constructor for TQt designer */ - EncryptionKeyRequester( TQWidget * parent=0, const char * name=0 ); + EncryptionKeyRequester( TQWidget * tqparent=0, const char * name=0 ); ~EncryptionKeyRequester(); void setAllowedKeys( unsigned int proto, bool onlyTrusted=true, bool onlyValid=true ); @@ -187,6 +189,7 @@ namespace Kleo { class KDE_EXPORT SigningKeyRequester : public KeyRequester { Q_OBJECT + TQ_OBJECT public: enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME }; @@ -199,12 +202,12 @@ namespace Kleo { * @param onlyValid only show valid keys */ SigningKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** - * Constructor for Qt designer + * Constructor for TQt designer */ - SigningKeyRequester( TQWidget * parent=0, const char * name=0 ); + SigningKeyRequester( TQWidget * tqparent=0, const char * name=0 ); ~SigningKeyRequester(); /* 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__ diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index ab8dc756..c0bfa7ee 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -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. @@ -65,6 +65,7 @@ namespace Kleo { class KDE_EXPORT KeySelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum KeyUsage { @@ -89,7 +90,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -98,7 +99,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -106,7 +107,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * parent=0, const char * name=0, + TQWidget * tqparent=0, const char * name=0, bool modal=true ); ~KeySelectionDialog(); diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index c209ff67..824600f1 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.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. @@ -75,9 +75,10 @@ static KGuiItem KGuiItem_showAuditLog() { class AuditLogViewer : public KDialogBase { // Q_OBJECT + TQ_OBJECT public: - explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 ) - : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"), + explicit AuditLogViewer( const TQString & log, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ) + : KDialogBase( tqparent, name, false, i18n("View GnuPG Audit Log"), Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ), m_log( /* sic */ ), m_textEdit( new TQTextEdit( this, "m_textEdit" ) ) @@ -143,13 +144,13 @@ private: } // anon namespace // static -void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) { +void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString & caption ) { if ( !job ) return; if ( !GpgME::hasFeature( AuditLogFeature ) || !job->isAuditLogSupported() ) { - KMessageBox::information( parent, i18n("Your system does not have support for GnuPG Audit Logs"), + KMessageBox::information( tqparent, i18n("Your system does not have support for GnuPG Audit Logs"), i18n("System Error") ); return; } @@ -157,7 +158,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & const GpgME::Error err = job->auditLogError(); if ( err.code() != GPG_ERR_NO_DATA ) { - KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") + KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") .arg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; @@ -166,29 +167,29 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & const TQString log = job->auditLogAsHtml(); if ( log.isEmpty() ) { - KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."), + KMessageBox::information( tqparent, i18n("No GnuPG Audit Log available for this operation."), i18n("No GnuPG Audit Log") ); return; } - auditLog( parent, log, caption ); + auditLog( tqparent, log, caption ); } // static -void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) { - AuditLogViewer * const alv = new AuditLogViewer( log, parent, "alv", Qt::WDestructiveClose ); +void MessageBox::auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ) { + AuditLogViewer * const alv = new AuditLogViewer( log, tqparent, "alv", TQt::WDestructiveClose ); alv->setCaption( caption ); alv->show(); } // static -void MessageBox::auditLog( TQWidget * parent, const Job * job ) { - auditLog( parent, job, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * tqparent, const Job * job ) { + auditLog( tqparent, job, i18n("GnuPG Audit Log Viewer") ); } // static -void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { - auditLog( parent, log, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) { + auditLog( tqparent, log, i18n("GnuPG Audit Log Viewer") ); } static TQString to_information_string( const SigningResult & result ) { @@ -220,63 +221,63 @@ static TQString to_error_string( const SigningResult & sresult, const Encryption } // static -void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { - information( parent, result, job, i18n("Signing Result"), options ); +void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { + information( tqparent, result, job, i18n("Signing Result"), options ); } // static -void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { - error( parent, result, job, i18n("Signing Error"), options ); +void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { + error( tqparent, result, job, i18n("Signing Error"), options ); } // static -void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { - information( parent, result, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { + information( tqparent, result, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { - error( parent, result, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { + error( tqparent, result, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - information( parent, sresult, eresult, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + information( tqparent, sresult, eresult, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); +void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); } // static -void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - error( parent, sresult, eresult, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + error( tqparent, sresult, eresult, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( parent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); +void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( tqparent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); } // static @@ -306,19 +307,19 @@ bool MessageBox::showAuditLogButton( const Kleo::Job * job ) { // static -void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { +void MessageBox::make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { KDialogBase * dialog = showAuditLogButton( job ) ? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes, KDialogBase::Yes, - parent, "error", true, true, + tqparent, "error", true, true, KStdGuiItem::ok(), KGuiItem_showAuditLog() ) : new KDialogBase( caption, KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, - parent, "error", true, true, + tqparent, "error", true, true, KStdGuiItem::ok() ) ; if ( options & KMessageBox::PlainCaption ) dialog->setPlainCaption( caption ); - if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, TQStringList(), TQString::null, 0, options ) ) + if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, TQStringList(), TQString(), 0, options ) ) auditLog( 0, job ); } diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index ee72e43c..64cd1a2e 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -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. @@ -54,30 +54,30 @@ namespace Kleo { class MessageBox { public: - static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void auditLog( TQWidget * parent, const Kleo::Job * job, const TQString & caption ); - static void auditLog( TQWidget * parent, const Kleo::Job * job ); - static void auditLog( TQWidget * parent, const TQString & log, const TQString & caption ); - static void auditLog( TQWidget * parent, const TQString & log ); + static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void auditLog( TQWidget * tqparent, const Kleo::Job * job, const TQString & caption ); + static void auditLog( TQWidget * tqparent, const Kleo::Job * job ); + static void auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ); + static void auditLog( TQWidget * tqparent, const TQString & log ); static bool showAuditLogButton( const Kleo::Job * job ); private: - static void make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); + static void make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); }; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index a0bc7295..91ecdef6 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.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. @@ -66,8 +66,8 @@ struct Kleo::PassphraseDialog::Private { Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & caption, - TQWidget * parent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) + TQWidget * tqparent, const char * name, bool modal ) + : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) { d = new Private(); diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 43b54042..6ff4289c 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -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. @@ -55,10 +55,11 @@ namespace Kleo { class PassphraseDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: PassphraseDialog( const TQString & description, - const TQString & caption=TQString::null, - TQWidget * parent=0, const char * name=0, + const TQString & caption=TQString(), + TQWidget * tqparent=0, const char * name=0, bool modal=true ); ~PassphraseDialog(); diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 1b14868d..b6518c60 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.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. @@ -39,8 +39,8 @@ static const int busyTimerTickInterval = 100; static const int busyTimerTickIncrement = 5; -Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) - : TQProgressBar( 0, parent, name, f ), +Kleo::ProgressBar::ProgressBar( TQWidget * tqparent, const char * name, WFlags f ) + : TQProgressBar( 0, tqparent, name, f ), mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 21953606..705fe11f 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -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. @@ -44,8 +44,9 @@ namespace Kleo { */ class KDE_EXPORT ProgressBar : public TQProgressBar { Q_OBJECT + TQ_OBJECT public: - ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); + ProgressBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); public slots: void slotProgress( const TQString & message, int type, int current, int total ); diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 58f196d1..d6552922 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.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. @@ -48,7 +48,7 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, : TQProgressDialog( creator, name, false, f ), mBaseText( baseText ) { assert( job ); - setBar( new ProgressBar( this, "tqreplacement progressbar in Kleo::ProgressDialog" ) ); + setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) ); setMinimumDuration( 2000 /*ms*/ ); setAutoReset( false ); diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index 64f53f37..c3cad24d 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -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. @@ -45,6 +45,7 @@ namespace Kleo { */ class KDE_EXPORT ProgressDialog : public TQProgressDialog { Q_OBJECT + TQ_OBJECT public: ProgressDialog( Job * job, const TQString & baseText, TQWidget * creator=0, const char * name=0, WFlags f=0 ); |