diff options
Diffstat (limited to 'certmanager/lib/ui')
31 files changed, 912 insertions, 912 deletions
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 973266b1..7567be71 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -36,7 +36,7 @@ #include "adddirectoryservicedialogimpl.h" -#include <qvalidator.h> +#include <tqvalidator.h> #include <klineedit.h> /* @@ -46,10 +46,10 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( QWidget* parent, const char* name, bool modal, WFlags fl ) +AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddDirectoryServiceDialog( parent, name, modal, fl ) { - portED->setValidator( new QIntValidator( 0, 65535, portED ) ); + portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); } /* diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index deee0643..3fc0d6a5 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -39,7 +39,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog Q_OBJECT public: - AddDirectoryServiceDialogImpl( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* parent = 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 c40890a4..2871b920 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -49,10 +49,10 @@ #include <kapplication.h> #include <dcopclient.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qheader.h> -#include <qtimer.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqtimer.h> #include <assert.h> @@ -63,8 +63,8 @@ namespace Kleo { class Kleo::BackendConfigWidget::Private { public: Kleo::BackendListView * listView; - QPushButton * configureButton; - QPushButton * rescanButton; + TQPushButton * configureButton; + TQPushButton * rescanButton; Kleo::CryptoBackendFactory * backendFactory; }; @@ -86,7 +86,7 @@ public: const Kleo::CryptoBackend* chosenBackend( const char * protocol ); /// deselect all except one for a given protocol type (radiobutton-like exclusivity) - void deselectAll( const char * protocol, QCheckListItem* except ); + void deselectAll( const char * protocol, TQCheckListItem* except ); void emitChanged() { static_cast<BackendConfigWidget *>( parentWidget() )->emitChanged( true ); } }; @@ -95,8 +95,8 @@ public: class Kleo::BackendListViewItem : public QListViewItem { public: - BackendListViewItem( KListView* lv, QListViewItem *prev, const CryptoBackend *cryptoBackend ) - : QListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend ) + BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) + : TQListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend ) {} const CryptoBackend *cryptoBackend() const { return mCryptoBackend; } @@ -114,10 +114,10 @@ class Kleo::ProtocolCheckListItem : public QCheckListItem { public: ProtocolCheckListItem( BackendListViewItem* blvi, - QListViewItem* prev, const char * protocolName, + TQListViewItem* prev, const char * protocolName, const CryptoBackend::Protocol* protocol ) // can be 0 - : QCheckListItem( blvi, prev, itemText( protocolName, protocol ), - QCheckListItem::CheckBox ), + : TQCheckListItem( blvi, prev, itemText( protocolName, protocol ), + TQCheckListItem::CheckBox ), mProtocol( protocol ), mProtocolName( protocolName ) {} @@ -135,20 +135,20 @@ protected: if ( b ) lv->deselectAll( mProtocolName, this ); lv->emitChanged(); - QCheckListItem::stateChange( b ); + TQCheckListItem::stateChange( b ); } private: // Helper for the constructor. - static QString itemText( const char * protocolName, const CryptoBackend::Protocol* protocol ) { + static TQString itemText( const char * protocolName, const CryptoBackend::Protocol* protocol ) { // First one is the generic name (find a nice one for OpenPGP, SMIME) - const QString protoName = qstricmp( protocolName, "openpgp" ) != 0 + const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0 ? qstricmp( protocolName, "smime" ) != 0 - ? QString::fromLatin1( protocolName ) + ? TQString::fromLatin1( protocolName ) : i18n( "S/MIME" ) : i18n( "OpenPGP" ); // second one is implementation name (gpg, gpgsm...) - const QString impName = protocol ? protocol->displayName() : i18n( "failed" ); + const TQString impName = protocol ? protocol->displayName() : i18n( "failed" ); return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)", "%1 (%2)" ).arg( protoName, impName ); } @@ -158,7 +158,7 @@ private: }; const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const { - const QListViewItem* curItem = currentItem(); + const TQListViewItem* curItem = currentItem(); if ( !curItem ) // can't happen return 0; if ( lvi_cast<Kleo::ProtocolCheckListItem>( curItem ) ) @@ -168,10 +168,10 @@ const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const { return 0; } -// can't be const method due to QListViewItemIterator (why?) +// can't be const method due to TQListViewItemIterator (why?) const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * protocolName ) { - for ( QListViewItemIterator it( this /*, QListViewItemIterator::Checked doesn't work*/ ) ; + for ( TQListViewItemIterator it( this /*, TQListViewItemIterator::Checked doesn't work*/ ) ; it.current() ; ++it ) if ( ProtocolCheckListItem * p = lvi_cast<ProtocolCheckListItem>( it.current() ) ) if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) { @@ -183,9 +183,9 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr return 0; } -void Kleo::BackendListView::deselectAll( const char * protocolName, QCheckListItem* except ) +void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListItem* except ) { - for ( QListViewItemIterator it( this /*, QListViewItemIterator::Checked doesn't work*/ ) ; + for ( TQListViewItemIterator it( this /*, TQListViewItemIterator::Checked doesn't work*/ ) ; it.current() ; ++it ) { if ( it.current() == except ) continue; if ( ProtocolCheckListItem * p = lvi_cast<ProtocolCheckListItem>( it.current() ) ) @@ -196,15 +196,15 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, QCheckListIt //// -Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, QWidget * parent, const char * name, WFlags f ) - : QWidget( parent, name, f ), d( 0 ) +Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( factory ); d = new Private(); d->backendFactory = factory; - QHBoxLayout * hlay = - new QHBoxLayout( this, 0, KDialog::spacingHint() ); + TQHBoxLayout * hlay = + new TQHBoxLayout( this, 0, KDialog::spacingHint() ); d->listView = new BackendListView( this, "d->listView" ); d->listView->addColumn( i18n("Available Backends") ); @@ -215,24 +215,24 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, SIGNAL(selectionChanged(QListViewItem*)), - SLOT(slotSelectionChanged(QListViewItem*)) ); + connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - QVBoxLayout * vlay = new QVBoxLayout( hlay ); // inherits spacing + TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing - d->configureButton = new QPushButton( i18n("Confi&gure..."), this ); + d->configureButton = new TQPushButton( i18n("Confi&gure..."), this ); d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, SIGNAL(clicked()), - SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotConfigureButtonClicked()) ); - d->rescanButton = new QPushButton( i18n("Rescan"), this ); + d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, SIGNAL(clicked()), - SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQT_SIGNAL(clicked()), + TQT_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -278,7 +278,7 @@ void Kleo::BackendConfigWidget::load() { slotSelectionChanged( d->listView->firstChild() ); } -void Kleo::BackendConfigWidget::slotSelectionChanged( QListViewItem * ) { +void Kleo::BackendConfigWidget::slotSelectionChanged( TQListViewItem * ) { const CryptoBackend* backend = d->listView->currentBackend(); if ( backend && !backend->config() ) kdDebug(5150) << "Backend w/o config object!" << endl; @@ -287,7 +287,7 @@ void Kleo::BackendConfigWidget::slotSelectionChanged( QListViewItem * ) { void Kleo::BackendConfigWidget::slotRescanButtonClicked() { - QStringList reasons; + TQStringList reasons; d->backendFactory->scanForBackends( &reasons ); if ( !reasons.empty() ) KMessageBox::informationList( this, @@ -302,11 +302,11 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { if ( backend && backend->config() ) { Kleo::CryptoConfigDialog dlg( backend->config(), this ); int result = dlg.exec(); - if ( result == QDialog::Accepted ) { + if ( result == TQDialog::Accepted ) { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed - kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", QByteArray() ); + kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - QTimer::singleShot( 0, this, SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 0e26655c..57a1675a 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -34,7 +34,7 @@ #ifndef __KLEO_UI_BACKENDCONFIGWIDGET_H__ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ -#include <qwidget.h> +#include <tqwidget.h> #include <kdepimmacros.h> namespace Kleo { @@ -45,10 +45,10 @@ class QListViewItem; namespace Kleo { - class KDE_EXPORT BackendConfigWidget : public QWidget { + class KDE_EXPORT BackendConfigWidget : public TQWidget { Q_OBJECT public: - BackendConfigWidget( CryptoBackendFactory * factory, QWidget * parent=0, const char * name=0, WFlags f=0 ); + BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~BackendConfigWidget(); void load(); @@ -60,7 +60,7 @@ namespace Kleo { void changed( bool ); private slots: - void slotSelectionChanged( QListViewItem * ); + void slotSelectionChanged( TQListViewItem * ); void slotRescanButtonClicked(); void slotConfigureButtonClicked(); diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 3fa0a97c..47242994 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kaccelmanager.h> -Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, QWidget *parent, const char* name ) +Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, 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, @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, QWidge { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, SIGNAL( changed() ), SLOT( slotChanged() ) ); + connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); enableButton( Apply, false ); // Automatically assign accelerators diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 484c55ea..d25cdc16 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -47,7 +47,7 @@ namespace Kleo { { Q_OBJECT public: - CryptoConfigDialog( Kleo::CryptoConfig* config, QWidget *parent = 0, const char* name = 0 ); + CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 ); protected: virtual void slotOk(); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index dbc8edc5..70b0a0be 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -45,21 +45,21 @@ #include <kglobal.h> #include <kurlrequester.h> -#include <qgrid.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qapplication.h> +#include <tqgrid.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqapplication.h> using namespace Kleo; -static inline QPixmap loadIcon( QString s ) { +static inline TQPixmap loadIcon( TQString s ) { return KGlobal::instance()->iconLoader() - ->loadIcon( s.replace( QRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium ); } static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * config ) { @@ -68,31 +68,31 @@ static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * c : KJanusWidget::IconList ; } -Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, QWidget * parent, const char * name ) +Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent, const char * name ) : KJanusWidget( parent, name, determineJanusFace( config ) ), mConfig( config ) { - QWidget * vbox = 0; + TQWidget * vbox = 0; if ( face() == Plain ) { vbox = plainPage(); - QVBoxLayout * vlay = new QVBoxLayout( vbox, 0, KDialog::spacingHint() ); + TQVBoxLayout * vlay = new TQVBoxLayout( vbox, 0, KDialog::spacingHint() ); vlay->setAutoAdd( true ); } - const QStringList components = config->componentList(); - for ( QStringList::const_iterator it = components.begin(); it != components.end(); ++it ) { + const TQStringList components = config->componentList(); + for ( TQStringList::const_iterator it = components.begin(); it != components.end(); ++it ) { //kdDebug(5150) << "Component " << (*it).local8Bit() << ":" << endl; Kleo::CryptoConfigComponent* comp = config->component( *it ); Q_ASSERT( comp ); if ( comp->groupList().empty() ) continue; if ( face() != Plain ) { - vbox = addVBoxPage( comp->description(), QString::null, loadIcon( comp->iconName() ) ); + vbox = addVBoxPage( comp->description(), TQString::null, loadIcon( comp->iconName() ) ); } - QScrollView * scrollView = new QScrollView( vbox ); - scrollView->setHScrollBarMode( QScrollView::AlwaysOff ); - scrollView->setResizePolicy( QScrollView::AutoOneFit ); - QVBox* boxInScrollView = new QVBox( scrollView->viewport() ); + TQScrollView * scrollView = new TQScrollView( vbox ); + scrollView->setHScrollBarMode( TQScrollView::AlwaysOff ); + scrollView->setResizePolicy( TQScrollView::AutoOneFit ); + TQVBox* boxInScrollView = new TQVBox( scrollView->viewport() ); boxInScrollView->setMargin( KDialog::marginHint() ); scrollView->addChild( boxInScrollView ); @@ -102,7 +102,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, QWidge mComponentGUIs.append( compGUI ); // Set a nice startup size - const int deskHeight = QApplication::desktop()->height(); + const int deskHeight = TQApplication::desktop()->height(); int dialogHeight; if (deskHeight > 1000) // very big desktop ? dialogHeight = 800; @@ -110,9 +110,9 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, QWidge dialogHeight = 500; else // small (800x600, 640x480) desktop dialogHeight = 400; - QSize sz = scrollView->sizeHint(); + TQSize sz = scrollView->sizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->style().pixelMetric(QStyle::PM_ScrollBarExtent), + + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent), QMIN( compGUI->sizeHint().height(), dialogHeight ) ); } } @@ -120,7 +120,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, QWidge void Kleo::CryptoConfigModule::save() { bool changed = false; - QValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); + TQValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); for( ; it != mComponentGUIs.end(); ++it ) { if ( (*it)->save() ) changed = true; @@ -131,7 +131,7 @@ void Kleo::CryptoConfigModule::save() void Kleo::CryptoConfigModule::reset() { - QValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); + TQValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); for( ; it != mComponentGUIs.end(); ++it ) { (*it)->load(); } @@ -139,7 +139,7 @@ void Kleo::CryptoConfigModule::reset() void Kleo::CryptoConfigModule::defaults() { - QValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); + TQValueList<CryptoConfigComponentGUI *>::Iterator it = mComponentGUIs.begin(); for( ; it != mComponentGUIs.end(); ++it ) { (*it)->defaults(); } @@ -154,15 +154,15 @@ void Kleo::CryptoConfigModule::cancel() Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - QWidget* parent, const char* name ) - : QWidget( parent, name ), + TQWidget* parent, const char* name ) + : TQWidget( parent, name ), mComponent( component ) { - QGridLayout * glay = new QGridLayout( this, 1, 3, 0, KDialog::spacingHint() ); - const QStringList groups = mComponent->groupList(); + TQGridLayout * glay = new TQGridLayout( this, 1, 3, 0, KDialog::spacingHint() ); + const TQStringList groups = mComponent->groupList(); if ( groups.size() > 1 ) { glay->setColSpacing( 0, KDHorizontalLine::indentHint() ); - for ( QStringList::const_iterator it = groups.begin(), end = groups.end() ; it != end; ++it ) { + for ( TQStringList::const_iterator it = groups.begin(), end = groups.end() ; it != end; ++it ) { Kleo::CryptoConfigGroup* group = mComponent->group( *it ); Q_ASSERT( group ); if ( !group ) @@ -182,7 +182,7 @@ Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI( bool Kleo::CryptoConfigComponentGUI::save() { bool changed = false; - QValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); + TQValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); for( ; it != mGroupGUIs.end(); ++it ) { if ( (*it)->save() ) changed = true; @@ -192,14 +192,14 @@ bool Kleo::CryptoConfigComponentGUI::save() void Kleo::CryptoConfigComponentGUI::load() { - QValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); + TQValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); for( ; it != mGroupGUIs.end(); ++it ) (*it)->load(); } void Kleo::CryptoConfigComponentGUI::defaults() { - QValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); + TQValueList<CryptoConfigGroupGUI *>::Iterator it = mGroupGUIs.begin(); for( ; it != mGroupGUIs.end(); ++it ) (*it)->defaults(); } @@ -208,12 +208,12 @@ void Kleo::CryptoConfigComponentGUI::defaults() Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - QGridLayout * glay, QWidget* widget, const char* name ) - : QObject( module, name ), mGroup( group ) + TQGridLayout * glay, TQWidget* widget, const char* name ) + : TQObject( module, name ), mGroup( group ) { const int startRow = glay->numRows(); - const QStringList entries = mGroup->entryList(); - for( QStringList::const_iterator it = entries.begin(), end = entries.end() ; it != end; ++it ) { + const TQStringList entries = mGroup->entryList(); + for( TQStringList::const_iterator it = entries.begin(), end = entries.end() ; it != end; ++it ) { Kleo::CryptoConfigEntry* entry = group->entry( *it ); Q_ASSERT( entry ); if ( entry->level() > CryptoConfigEntry::Level_Advanced ) continue; @@ -228,11 +228,11 @@ Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI( if ( endRow < startRow ) return; - const QString iconName = group->iconName(); + const TQString iconName = group->iconName(); if ( iconName.isEmpty() ) return; - QLabel * l = new QLabel( widget ); + TQLabel * l = new TQLabel( widget ); l->setPixmap( loadIcon( iconName ) ); glay->addMultiCellWidget( l, startRow, endRow, 0, 0, Qt::AlignTop ); } @@ -240,7 +240,7 @@ Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI( bool Kleo::CryptoConfigGroupGUI::save() { bool changed = false; - QValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); + TQValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); for( ; it != mEntryGUIs.end(); ++it ) { if ( (*it)->isChanged() ) { (*it)->save(); @@ -252,21 +252,21 @@ bool Kleo::CryptoConfigGroupGUI::save() void Kleo::CryptoConfigGroupGUI::load() { - QValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); + TQValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); for( ; it != mEntryGUIs.end(); ++it ) (*it)->load(); } void Kleo::CryptoConfigGroupGUI::defaults() { - QValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); + TQValueList<CryptoConfigEntryGUI *>::Iterator it = mEntryGUIs.begin(); for( ; it != mEntryGUIs.end(); ++it ) (*it)->resetToDefault(); } //// -CryptoConfigEntryGUI* Kleo::CryptoConfigEntryGUIFactory::createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const QString& entryName, QGridLayout * glay, QWidget* widget, const char* name ) +CryptoConfigEntryGUI* Kleo::CryptoConfigEntryGUIFactory::createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * glay, TQWidget* widget, const char* name ) { if ( entry->isList() ) { switch( entry->argType() ) { @@ -317,18 +317,18 @@ CryptoConfigEntryGUI* Kleo::CryptoConfigEntryGUIFactory::createEntryGUI( CryptoC Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, + const TQString& entryName, const char* name ) - : QObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) + : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, SIGNAL( changed() ), module, SIGNAL( changed() ) ); + connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); } -QString Kleo::CryptoConfigEntryGUI::description() const +TQString Kleo::CryptoConfigEntryGUI::description() const { - QString descr = mEntry->description(); + TQString descr = mEntry->description(); if ( descr.isEmpty() ) // shouldn't happen - descr = QString( "<%1>" ).arg( mName ); + descr = TQString( "<%1>" ).arg( mName ); return descr; } @@ -342,20 +342,20 @@ void Kleo::CryptoConfigEntryGUI::resetToDefault() Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { const int row = glay->numRows(); mLineEdit = new KLineEdit( widget ); - QLabel* label = new QLabel( mLineEdit, description(), widget ); + TQLabel* label = new TQLabel( mLineEdit, description(), widget ); glay->addWidget( label, row, 1 ); glay->addWidget( mLineEdit, row, 2 ); if ( entry->isReadOnly() ) { label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, SIGNAL( textChanged( const QString& ) ), SLOT( slotChanged() ) ); + connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); } } @@ -373,21 +373,21 @@ void Kleo::CryptoConfigEntryLineEdit::doLoad() Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { const int row = glay->numRows(); mUrlRequester = new KURLRequester( widget ); mUrlRequester->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - QLabel* label = new QLabel( mUrlRequester, description(), widget ); + TQLabel* label = new TQLabel( mUrlRequester, description(), widget ); glay->addWidget( label, row, 1 ); glay->addWidget( mUrlRequester, row, 2 ); if ( entry->isReadOnly() ) { label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, SIGNAL( textChanged( const QString& ) ), SLOT( slotChanged() ) ); + connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); } } @@ -407,21 +407,21 @@ void Kleo::CryptoConfigEntryPath::doLoad() Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { const int row = glay->numRows(); mUrlRequester = new KURLRequester( widget ); mUrlRequester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - QLabel* label = new QLabel( mUrlRequester, description(), widget ); + TQLabel* label = new TQLabel( mUrlRequester, description(), widget ); glay->addWidget( label, row, 1 ); glay->addWidget( mUrlRequester, row, 2 ); if ( entry->isReadOnly() ) { label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, SIGNAL( textChanged( const QString& ) ), SLOT( slotChanged() ) ); + connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); } } @@ -442,21 +442,21 @@ void Kleo::CryptoConfigEntryDirPath::doLoad() Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { const int row = glay->numRows(); mUrlRequester = new KURLRequester( widget ); mUrlRequester->setMode( KFile::File | KFile::ExistingOnly ); - QLabel* label = new QLabel( mUrlRequester, description(), widget ); + TQLabel* label = new TQLabel( mUrlRequester, description(), widget ); glay->addWidget( label, row, 1 ); glay->addWidget( mUrlRequester, row, 2 ); if ( entry->isReadOnly() ) { label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, SIGNAL( textChanged( const QString& ) ), SLOT( slotChanged() ) ); + connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); } } @@ -474,8 +474,8 @@ void Kleo::CryptoConfigEntryURL::doLoad() Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { @@ -490,7 +490,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( const int row = glay->numRows(); mNumInput = new KIntNumInput( widget ); - QLabel* label = new QLabel( mNumInput, description(), widget ); + TQLabel* label = new TQLabel( mNumInput, description(), widget ); glay->addWidget( label, row, 1 ); glay->addWidget( mNumInput, row, 2 ); @@ -500,7 +500,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, SIGNAL( valueChanged(int) ), SLOT( slotChanged() ) ); + connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); } } @@ -541,18 +541,18 @@ void Kleo::CryptoConfigEntrySpinBox::doLoad() Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { const int row = glay->numRows(); - mCheckBox = new QCheckBox( widget ); + mCheckBox = new TQCheckBox( widget ); glay->addMultiCellWidget( mCheckBox, row, row, 1, 2 ); mCheckBox->setText( description() ); if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, SIGNAL( toggled(bool) ), SLOT( slotChanged() ) ); + connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); } } @@ -569,16 +569,16 @@ void Kleo::CryptoConfigEntryCheckBox::doLoad() Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * glay, QWidget* widget, const char* name ) + const TQString& entryName, + TQGridLayout * glay, TQWidget* widget, const char* name ) : CryptoConfigEntryGUI( module, entry, entryName, name ) { - mLabel = new QLabel( widget ); - mPushButton = new QPushButton( i18n( "Edit..." ), widget ); + mLabel = new TQLabel( widget ); + mPushButton = new TQPushButton( i18n( "Edit..." ), widget ); const int row = glay->numRows(); - glay->addWidget( new QLabel( mPushButton, description(), widget ), row, 1 ); - QHBoxLayout * hlay = new QHBoxLayout; + glay->addWidget( new TQLabel( mPushButton, description(), widget ), row, 1 ); + TQHBoxLayout * hlay = new QHBoxLayout; glay->addLayout( hlay, row, 2 ); hlay->addWidget( mLabel, 1 ); hlay->addWidget( mPushButton ); @@ -587,7 +587,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, SIGNAL( clicked() ), SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); } } @@ -612,7 +612,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, SIGNAL( defaultClicked() ), dirserv, SLOT( defaults() ) ); + connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 18581459..70c4a269 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -34,7 +34,7 @@ #include <kjanuswidget.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> namespace Kleo { @@ -43,12 +43,12 @@ namespace Kleo { /** * Crypto Config Module widget, dynamically generated from CryptoConfig - * It's a simple QWidget so that it can be embedded into a dialog or into a KCModule. + * It's a simple TQWidget so that it can be embedded into a dialog or into a KCModule. */ class CryptoConfigModule : public KJanusWidget { Q_OBJECT public: - CryptoConfigModule( Kleo::CryptoConfig* config, QWidget * parent=0, const char * name=0 ); + CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 ); void save(); void reset(); // i.e. reload current settings, discarding user input @@ -60,7 +60,7 @@ namespace Kleo { private: Kleo::CryptoConfig* mConfig; - QValueList<CryptoConfigComponentGUI *> mComponentGUIs; + TQValueList<CryptoConfigComponentGUI *> mComponentGUIs; }; } diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index 22145f32..3e71b8de 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -32,9 +32,9 @@ #ifndef CRYPTOCONFIGMODULE_P_H #define CRYPTOCONFIGMODULE_P_H -#include <qtabwidget.h> -#include <qhbox.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqhbox.h> +#include <tqcheckbox.h> #include <kurl.h> class KLineEdit; @@ -56,12 +56,12 @@ namespace Kleo { /** * A widget corresponding to a component in the crypto config */ - class CryptoConfigComponentGUI : public QWidget { + class CryptoConfigComponentGUI : public TQWidget { Q_OBJECT public: CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - QWidget* parent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -69,18 +69,18 @@ namespace Kleo { private: Kleo::CryptoConfigComponent* mComponent; - QValueList<CryptoConfigGroupGUI *> mGroupGUIs; + TQValueList<CryptoConfigGroupGUI *> mGroupGUIs; }; /** * A class managing widgets corresponding to a group in the crypto config */ - class CryptoConfigGroupGUI : public QObject { + class CryptoConfigGroupGUI : public TQObject { Q_OBJECT public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - QGridLayout * layout, QWidget* parent, const char* name = 0 ); + TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -88,7 +88,7 @@ namespace Kleo { private: Kleo::CryptoConfigGroup* mGroup; - QValueList<CryptoConfigEntryGUI *> mEntryGUIs; + TQValueList<CryptoConfigEntryGUI *> mEntryGUIs; }; /** @@ -99,19 +99,19 @@ namespace Kleo { public: static CryptoConfigEntryGUI* createEntryGUI( CryptoConfigModule* module, - Kleo::CryptoConfigEntry* entry, const QString& entryName, - QGridLayout * layout, QWidget* widget, const char* name = 0 ); + Kleo::CryptoConfigEntry* entry, const TQString& entryName, + TQGridLayout * layout, TQWidget* widget, const char* name = 0 ); }; /** * Base class for the widget managers tied to an entry in the crypto config */ - class CryptoConfigEntryGUI : public QObject { + class CryptoConfigEntryGUI : public TQObject { Q_OBJECT public: CryptoConfigEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, + const TQString& entryName, const char* name = 0 ); virtual ~CryptoConfigEntryGUI() {} @@ -119,7 +119,7 @@ namespace Kleo { void save() { Q_ASSERT( mChanged ); doSave(); mChanged = false; } void resetToDefault(); - QString description() const; + TQString description() const; bool isChanged() const { return mChanged; } signals: @@ -136,7 +136,7 @@ namespace Kleo { virtual void doLoad() = 0; Kleo::CryptoConfigEntry* mEntry; - QString mName; + TQString mName; bool mChanged; }; @@ -149,9 +149,9 @@ namespace Kleo { public: CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -168,9 +168,9 @@ namespace Kleo { public: CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -187,9 +187,9 @@ namespace Kleo { public: CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -206,9 +206,9 @@ namespace Kleo { public: CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -225,9 +225,9 @@ namespace Kleo { public: CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -244,13 +244,13 @@ namespace Kleo { public: CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: - QCheckBox* mCheckBox; + TQCheckBox* mCheckBox; }; /** @@ -262,17 +262,17 @@ namespace Kleo { public: CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, - const QString& entryName, - QGridLayout * layout, - QWidget* parent, const char* name = 0 ); + const TQString& entryName, + TQGridLayout * layout, + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private slots: void slotOpenDialog(); private: void setURLList( const KURL::List& urlList ); - QLabel* mLabel; - QPushButton* mPushButton; + TQLabel* mLabel; + TQPushButton* mPushButton; KURL::List mURLList; }; } diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 76c1b3dd..0b9dd91f 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -41,38 +41,38 @@ #include <kiconloader.h> #include <kdebug.h> -#include <qbuttongroup.h> -#include <qtoolbutton.h> -#include <qlistview.h> -#include <qpushbutton.h> +#include <tqbuttongroup.h> +#include <tqtoolbutton.h> +#include <tqlistview.h> +#include <tqpushbutton.h> using namespace Kleo; class QX500ListViewItem : public QListViewItem { public: - QX500ListViewItem( QListView* lv, QListViewItem* prev, - const QString& serverName, - const QString& portNumber, - const QString& dn, - const QString& username, - const QString& password ) - : QListViewItem( lv, prev, serverName, portNumber, dn, username ) { + QX500ListViewItem( TQListView* lv, TQListViewItem* prev, + const TQString& serverName, + const TQString& portNumber, + const TQString& dn, + const TQString& username, + const TQString& password ) + : TQListViewItem( lv, prev, serverName, portNumber, dn, username ) { setPassword( password ); } - void setPassword( const QString& pass ) { + void setPassword( const TQString& pass ) { mPassword = pass; - setText( 4, pass.isEmpty() ? QString::null : QString::fromLatin1( "******" ) ); + setText( 4, pass.isEmpty() ? TQString::null : TQString::fromLatin1( "******" ) ); } - const QString& password() const { return mPassword; } + const TQString& password() const { return mPassword; } - void setData( const QString& serverName, - const QString& portNumber, - const QString& dn, - const QString& username, - const QString& password ) { + void setData( const TQString& serverName, + const TQString& portNumber, + const TQString& dn, + const TQString& username, + const TQString& password ) { setText( 0, serverName ); setText( 1, portNumber ); setText( 2, dn ); @@ -87,12 +87,12 @@ public: } private: - QString mPassword; + TQString mPassword; }; Kleo::DirectoryServicesWidget::DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - QWidget* parent, const char* name, WFlags fl ) + TQWidget* parent, const char* name, WFlags fl ) : DirectoryServicesWidgetBase( parent, name, fl ), mConfigEntry( configEntry ) { @@ -132,7 +132,7 @@ void DirectoryServicesWidget::enableDisable( CryptPlugWrapper* cryptPlug ) // un /* * protected slot, connected to selectionChanged() */ -void DirectoryServicesWidget::slotServiceChanged( QListViewItem* item ) +void DirectoryServicesWidget::slotServiceChanged( TQListViewItem* item ) { if( item ) removeServicePB->setEnabled( true ); @@ -146,17 +146,17 @@ void DirectoryServicesWidget::slotServiceChanged( QListViewItem* item ) /* * protected slot, connected to returnPressed/doubleClicked */ -void DirectoryServicesWidget::slotServiceSelected( QListViewItem* item ) +void DirectoryServicesWidget::slotServiceSelected( TQListViewItem* item ) { AddDirectoryServiceDialogImpl* dlg = new AddDirectoryServiceDialogImpl( this ); dlg->serverNameED->setText( item->text( 0 ) ); dlg->portED->setText( item->text( 1 ) ); dlg->descriptionED->setText( item->text( 2 ) ); dlg->usernameED->setText( item->text( 3 ) ); - QString pass = static_cast<QX500ListViewItem *>( item )->password(); + TQString pass = static_cast<QX500ListViewItem *>( item )->password(); dlg->passwordED->setText( pass ); - if( dlg->exec() == QDialog::Accepted ) { + if( dlg->exec() == TQDialog::Accepted ) { item->setText( 0, dlg->serverNameED->text() ); item->setText( 1, dlg->portED->text() ); item->setText( 2, dlg->descriptionED->text() ); @@ -174,7 +174,7 @@ void DirectoryServicesWidget::slotServiceSelected( QListViewItem* item ) void DirectoryServicesWidget::slotAddService() { AddDirectoryServiceDialogImpl* dlg = new AddDirectoryServiceDialogImpl( this ); - if( dlg->exec() == QDialog::Accepted ) { + if( dlg->exec() == TQDialog::Accepted ) { QX500ListViewItem *item = new QX500ListViewItem( x500LV, x500LV->lastItem(), dlg->serverNameED->text(), dlg->portED->text(), @@ -192,7 +192,7 @@ void DirectoryServicesWidget::slotAddService() */ void DirectoryServicesWidget::slotDeleteService() { - QListViewItem* item = x500LV->selectedItem(); + TQListViewItem* item = x500LV->selectedItem(); Q_ASSERT( item ); if( !item ) return; @@ -210,10 +210,10 @@ void DirectoryServicesWidget::setInitialServices( const KURL::List& urls ) { x500LV->clear(); for( KURL::List::const_iterator it = urls.begin(); it != urls.end(); ++it ) { - QString dn = KURL::decode_string( (*it).query().mid( 1 ) ); // decode query and skip leading '?' + TQString dn = KURL::decode_string( (*it).query().mid( 1 ) ); // decode query and skip leading '?' (void)new QX500ListViewItem( x500LV, x500LV->lastItem(), (*it).host(), - QString::number( (*it).port() ), + TQString::number( (*it).port() ), dn, (*it).user(), (*it).pass()); @@ -223,9 +223,9 @@ void DirectoryServicesWidget::setInitialServices( const KURL::List& urls ) KURL::List DirectoryServicesWidget::urlList() const { KURL::List lst; - QListViewItemIterator it( x500LV ); + TQListViewItemIterator it( x500LV ); for ( ; it.current() ; ++it ) { - QListViewItem* item = it.current(); + TQListViewItem* item = it.current(); KURL url; url.setProtocol( "ldap" ); url.setHost( item->text( 0 ) ); @@ -272,11 +272,11 @@ void DirectoryServicesWidget::defaults() static void swapItems( QX500ListViewItem *item, QX500ListViewItem *other ) { - QString serverName = item->text( 0 ); - QString portNumber = item->text( 1 ); - QString dn = item->text( 2 ); - QString username = item->text( 3 ); - QString password = item->password(); + TQString serverName = item->text( 0 ); + TQString portNumber = item->text( 1 ); + TQString dn = item->text( 2 ); + TQString username = item->text( 3 ); + TQString password = item->password(); item->copyItem( other ); other->setData( serverName, portNumber, dn, username, password ); } diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 02e428c9..5c58dc09 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -48,7 +48,7 @@ class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase public: DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DirectoryServicesWidget(); void load(); @@ -66,8 +66,8 @@ signals: void changed(); protected slots: - void slotServiceChanged( QListViewItem* ); - void slotServiceSelected( QListViewItem* ); + void slotServiceChanged( TQListViewItem* ); + void slotServiceSelected( TQListViewItem* ); void slotAddService(); void slotDeleteService(); void slotMoveUp(); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 54fe32af..4c718406 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -45,76 +45,76 @@ #include <kconfig.h> #include <kapplication.h> -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlistview.h> -#include <qtooltip.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlistview.h> +#include <tqtooltip.h> #include <assert.h> struct Kleo::DNAttributeOrderConfigWidget::Private { enum { UUp=0, Up=1, Left=2, Right=3, Down=4, DDown=5 }; - QListView * availableLV; - QListView * currentLV; - QToolButton * navTB[6]; + TQListView * availableLV; + TQListView * currentLV; + TQToolButton * navTB[6]; - QListViewItem * placeHolderItem; + TQListViewItem * placeHolderItem; Kleo::DNAttributeMapper * mapper; }; -static void prepare( QListView * lv ) { +static void prepare( TQListView * lv ) { lv->setAllColumnsShowFocus( true ); - lv->setResizeMode( QListView::LastColumn ); + lv->setResizeMode( TQListView::LastColumn ); lv->header()->setClickEnabled( false ); - lv->addColumn( QString::null ); + lv->addColumn( TQString::null ); lv->addColumn( i18n("Description") ); } -Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, QWidget * parent, const char * name, WFlags f ) - : QWidget( parent, name, f ), d( 0 ) +Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( mapper ); d = new Private(); d->mapper = mapper; - QGridLayout * glay = new QGridLayout( this, 2, 3, 0, KDialog::spacingHint() ); + TQGridLayout * glay = new TQGridLayout( this, 2, 3, 0, KDialog::spacingHint() ); glay->setColStretch( 0, 1 ); glay->setColStretch( 2, 1 ); int row = -1; ++row; - glay->addWidget( new QLabel( i18n("Available attributes:"), this ), row, 0 ); - glay->addWidget( new QLabel( i18n("Current attribute order:"), this ), row, 2 ); + glay->addWidget( new TQLabel( i18n("Available attributes:"), this ), row, 0 ); + glay->addWidget( new TQLabel( i18n("Current attribute order:"), this ), row, 2 ); ++row; glay->setRowStretch( row, 1 ); - d->availableLV = new QListView( this ); + d->availableLV = new TQListView( this ); prepare( d->availableLV ); d->availableLV->setSorting( 0 ); glay->addWidget( d->availableLV, row, 0 ); - d->currentLV = new QListView( this ); + d->currentLV = new TQListView( this ); prepare( d->currentLV ); d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, SIGNAL(clicked( QListViewItem * )), - SLOT(slotAvailableSelectionChanged(QListViewItem*)) ); - connect( d->currentLV, SIGNAL(clicked(QListViewItem*)), - SLOT(slotCurrentOrderSelectionChanged(QListViewItem*)) ); + connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), + TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), + TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); - d->placeHolderItem = new QListViewItem( d->availableLV, "_X_", i18n("All others") ); + d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); // the up/down/left/right arrow cross: - QGridLayout * xlay = new QGridLayout( 5, 3, 0, "xlay" ); + TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" ); xlay->setAlignment( AlignCenter ); static const struct { @@ -123,21 +123,21 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { - QToolButton * tb = d->navTB[i] = new QToolButton( this ); + TQToolButton * tb = d->navTB[i] = new TQToolButton( this ); tb->setIconSet( SmallIconSet( navButtons[i].icon ) ); tb->setEnabled( false ); - QToolTip::add( tb, i18n( navButtons[i].tooltip ) ); + TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); @@ -154,40 +154,40 @@ void Kleo::DNAttributeOrderConfigWidget::load() { d->availableLV->clear(); d->currentLV->clear(); - const QStringList order = d->mapper->attributeOrder(); + const TQStringList order = d->mapper->attributeOrder(); // fill the RHS listview: - QListViewItem * last = 0; - for ( QStringList::const_iterator it = order.begin() ; it != order.end() ; ++it ) { - const QString attr = (*it).upper(); + TQListViewItem * last = 0; + for ( TQStringList::const_iterator it = order.begin() ; it != order.end() ; ++it ) { + const TQString attr = (*it).upper(); if ( attr == "_X_" ) { takePlaceHolderItem(); d->currentLV->insertItem( d->placeHolderItem ); d->placeHolderItem->moveItem( last ); last = d->placeHolderItem; } else - last = new QListViewItem( d->currentLV, last, attr, d->mapper->name2label( attr ) ); + last = new TQListViewItem( d->currentLV, last, attr, d->mapper->name2label( attr ) ); } // fill the LHS listview with what's left: - const QStringList all = Kleo::DNAttributeMapper::instance()->names(); - for ( QStringList::const_iterator it = all.begin() ; it != all.end() ; ++it ) + const TQStringList all = Kleo::DNAttributeMapper::instance()->names(); + for ( TQStringList::const_iterator it = all.begin() ; it != all.end() ; ++it ) if ( order.find( *it ) == order.end() ) - (void)new QListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) ); + (void)new TQListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) ); if ( !d->placeHolderItem->listView() ) d->availableLV->insertItem( d->placeHolderItem ); } void Kleo::DNAttributeOrderConfigWidget::takePlaceHolderItem() { - if ( QListView * lv = d->placeHolderItem->listView() ) + if ( TQListView * lv = d->placeHolderItem->listView() ) lv->takeItem( d->placeHolderItem ); } void Kleo::DNAttributeOrderConfigWidget::save() const { - QStringList order; - for ( QListViewItemIterator it( d->currentLV ) ; it.current() ; ++it ) + TQStringList order; + for ( TQListViewItemIterator it( d->currentLV ) ; it.current() ; ++it ) order.push_back( it.current()->text( 0 ) ); d->mapper->setAttributeOrder( order ); @@ -199,15 +199,15 @@ void Kleo::DNAttributeOrderConfigWidget::defaults() { -void Kleo::DNAttributeOrderConfigWidget::slotAvailableSelectionChanged( QListViewItem * item ) { +void Kleo::DNAttributeOrderConfigWidget::slotAvailableSelectionChanged( TQListViewItem * item ) { d->navTB[Private::Right]->setEnabled( item ); } -void Kleo::DNAttributeOrderConfigWidget::slotCurrentOrderSelectionChanged( QListViewItem * item ) { +void Kleo::DNAttributeOrderConfigWidget::slotCurrentOrderSelectionChanged( TQListViewItem * item ) { enableDisableButtons( item ); } -void Kleo::DNAttributeOrderConfigWidget::enableDisableButtons( QListViewItem * item ) { +void Kleo::DNAttributeOrderConfigWidget::enableDisableButtons( TQListViewItem * item ) { d->navTB[Private::UUp ]->setEnabled( item && item->itemAbove() ); d->navTB[Private::Up ]->setEnabled( item && item->itemAbove() ); d->navTB[Private::Left ]->setEnabled( item ); @@ -216,10 +216,10 @@ void Kleo::DNAttributeOrderConfigWidget::enableDisableButtons( QListViewItem * i } void Kleo::DNAttributeOrderConfigWidget::slotUpButtonClicked() { - QListViewItem * item = d->currentLV->selectedItem(); + TQListViewItem * item = d->currentLV->selectedItem(); if ( !item ) return; - QListViewItem * above = item->itemAbove(); + TQListViewItem * above = item->itemAbove(); if ( !above ) return; above->moveItem( item ); // moves "above" to after "item", ie. "item" one up @@ -228,7 +228,7 @@ void Kleo::DNAttributeOrderConfigWidget::slotUpButtonClicked() { } void Kleo::DNAttributeOrderConfigWidget::slotDoubleUpButtonClicked() { - QListViewItem * item = d->currentLV->selectedItem(); + TQListViewItem * item = d->currentLV->selectedItem(); if ( !item ) return; if ( item == d->currentLV->firstChild() ) @@ -241,10 +241,10 @@ void Kleo::DNAttributeOrderConfigWidget::slotDoubleUpButtonClicked() { } void Kleo::DNAttributeOrderConfigWidget::slotDownButtonClicked() { - QListViewItem * item = d->currentLV->selectedItem(); + TQListViewItem * item = d->currentLV->selectedItem(); if ( !item ) return; - QListViewItem * below = item->itemBelow(); + TQListViewItem * below = item->itemBelow(); if ( !below ) return; item->moveItem( below ); // moves "item" to after "below", ie. "item" one down @@ -253,10 +253,10 @@ void Kleo::DNAttributeOrderConfigWidget::slotDownButtonClicked() { } void Kleo::DNAttributeOrderConfigWidget::slotDoubleDownButtonClicked() { - QListViewItem * item = d->currentLV->selectedItem(); + TQListViewItem * item = d->currentLV->selectedItem(); if ( !item ) return; - QListViewItem * last = d->currentLV->lastItem(); + TQListViewItem * last = d->currentLV->lastItem(); assert( last ); if ( item == last ) return; @@ -266,10 +266,10 @@ void Kleo::DNAttributeOrderConfigWidget::slotDoubleDownButtonClicked() { } void Kleo::DNAttributeOrderConfigWidget::slotLeftButtonClicked() { - QListViewItem * right = d->currentLV->selectedItem(); + TQListViewItem * right = d->currentLV->selectedItem(); if ( !right ) return; - QListViewItem * next = right->itemBelow(); + TQListViewItem * next = right->itemBelow(); if ( !next ) next = right->itemAbove(); d->currentLV->takeItem( right ); @@ -281,16 +281,16 @@ void Kleo::DNAttributeOrderConfigWidget::slotLeftButtonClicked() { } void Kleo::DNAttributeOrderConfigWidget::slotRightButtonClicked() { - QListViewItem * left = d->availableLV->selectedItem(); + TQListViewItem * left = d->availableLV->selectedItem(); if ( !left ) return; - QListViewItem * next = left->itemBelow(); + TQListViewItem * next = left->itemBelow(); if ( !next ) next = left->itemAbove(); d->availableLV->takeItem( left ); d->currentLV->insertItem( left ); - if ( QListViewItem * right = d->currentLV->selectedItem() ) { - if ( QListViewItem * above = right->itemAbove() ) + if ( TQListViewItem * right = d->currentLV->selectedItem() ) { + if ( TQListViewItem * above = right->itemAbove() ) left->moveItem( above ); // move new item immediately before old selected d->currentLV->setSelected( right, false ); } diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index 11299ab3..d57dfbdc 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -33,7 +33,7 @@ #ifndef __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ -#include <qwidget.h> +#include <tqwidget.h> #include <kdepimmacros.h> namespace Kleo { class DNAttributeMapper; @@ -43,11 +43,11 @@ class QListViewItem; namespace Kleo { - class KDE_EXPORT DNAttributeOrderConfigWidget : public QWidget { + class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { Q_OBJECT public: /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ - DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, QWidget * parent=0, const char * name=0, WFlags f=0 ); + DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~DNAttributeOrderConfigWidget(); void load(); @@ -62,8 +62,8 @@ namespace Kleo { // private slots: - void slotAvailableSelectionChanged( QListViewItem * ); - void slotCurrentOrderSelectionChanged( QListViewItem * ); + void slotAvailableSelectionChanged( TQListViewItem * ); + void slotCurrentOrderSelectionChanged( TQListViewItem * ); void slotDoubleUpButtonClicked(); void slotUpButtonClicked(); void slotDownButtonClicked(); @@ -73,7 +73,7 @@ namespace Kleo { private: void takePlaceHolderItem(); - void enableDisableButtons( QListViewItem * ); + void enableDisableButtons( TQListViewItem * ); private: class Private; diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 83b92a19..7ccddb5d 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -40,38 +40,38 @@ #include "kdhorizontalline.h" -#include <qstyle.h> -#include <qpainter.h> +#include <tqstyle.h> +#include <tqpainter.h> #ifdef QT_ACCESSIBILITY_SUPPORT -#include <qaccessible.h> +#include <tqaccessible.h> #endif -#include <qfontmetrics.h> -#include <qapplication.h> +#include <tqfontmetrics.h> +#include <tqapplication.h> -KDHorizontalLine::KDHorizontalLine( QWidget * parent, const char * name, WFlags f ) - : QFrame( parent, name, f ), +KDHorizontalLine::KDHorizontalLine( TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( Qt::AlignAuto ), mLenVisible( 0 ) { - QFrame::setFrameStyle( HLine | Sunken ); + TQFrame::setFrameStyle( HLine | Sunken ); } -KDHorizontalLine::KDHorizontalLine( const QString & title, QWidget * parent, const char * name, WFlags f ) - : QFrame( parent, name, f ), +KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( Qt::AlignAuto ), mLenVisible( 0 ) { - QFrame::setFrameStyle( HLine | Sunken ); + TQFrame::setFrameStyle( HLine | Sunken ); setTitle( title ); } KDHorizontalLine::~KDHorizontalLine() {} void KDHorizontalLine::setFrameStyle( int style ) { - QFrame::setFrameStyle( ( style & ~MShape ) | HLine ); // force HLine + TQFrame::setFrameStyle( ( style & ~MShape ) | HLine ); // force HLine } -void KDHorizontalLine::setTitle( const QString & title ) { +void KDHorizontalLine::setTitle( const TQString & title ) { if ( mTitle == title ) return; mTitle = title; @@ -79,7 +79,7 @@ void KDHorizontalLine::setTitle( const QString & title ) { update(); updateGeometry(); #ifdef QT_ACCESSIBILITY_SUPPORT - QAccessible::updateAccessibility( this, 0, QAccessible::NameChanged ); + TQAccessible::updateAccessibility( this, 0, TQAccessible::NameChanged ); #endif } @@ -87,17 +87,17 @@ void KDHorizontalLine::calculateFrame() { mLenVisible = mTitle.length(); #if 0 if ( mLenVisible ) { - const QFontMetrics fm = fontMetrics(); + const TQFontMetrics fm = fontMetrics(); while ( mLenVisible ) { - const int tw = fm.width( mTitle, mLenVisible ) + 4*fm.width(QChar(' ')); + const int tw = fm.width( mTitle, mLenVisible ) + 4*fm.width(TQChar(' ')); if ( tw < width() ) break; mLenVisible--; } qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? - QRect r = rect(); - const int va = style().styleHint( QStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + TQRect r = rect(); + const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -107,32 +107,32 @@ void KDHorizontalLine::calculateFrame() { } } // no visible label - setFrameRect( QRect(0,0,0,0) ); // then use client rect + setFrameRect( TQRect(0,0,0,0) ); // then use client rect #endif } -QSizePolicy KDHorizontalLine::sizePolicy() const { - return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ); +TQSizePolicy KDHorizontalLine::sizePolicy() const { + return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -QSize KDHorizontalLine::sizeHint() const { +TQSize KDHorizontalLine::sizeHint() const { return minimumSizeHint(); } -QSize KDHorizontalLine::minimumSizeHint() const { +TQSize KDHorizontalLine::minimumSizeHint() const { const int w = fontMetrics().width( mTitle, mLenVisible ) + - fontMetrics().width( QChar( ' ' ) ); + fontMetrics().width( TQChar( ' ' ) ); const int h = fontMetrics().height(); - return QSize( QMAX( w, indentHint() ), h ).expandedTo( qApp->globalStrut() ); + return TQSize( QMAX( w, indentHint() ), h ).expandedTo( qApp->globalStrut() ); } -void KDHorizontalLine::paintEvent( QPaintEvent * e ) { - QPainter paint( this ); +void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { + TQPainter paint( this ); if ( mLenVisible ) { // draw title - const QFontMetrics & fm = paint.fontMetrics(); + const TQFontMetrics & fm = paint.fontMetrics(); const int h = fm.height(); - const int tw = fm.width( mTitle, mLenVisible ) + fm.width(QChar(' ')); + const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' ')); int x; if ( mAlign & AlignHCenter ) // center alignment x = frameRect().width()/2 - tw/2; @@ -141,18 +141,18 @@ void KDHorizontalLine::paintEvent( QPaintEvent * e ) { else if ( mAlign & AlignLeft ) // left alignment x = 0; else { // auto align - if( QApplication::reverseLayout() ) + if( TQApplication::reverseLayout() ) x = frameRect().width() - tw; else x = 0; } - QRect r( x, 0, tw, h ); - int va = style().styleHint( QStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + TQRect r( x, 0, tw, h ); + int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const QColor pen( (QRgb) style().styleHint( QStyle::SH_GroupBox_TextLabelColor, this ) ); + const TQColor pen( (QRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); #if QT_VERSION >= 0x030300 - if ( !style().styleHint( QStyle::SH_UnderlineAccelerator, this ) ) + if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; #endif style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index a79682eb..5b6d5da9 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -41,39 +41,39 @@ #ifndef __KDTOOLS__KDHORIZONTALLINE_H__ #define __KDTOOLS__KDHORIZONTALLINE_H__ -#include <qframe.h> -#include <qstring.h> +#include <tqframe.h> +#include <tqstring.h> -class KDHorizontalLine : public QFrame { +class KDHorizontalLine : public TQFrame { Q_OBJECT - Q_PROPERTY( QString title READ title WRITE setTitle ) + Q_PROPERTY( TQString title READ title WRITE setTitle ) public: - KDHorizontalLine( QWidget * parent=0, const char * name=0, WFlags f=0 ); - KDHorizontalLine( const QString & title, QWidget * parent=0, const char * name=0, WFlags f=0 ); + 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(); - QString title() const { return mTitle; } + TQString title() const { return mTitle; } /*! \reimp to hard-code the frame shape */ void setFrameStyle( int style ); - QSize sizeHint() const; - QSize minimumSizeHint() const; - QSizePolicy sizePolicy() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; + TQSizePolicy sizePolicy() const; static int indentHint(); public slots: - virtual void setTitle( const QString & title ); + virtual void setTitle( const TQString & title ); protected: - void paintEvent( QPaintEvent * ); + void paintEvent( TQPaintEvent * ); private: void calculateFrame(); private: - QString mTitle; + TQString mTitle; Qt::AlignmentFlags mAlign; int mLenVisible; }; diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 7af85a0b..d45b64a8 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -49,13 +49,13 @@ #include <kglobalsettings.h> #include <kseparator.h> -#include <qstringlist.h> -#include <qframe.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qscrollview.h> -#include <qpushbutton.h> +#include <tqstringlist.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqscrollview.h> +#include <tqpushbutton.h> #include <gpgmepp/key.h> @@ -84,8 +84,8 @@ static int pref2cb( Kleo::EncryptionPreference p ) { } } -static QStringList preferencesStrings() { - return QStringList() << i18n("<none>") +static TQStringList preferencesStrings() { + return TQStringList() << i18n("<none>") << i18n("Never Encrypt with This Key") << i18n("Always Encrypt with This Key") << i18n("Encrypt Whenever Encryption is Possible") @@ -98,15 +98,15 @@ struct Kleo::KeyApprovalDialog::Private { Private() : selfRequester( 0 ), prefsChanged( false ) {} Kleo::KeyRequester * selfRequester; - QStringList addresses; + TQStringList addresses; std::vector<Kleo::KeyRequester*> requesters; - std::vector<QComboBox*> preferences; + std::vector<TQComboBox*> preferences; bool prefsChanged; }; Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - QWidget * parent, const char * name, + TQWidget * parent, const char * name, bool modal ) : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), d( 0 ) @@ -115,18 +115,18 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients d = new Private(); - QFrame *page = makeMainWidget(); - QVBoxLayout * vlay = new QVBoxLayout( page, 0, spacingHint() ); + TQFrame *page = makeMainWidget(); + TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() ); - vlay->addWidget( new QLabel( i18n("The following keys will be used for encryption:"), page ) ); + vlay->addWidget( new TQLabel( i18n("The following keys will be used for encryption:"), page ) ); - QScrollView * sv = new QScrollView( page ); - sv->setResizePolicy( QScrollView::AutoOneFit ); + TQScrollView * sv = new TQScrollView( page ); + sv->setResizePolicy( TQScrollView::AutoOneFit ); vlay->addWidget( sv ); - QWidget * view = new QWidget( sv->viewport() ); + TQWidget * view = new TQWidget( sv->viewport() ); - QGridLayout * glay = new QGridLayout( view, 3, 2, marginHint(), spacingHint() ); + TQGridLayout * glay = new TQGridLayout( view, 3, 2, marginHint(), spacingHint() ); glay->setColStretch( 1, 1 ); sv->addChild( view ); @@ -134,7 +134,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients if ( !sender.empty() ) { ++row; - glay->addWidget( new QLabel( i18n("Your keys:"), view ), row, 0 ); + glay->addWidget( new TQLabel( i18n("Your keys:"), view ), row, 0 ); d->selfRequester = new EncryptionKeyRequester( true, EncryptionKeyRequester::AllProtocols, view ); d->selfRequester->setKeys( sender ); glay->addWidget( d->selfRequester, row, 1 ); @@ -142,28 +142,28 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients glay->addMultiCellWidget( new KSeparator( Horizontal, view ), row, row, 0, 1 ); } - const QStringList prefs = preferencesStrings(); + const TQStringList prefs = preferencesStrings(); for ( std::vector<Item>::const_iterator it = recipients.begin() ; it != recipients.end() ; ++it ) { ++row; - glay->addWidget( new QLabel( i18n("Recipient:"), view ), row, 0 ); - glay->addWidget( new QLabel( it->address, view ), row, 1 ); + glay->addWidget( new TQLabel( i18n("Recipient:"), view ), row, 0 ); + glay->addWidget( new TQLabel( it->address, view ), row, 1 ); d->addresses.push_back( it->address ); ++row; - glay->addWidget( new QLabel( i18n("Encryption keys:"), view ), row, 0 ); + glay->addWidget( new TQLabel( i18n("Encryption keys:"), view ), row, 0 ); KeyRequester * req = new EncryptionKeyRequester( true, EncryptionKeyRequester::AllProtocols, view ); req->setKeys( it->keys ); glay->addWidget( req, row, 1 ); d->requesters.push_back( req ); ++row; - glay->addWidget( new QLabel( i18n("Encryption preference:"), view ), row, 0 ); - QComboBox * cb = new QComboBox( false, view ); + glay->addWidget( new TQLabel( i18n("Encryption preference:"), view ), row, 0 ); + TQComboBox * cb = new TQComboBox( false, view ); cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, SIGNAL(activated(int)), SLOT(slotPrefsChanged()) ); + connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } @@ -189,8 +189,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients + 2; // don't make the dialog too large - const QRect desk = KGlobalSettings::desktopGeometry( this ); - setInitialSize( QSize( kMin( dialogWidth, 3 * desk.width() / 4 ), + const TQRect desk = KGlobalSettings::desktopGeometry( this ); + setInitialSize( TQSize( kMin( dialogWidth, 3 * desk.width() / 4 ), kMin( dialogHeight, 7 * desk.height() / 8 ) ) ); } @@ -208,9 +208,9 @@ std::vector<Kleo::KeyApprovalDialog::Item> Kleo::KeyApprovalDialog::items() cons std::vector<Item> result; result.reserve( d->requesters.size() ); - QStringList::const_iterator ait = d->addresses.begin(); + TQStringList::const_iterator ait = d->addresses.begin(); std::vector<KeyRequester*>::const_iterator rit = d->requesters.begin(); - std::vector<QComboBox*>::const_iterator cit = d->preferences.begin(); + std::vector<TQComboBox*>::const_iterator cit = d->preferences.begin(); while ( ait != d->addresses.end() ) result.push_back( Item( *ait++, (*rit++)->keys(), cb2pref( (*cit++)->currentItem() ) ) ); return result; diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index 224530a7..e669690e 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -60,17 +60,17 @@ namespace Kleo { public: struct Item { Item() : pref( UnknownPreference ) {} - Item( const QString & a, const std::vector<GpgME::Key> & k, + Item( const TQString & a, const std::vector<GpgME::Key> & k, EncryptionPreference p=UnknownPreference ) : address( a ), keys( k ), pref( p ) {} - QString address; + TQString address; std::vector<GpgME::Key> keys; EncryptionPreference pref; }; KeyApprovalDialog( const std::vector<Item> & recipients, const std::vector<GpgME::Key> & sender, - QWidget * parent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeyApprovalDialog(); diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 98534a4b..fa8c9eb8 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -38,17 +38,17 @@ #include <kdebug.h> -#include <qfontmetrics.h> -#include <qtooltip.h> -#include <qrect.h> -#include <qheader.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qfont.h> -#include <qcolor.h> -#include <qtimer.h> -#include <qcstring.h> +#include <tqfontmetrics.h> +#include <tqtooltip.h> +#include <tqrect.h> +#include <tqheader.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqcolor.h> +#include <tqtimer.h> +#include <tqcstring.h> #include <gpgmepp/key.h> @@ -61,27 +61,27 @@ static const int updateDelayMilliSecs = 500; namespace { - class ItemToolTip : public QToolTip { + class ItemToolTip : public TQToolTip { public: ItemToolTip( Kleo::KeyListView * parent ); protected: - void maybeTip( const QPoint & p ); + void maybeTip( const TQPoint & p ); private: Kleo::KeyListView * mKeyListView; }; ItemToolTip::ItemToolTip( Kleo::KeyListView * parent ) - : QToolTip( parent->viewport() ), mKeyListView( parent ) {} + : TQToolTip( parent->viewport() ), mKeyListView( parent ) {} - void ItemToolTip::maybeTip( const QPoint & p ) { + void ItemToolTip::maybeTip( const TQPoint & p ) { if ( !mKeyListView ) return; - const QListViewItem * item = mKeyListView->itemAt( p ); + const TQListViewItem * item = mKeyListView->itemAt( p ); if ( !item ) return; - const QRect itemRect = mKeyListView->itemRect( item ); + const TQRect itemRect = mKeyListView->itemRect( item ); if ( !itemRect.isValid() ) return; @@ -89,14 +89,14 @@ namespace { if ( col == -1 ) return; - const QRect headerRect = mKeyListView->header()->sectionRect( col ); + const TQRect headerRect = mKeyListView->header()->sectionRect( col ); if ( !headerRect.isValid() ) return; - const QRect cellRect( headerRect.left(), itemRect.top(), + const TQRect cellRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ); - QString tipStr; + TQString tipStr; if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) ) tipStr = klvi->toolTip( col ); else @@ -112,30 +112,30 @@ struct Kleo::KeyListView::Private { Private() : updateTimer( 0 ), itemToolTip( 0 ) {} std::vector<GpgME::Key> keyBuffer; - QTimer * updateTimer; - QToolTip * itemToolTip; - std::map<QCString,KeyListViewItem*> itemMap; + TQTimer * updateTimer; + TQToolTip * itemToolTip; + std::map<TQCString,KeyListViewItem*> itemMap; }; -// a list of signals where we want to replace QListViewItem with +// a list of signals where we want to replace TQListViewItem with // Kleo:KeyListViewItem: static const struct { const char * source; const char * target; } signalReplacements[] = { - { SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)), - SLOT(slotEmitDoubleClicked(QListViewItem*,const QPoint&,int)) }, - { SIGNAL(returnPressed(QListViewItem*)), - SLOT(slotEmitReturnPressed(QListViewItem*)) }, - { SIGNAL(selectionChanged(QListViewItem*)), - SLOT(slotEmitSelectionChanged(QListViewItem*)) }, - { SIGNAL(contextMenu(KListView*, QListViewItem*,const QPoint&)), - SLOT(slotEmitContextMenu(KListView*, QListViewItem*,const QPoint&)) }, + { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQT_SIGNAL(returnPressed(TQListViewItem*)), + TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQT_SIGNAL(selectionChanged(TQListViewItem*)), + TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*,const TQPoint&)), + TQT_SLOT(slotEmitContextMenu(KListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; -Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, QWidget * parent, const char * name, WFlags f ) +Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) : KListView( parent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), @@ -145,15 +145,15 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); - d->updateTimer = new QTimer( this ); - connect( d->updateTimer, SIGNAL(timeout()), SLOT(slotUpdateTimeout()) ); + d->updateTimer = new TQTimer( this ); + connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; return; } - const QFontMetrics fm = fontMetrics(); + const TQFontMetrics fm = fontMetrics(); for ( int col = 0 ; !columnStrategy->title( col ).isEmpty() ; ++col ) { addColumn( columnStrategy->title( col ), columnStrategy->width( col, fm ) ); @@ -166,33 +166,33 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis for ( int i = 0 ; i < numSignalReplacements ; ++i ) connect( this, signalReplacements[i].source, signalReplacements[i].target ); - QToolTip::remove( this ); - QToolTip::remove( viewport() ); // make double sure :) + TQToolTip::remove( this ); + TQToolTip::remove( viewport() ); // make double sure :) d->itemToolTip = new ItemToolTip( this ); } Kleo::KeyListView::~KeyListView() { d->updateTimer->stop(); - // need to clear here, since in ~QListView, our children won't have + // need to clear here, since in ~TQListView, our children won't have // a valid listView() pointing to us anymore, and their dtors try to // unregister from us. clear(); assert( d->itemMap.size() == 0 ); - // need to delete the tooltip ourselves, as ~QToolTip isn't virtual :o + // need to delete the tooltip ourselves, as ~TQToolTip isn't virtual :o delete d->itemToolTip; d->itemToolTip = 0; delete d; d = 0; delete mColumnStrategy; mColumnStrategy = 0; delete mDisplayStrategy; mDisplayStrategy = 0; } -void Kleo::KeyListView::insertItem( QListViewItem * qlvi ) { +void Kleo::KeyListView::insertItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::insertItem( " << qlvi << " )" << endl; KListView::insertItem( qlvi ); if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) registerItem( item ); } -void Kleo::KeyListView::takeItem( QListViewItem * qlvi ) { +void Kleo::KeyListView::takeItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::takeItem( " << qlvi << " )" << endl; if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) deregisterItem( item ); @@ -251,7 +251,7 @@ void Kleo::KeyListView::registerItem( KeyListViewItem * item ) { //kdDebug() << "registerItem( " << item << " )" << endl; if ( !item ) return; - const QCString fpr = item->key().primaryFingerprint(); + const TQCString fpr = item->key().primaryFingerprint(); if ( !fpr.isEmpty() ) d->itemMap.insert( std::make_pair( fpr, item ) ); } @@ -260,7 +260,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) { //kdDebug() << "deregisterItem( KeyLVI: " << item << " )" << endl; if ( !item ) return; - std::map<QCString,KeyListViewItem*>::iterator it + std::map<TQCString,KeyListViewItem*>::iterator it = d->itemMap.find( item->key().primaryFingerprint() ); if ( it == d->itemMap.end() ) return; @@ -271,7 +271,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) { } void Kleo::KeyListView::doHierarchicalInsert( const GpgME::Key & key ) { - const QCString fpr = key.primaryFingerprint(); + const TQCString fpr = key.primaryFingerprint(); if ( fpr.isEmpty() ) return; KeyListViewItem * item = 0; @@ -303,10 +303,10 @@ void Kleo::KeyListView::gatherScattered() { } } -void Kleo::KeyListView::scatterGathered( QListViewItem * start ) { - QListViewItem * item = start; +void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { + TQListViewItem * item = start; while ( item ) { - QListViewItem * cur = item; + TQListViewItem * cur = item; item = item->nextSibling(); scatterGathered( cur->firstChild() ); @@ -321,10 +321,10 @@ void Kleo::KeyListView::scatterGathered( QListViewItem * start ) { } } -Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const QCString & s ) const { +Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const { if ( s.isEmpty() ) return 0; - const std::map<QCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s ); + const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s ); if ( it == d->itemMap.end() ) return 0; return it->second; @@ -344,22 +344,22 @@ void Kleo::KeyListView::slotRefreshKey( const GpgME::Key & key ) { // slots for the emission of covariant signals: -void Kleo::KeyListView::slotEmitDoubleClicked( QListViewItem * item, const QPoint & p, int col ) { +void Kleo::KeyListView::slotEmitDoubleClicked( TQListViewItem * item, const TQPoint & p, int col ) { if ( !item || lvi_cast<KeyListViewItem>( item ) ) emit doubleClicked( static_cast<KeyListViewItem*>( item ), p, col ); } -void Kleo::KeyListView::slotEmitReturnPressed( QListViewItem * item ) { +void Kleo::KeyListView::slotEmitReturnPressed( TQListViewItem * item ) { if ( !item || lvi_cast<KeyListViewItem>( item ) ) emit returnPressed( static_cast<KeyListViewItem*>( item ) ); } -void Kleo::KeyListView::slotEmitSelectionChanged( QListViewItem * item ) { +void Kleo::KeyListView::slotEmitSelectionChanged( TQListViewItem * item ) { if ( !item || lvi_cast<KeyListViewItem>( item ) ) emit selectionChanged( static_cast<KeyListViewItem*>( item ) ); } -void Kleo::KeyListView::slotEmitContextMenu( KListView*, QListViewItem * item, const QPoint & p ) { +void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, const TQPoint & p ) { if ( !item || lvi_cast<KeyListViewItem>( item ) ) emit contextMenu( static_cast<KeyListViewItem*>( item ), p ); } @@ -371,25 +371,25 @@ void Kleo::KeyListView::slotEmitContextMenu( KListView*, QListViewItem * item, c // Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, const GpgME::Key & key ) - : QListViewItem( parent ) + : TQListViewItem( parent ) { setKey( key ); } Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ) - : QListViewItem( parent, after ) + : TQListViewItem( parent, after ) { setKey( key ); } Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ) - : QListViewItem( parent ) + : TQListViewItem( parent ) { setKey( key ); } Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ) - : QListViewItem( parent, after ) + : TQListViewItem( parent, after ) { setKey( key ); } @@ -399,11 +399,11 @@ Kleo::KeyListViewItem::~KeyListViewItem() { // QLVI dtor, they don't have listView() anymore, thus they don't // call deregister( this ), leading to stale entries in the // itemMap... - while ( QListViewItem * item = firstChild() ) + 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 - // KeyListViewItem, but a mere QListViewItem, so our takeItem() + // KeyListViewItem, but a mere TQListViewItem, so our takeItem() // overload is gone by that time... if ( KeyListView * lv = listView() ) lv->deregisterItem( this ); @@ -425,55 +425,55 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { const int numCols = lv ? lv->columns() : 0 ; for ( int i = 0 ; i < numCols ; ++i ) { setText( i, cs->text( key, i ) ); - if ( const QPixmap * pix = cs->pixmap( key, i ) ) + if ( const TQPixmap * pix = cs->pixmap( key, i ) ) setPixmap( i, *pix ); } repaint(); } -QString Kleo::KeyListViewItem::toolTip( int col ) const { +TQString Kleo::KeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->toolTip( key(), col ) - : QString::null ; + : TQString::null ; } -int Kleo::KeyListViewItem::compare( QListViewItem * item, int col, bool ascending ) const { +int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const { if ( !item || item->rtti() != RTTI || !listView() || !listView()->columnStrategy() ) - return QListViewItem::compare( item, col, ascending ); + return TQListViewItem::compare( item, col, ascending ); KeyListViewItem * that = static_cast<KeyListViewItem*>( item ); return listView()->columnStrategy()->compare( this->key(), that->key(), col ); } -void Kleo::KeyListViewItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ) { +void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } - const QColor fg = ds->keyForeground( key(), cg.text() ); - const QColor bg = ds->keyBackground( key(), cg.base() ); - const QFont f = ds->keyFont( key(), p->font() ); + const TQColor fg = ds->keyForeground( key(), cg.text() ); + const TQColor bg = ds->keyBackground( key(), cg.base() ); + const TQFont f = ds->keyFont( key(), p->font() ); - QColorGroup _cg = cg; + TQColorGroup _cg = cg; p->setFont( f ); - _cg.setColor( QColorGroup::Text, fg ); - _cg.setColor( QColorGroup::Base, bg ); + _cg.setColor( TQColorGroup::Text, fg ); + _cg.setColor( TQColorGroup::Base, bg ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } -void Kleo::KeyListViewItem::insertItem( QListViewItem * qlvi ) { +void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListViewItem::insertItem( " << qlvi << " )" << endl; - QListViewItem::insertItem( qlvi ); + TQListViewItem::insertItem( qlvi ); if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) listView()->registerItem( item ); } -void Kleo::KeyListViewItem::takeItem( QListViewItem * qlvi ) { +void Kleo::KeyListViewItem::takeItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListViewItem::takeItem( " << qlvi << " )" << endl; if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) listView()->deregisterItem( item ); - QListViewItem::takeItem( qlvi ); + TQListViewItem::takeItem( qlvi ); } @@ -512,46 +512,46 @@ void Kleo::SubkeyKeyListViewItem::setSubkey( const GpgME::Subkey & subkey ) { setKey( subkey.parent() ); } -QString Kleo::SubkeyKeyListViewItem::text( int col ) const { +TQString Kleo::SubkeyKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->subkeyText( subkey(), col ) - : QString::null ; + : TQString::null ; } -QString Kleo::SubkeyKeyListViewItem::toolTip( int col ) const { +TQString Kleo::SubkeyKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->subkeyToolTip( subkey(), col ) - : QString::null ; + : TQString::null ; } -const QPixmap * Kleo::SubkeyKeyListViewItem::pixmap( int col ) const { +const TQPixmap * Kleo::SubkeyKeyListViewItem::pixmap( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->subkeyPixmap( subkey(), col ) : 0 ; } -int Kleo::SubkeyKeyListViewItem::compare( QListViewItem * item, int col, bool ascending ) const { +int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const { if ( !item || item->rtti() != RTTI || !listView() || !listView()->columnStrategy() ) return KeyListViewItem::compare( item, col, ascending ); SubkeyKeyListViewItem * that = static_cast<SubkeyKeyListViewItem*>( item ); return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col ); } -void Kleo::SubkeyKeyListViewItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } - const QColor fg = ds->subkeyForeground( subkey(), cg.text() ); - const QColor bg = ds->subkeyBackground( subkey(), cg.base() ); - const QFont f = ds->subkeyFont( subkey(), p->font() ); + const TQColor fg = ds->subkeyForeground( subkey(), cg.text() ); + const TQColor bg = ds->subkeyBackground( subkey(), cg.base() ); + const TQFont f = ds->subkeyFont( subkey(), p->font() ); - QColorGroup _cg = cg; + TQColorGroup _cg = cg; p->setFont( f ); - _cg.setColor( QColorGroup::Text, fg ); - _cg.setColor( QColorGroup::Base, bg ); + _cg.setColor( TQColorGroup::Text, fg ); + _cg.setColor( TQColorGroup::Base, bg ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -590,24 +590,24 @@ void Kleo::UserIDKeyListViewItem::setUserID( const GpgME::UserID & userID ) { setKey( userID.parent() ); } -QString Kleo::UserIDKeyListViewItem::text( int col ) const { +TQString Kleo::UserIDKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->userIDText( userID(), col ) - : QString::null ; + : TQString::null ; } -QString Kleo::UserIDKeyListViewItem::toolTip( int col ) const { +TQString Kleo::UserIDKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->userIDToolTip( userID(), col ) - : QString::null ; + : TQString::null ; } -const QPixmap * Kleo::UserIDKeyListViewItem::pixmap( int col ) const { +const TQPixmap * Kleo::UserIDKeyListViewItem::pixmap( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->userIDPixmap( userID(), col ) : 0 ; } -int Kleo::UserIDKeyListViewItem::compare( QListViewItem * item, int col, bool ascending ) const { +int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const { if ( !item || item->rtti() != RTTI || !listView() || !listView()->columnStrategy() ) return KeyListViewItem::compare( item, col, ascending ); UserIDKeyListViewItem * that = static_cast<UserIDKeyListViewItem*>( item ); @@ -615,22 +615,22 @@ int Kleo::UserIDKeyListViewItem::compare( QListViewItem * item, int col, bool as } -void Kleo::UserIDKeyListViewItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ) { +void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } - const QColor fg = ds->useridForeground( userID(), cg.text() ); - const QColor bg = ds->useridBackground( userID(), cg.base() ); - const QFont f = ds->useridFont( userID(), p->font() ); + const TQColor fg = ds->useridForeground( userID(), cg.text() ); + const TQColor bg = ds->useridBackground( userID(), cg.base() ); + const TQFont f = ds->useridFont( userID(), p->font() ); - QColorGroup _cg = cg; + TQColorGroup _cg = cg; p->setFont( f ); - _cg.setColor( QColorGroup::Text, fg ); - _cg.setColor( QColorGroup::Base, bg ); + _cg.setColor( TQColorGroup::Text, fg ); + _cg.setColor( TQColorGroup::Base, bg ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -669,46 +669,46 @@ void Kleo::SignatureKeyListViewItem::setSignature( const GpgME::UserID::Signatur setKey( signature.parent().parent() ); } -QString Kleo::SignatureKeyListViewItem::text( int col ) const { +TQString Kleo::SignatureKeyListViewItem::text( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->signatureText( signature(), col ) - : QString::null ; + : TQString::null ; } -QString Kleo::SignatureKeyListViewItem::toolTip( int col ) const { +TQString Kleo::SignatureKeyListViewItem::toolTip( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->signatureToolTip( signature(), col ) - : QString::null ; + : TQString::null ; } -const QPixmap * Kleo::SignatureKeyListViewItem::pixmap( int col ) const { +const TQPixmap * Kleo::SignatureKeyListViewItem::pixmap( int col ) const { return listView() && listView()->columnStrategy() ? listView()->columnStrategy()->signaturePixmap( signature(), col ) : 0 ; } -int Kleo::SignatureKeyListViewItem::compare( QListViewItem * item, int col, bool ascending ) const { +int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, bool ascending ) const { if ( !item || item->rtti() != RTTI || !listView() || !listView()->columnStrategy() ) return KeyListViewItem::compare( item, col, ascending ); SignatureKeyListViewItem * that = static_cast<SignatureKeyListViewItem*>( item ); return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col ); } -void Kleo::SignatureKeyListViewItem::paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - QListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, alignment ); return; } - const QColor fg = ds->signatureForeground( signature(), cg.text() ); - const QColor bg = ds->signatureBackground( signature(), cg.base() ); - const QFont f = ds->signatureFont( signature(), p->font() ); + const TQColor fg = ds->signatureForeground( signature(), cg.text() ); + const TQColor bg = ds->signatureBackground( signature(), cg.base() ); + const TQFont f = ds->signatureFont( signature(), p->font() ); - QColorGroup _cg = cg; + TQColorGroup _cg = cg; p->setFont( f ); - _cg.setColor( QColorGroup::Text, fg ); - _cg.setColor( QColorGroup::Base, bg ); + _cg.setColor( TQColorGroup::Text, fg ); + _cg.setColor( TQColorGroup::Base, bg ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); } @@ -721,38 +721,38 @@ void Kleo::SignatureKeyListViewItem::paintCell( QPainter * p, const QColorGroup Kleo::KeyListView::ColumnStrategy::~ColumnStrategy() {} int Kleo::KeyListView::ColumnStrategy::compare( const GpgME::Key & key1, const GpgME::Key & key2, int col ) const { - return QString::localeAwareCompare( text( key1, col ), text( key2, col ) ); + return TQString::localeAwareCompare( text( key1, col ), text( key2, col ) ); } -int Kleo::KeyListView::ColumnStrategy::width( int col, const QFontMetrics & fm ) const { +int Kleo::KeyListView::ColumnStrategy::width( int col, const TQFontMetrics & fm ) const { return fm.width( title( col ) ) * 2; } int Kleo::KeyListView::ColumnStrategy::subkeyCompare( const GpgME::Subkey & sub1, const GpgME::Subkey & sub2, int col ) const { - return QString::localeAwareCompare( subkeyText( sub1, col ), subkeyText( sub2, col ) ); + return TQString::localeAwareCompare( subkeyText( sub1, col ), subkeyText( sub2, col ) ); } int Kleo::KeyListView::ColumnStrategy::userIDCompare( const GpgME::UserID & uid1, const GpgME::UserID & uid2, int col ) const { - return QString::localeAwareCompare( userIDText( uid1, col ), userIDText( uid2, col ) ); + return TQString::localeAwareCompare( userIDText( uid1, col ), userIDText( uid2, col ) ); } int Kleo::KeyListView::ColumnStrategy::signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, int col ) const { - return QString::localeAwareCompare( signatureText( sig1, col ), signatureText( sig2, col ) ); + return TQString::localeAwareCompare( signatureText( sig1, col ), signatureText( sig2, col ) ); } -QString Kleo::KeyListView::ColumnStrategy::toolTip( const GpgME::Key & key, int col ) const { +TQString Kleo::KeyListView::ColumnStrategy::toolTip( const GpgME::Key & key, int col ) const { return text( key, col ); } -QString Kleo::KeyListView::ColumnStrategy::subkeyToolTip( const GpgME::Subkey & sub, int col ) const { +TQString Kleo::KeyListView::ColumnStrategy::subkeyToolTip( const GpgME::Subkey & sub, int col ) const { return subkeyText( sub, col ); } -QString Kleo::KeyListView::ColumnStrategy::userIDToolTip( const GpgME::UserID & uid, int col ) const { +TQString Kleo::KeyListView::ColumnStrategy::userIDToolTip( const GpgME::UserID & uid, int col ) const { return userIDText( uid, col ); } -QString Kleo::KeyListView::ColumnStrategy::signatureToolTip( const GpgME::UserID::Signature & sig, int col ) const { +TQString Kleo::KeyListView::ColumnStrategy::signatureToolTip( const GpgME::UserID::Signature & sig, int col ) const { return signatureText( sig, col ); } @@ -766,70 +766,70 @@ Kleo::KeyListView::DisplayStrategy::~DisplayStrategy() {} //font -QFont Kleo::KeyListView::DisplayStrategy::keyFont( const GpgME::Key &, const QFont & font ) const { +TQFont Kleo::KeyListView::DisplayStrategy::keyFont( const GpgME::Key &, const TQFont & font ) const { return font; } -QFont Kleo::KeyListView::DisplayStrategy::subkeyFont( const GpgME::Subkey &, const QFont & font ) const { +TQFont Kleo::KeyListView::DisplayStrategy::subkeyFont( const GpgME::Subkey &, const TQFont & font ) const { return font; } -QFont Kleo::KeyListView::DisplayStrategy::useridFont( const GpgME::UserID &, const QFont & font ) const { +TQFont Kleo::KeyListView::DisplayStrategy::useridFont( const GpgME::UserID &, const TQFont & font ) const { return font; } -QFont Kleo::KeyListView::DisplayStrategy::signatureFont( const GpgME::UserID::Signature &, const QFont & font ) const { +TQFont Kleo::KeyListView::DisplayStrategy::signatureFont( const GpgME::UserID::Signature &, const TQFont & font ) const { return font; } //foreground -QColor Kleo::KeyListView::DisplayStrategy::keyForeground( const GpgME::Key &, const QColor & fg )const { +TQColor Kleo::KeyListView::DisplayStrategy::keyForeground( const GpgME::Key &, const TQColor & fg )const { return fg; } -QColor Kleo::KeyListView::DisplayStrategy::subkeyForeground( const GpgME::Subkey &, const QColor & fg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::subkeyForeground( const GpgME::Subkey &, const TQColor & fg ) const { return fg; } -QColor Kleo::KeyListView::DisplayStrategy::useridForeground( const GpgME::UserID &, const QColor & fg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::useridForeground( const GpgME::UserID &, const TQColor & fg ) const { return fg; } -QColor Kleo::KeyListView::DisplayStrategy::signatureForeground( const GpgME::UserID::Signature &, const QColor & fg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::signatureForeground( const GpgME::UserID::Signature &, const TQColor & fg ) const { return fg; } //background -QColor Kleo::KeyListView::DisplayStrategy::keyBackground( const GpgME::Key &, const QColor & bg )const { +TQColor Kleo::KeyListView::DisplayStrategy::keyBackground( const GpgME::Key &, const TQColor & bg )const { return bg; } -QColor Kleo::KeyListView::DisplayStrategy::subkeyBackground( const GpgME::Subkey &, const QColor & bg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::subkeyBackground( const GpgME::Subkey &, const TQColor & bg ) const { return bg; } -QColor Kleo::KeyListView::DisplayStrategy::useridBackground( const GpgME::UserID &, const QColor & bg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::useridBackground( const GpgME::UserID &, const TQColor & bg ) const { return bg; } -QColor Kleo::KeyListView::DisplayStrategy::signatureBackground( const GpgME::UserID::Signature &, const QColor & bg ) const { +TQColor Kleo::KeyListView::DisplayStrategy::signatureBackground( const GpgME::UserID::Signature &, const TQColor & bg ) const { return bg; } // // -// Collection of covariant return reimplementations of QListView(Item) +// Collection of covariant return reimplementations of TQListView(Item) // members: // // Kleo::KeyListView * Kleo::KeyListViewItem::listView() const { - return static_cast<Kleo::KeyListView*>( QListViewItem::listView() ); + return static_cast<Kleo::KeyListView*>( TQListViewItem::listView() ); } Kleo::KeyListViewItem * Kleo::KeyListViewItem::nextSibling() const { - return static_cast<Kleo::KeyListViewItem*>( QListViewItem::nextSibling() ); + return static_cast<Kleo::KeyListViewItem*>( TQListViewItem::nextSibling() ); } Kleo::KeyListViewItem * Kleo::KeyListView::firstChild() const { @@ -840,8 +840,8 @@ Kleo::KeyListViewItem * Kleo::KeyListView::selectedItem() const { return static_cast<Kleo::KeyListViewItem*>( KListView::selectedItem() ); } -static void selectedItems( QPtrList<Kleo::KeyListViewItem> & result, QListViewItem * start ) { - for ( QListViewItem * item = start ; item ; item = item->nextSibling() ) { +static void selectedItems( TQPtrList<Kleo::KeyListViewItem> & result, TQListViewItem * start ) { + for ( TQListViewItem * item = start ; item ; item = item->nextSibling() ) { if ( item->isSelected() ) if ( Kleo::KeyListViewItem * i = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) ) result.append( i ); @@ -849,14 +849,14 @@ static void selectedItems( QPtrList<Kleo::KeyListViewItem> & result, QListViewIt } } -QPtrList<Kleo::KeyListViewItem> Kleo::KeyListView::selectedItems() const { - QPtrList<KeyListViewItem> result; +TQPtrList<Kleo::KeyListViewItem> Kleo::KeyListView::selectedItems() const { + TQPtrList<KeyListViewItem> result; ::selectedItems( result, firstChild() ); return result; } -static bool hasSelection( QListViewItem * start ) { - for ( QListViewItem * item = start ; item ; item = item->nextSibling() ) +static bool hasSelection( TQListViewItem * start ) { + for ( TQListViewItem * item = start ; item ; item = item->nextSibling() ) if ( item->isSelected() || hasSelection( item->firstChild() ) ) return true; return false; diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 3ef70877..11301fe5 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -48,13 +48,13 @@ namespace Kleo { // work around moc parser bug... #define TEMPLATE_TYPENAME(T) template <typename T> TEMPLATE_TYPENAME(T) - inline T * lvi_cast( QListViewItem * item ) { + inline T * lvi_cast( TQListViewItem * item ) { return item && (item->rtti() & T::RTTI_MASK) == T::RTTI ? static_cast<T*>( item ) : 0 ; } TEMPLATE_TYPENAME(T) - inline const T * lvi_cast( const QListViewItem * item ) { + inline const T * lvi_cast( const TQListViewItem * item ) { return item && (item->rtti() & T::RTTI_MASK) == T::RTTI ? static_cast<const T*>( item ) : 0 ; } @@ -62,7 +62,7 @@ namespace Kleo { class KeyListView; - class KDE_EXPORT KeyListViewItem : public QListViewItem { + class KDE_EXPORT KeyListViewItem : public TQListViewItem { public: KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); @@ -78,24 +78,24 @@ namespace Kleo { // // only boring stuff below: // - virtual QString toolTip( int column ) const; + virtual TQString toolTip( int column ) const; /*! \reimp for covariant return */ KeyListView * listView() const; /*! \reimp for covariant return */ KeyListViewItem * nextSibling() const; /*! \reimp */ - int compare( QListViewItem * other, int col, bool ascending ) const; + int compare( TQListViewItem * other, int col, bool ascending ) const; /*! \reimp to allow for key() overload above */ - QString key( int col, bool ascending ) const { return QListViewItem::key( col, ascending ); } + TQString key( int col, bool ascending ) const { return TQListViewItem::key( col, ascending ); } /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); /*! \reimp */ - void insertItem( QListViewItem * item ); + void insertItem( TQListViewItem * item ); /*! \reimp */ - void takeItem( QListViewItem * item ); + void takeItem( TQListViewItem * item ); private: GpgME::Key mKey; @@ -117,17 +117,17 @@ namespace Kleo { // only boring stuff below: // /*! \reimp */ - QString toolTip( int col ) const; + TQString toolTip( int col ) const; /*! \reimp */ - QString text( int col ) const; + TQString text( int col ) const; /*! \reimp */ - const QPixmap * pixmap( int col ) const; + const TQPixmap * pixmap( int col ) const; /*! \reimp */ - int compare( QListViewItem * other, int col, bool ascending ) const; + int compare( TQListViewItem * other, int col, bool ascending ) const; /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::Subkey mSubkey; @@ -149,17 +149,17 @@ namespace Kleo { // only boring stuff below: // /*! \reimp */ - QString toolTip( int col ) const; + TQString toolTip( int col ) const; /*! \reimp */ - QString text( int col ) const; + TQString text( int col ) const; /*! \reimp */ - const QPixmap * pixmap( int col ) const; + const TQPixmap * pixmap( int col ) const; /*! \reimp */ - int compare( QListViewItem * other, int col, bool ascending ) const; + int compare( TQListViewItem * other, int col, bool ascending ) const; /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID mUserID; @@ -181,17 +181,17 @@ namespace Kleo { // only boring stuff below: // /*! \reimp */ - QString toolTip( int col ) const; + TQString toolTip( int col ) const; /*! \reimp */ - QString text( int col ) const; + TQString text( int col ) const; /*! \reimp */ - const QPixmap * pixmap( int col ) const; + const TQPixmap * pixmap( int col ) const; /*! \reimp */ - int compare( QListViewItem * other, int col, bool ascending ) const; + int compare( TQListViewItem * other, int col, bool ascending ) const; /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( QPainter * p, const QColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); private: GpgME::UserID::Signature mSignature; @@ -206,28 +206,28 @@ namespace Kleo { class KDE_EXPORT ColumnStrategy { public: virtual ~ColumnStrategy(); - virtual QString title( int column ) const = 0; - virtual int width( int column, const QFontMetrics & fm ) const; - virtual QListView::WidthMode widthMode( int ) const { return QListView::Manual; } + virtual TQString title( int column ) const = 0; + virtual int width( int column, const TQFontMetrics & fm ) const; + virtual TQListView::WidthMode widthMode( int ) const { return TQListView::Manual; } - virtual QString text( const GpgME::Key & key, int column ) const = 0; - virtual QString toolTip( const GpgME::Key & key, int column ) const; - virtual const QPixmap * pixmap( const GpgME::Key &, int ) const { return 0; } + virtual TQString text( const GpgME::Key & key, int column ) const = 0; + virtual TQString toolTip( const GpgME::Key & key, int column ) const; + 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 QString subkeyText( const GpgME::Subkey &, int ) const { return QString::null; } - virtual QString subkeyToolTip( const GpgME::Subkey & subkey, int column ) const; - virtual const QPixmap * subkeyPixmap( const GpgME::Subkey &, int ) const { return 0; } + virtual TQString subkeyText( const GpgME::Subkey &, int ) const { return TQString::null; } + 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 QString userIDText( const GpgME::UserID &, int ) const { return QString::null; } - virtual QString userIDToolTip( const GpgME::UserID & userID, int column ) const; - virtual const QPixmap * userIDPixmap( const GpgME::UserID &, int ) const { return 0; } + virtual TQString userIDText( const GpgME::UserID &, int ) const { return TQString::null; } + 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 QString signatureText( const GpgME::UserID::Signature &, int ) const { return QString::null; } - virtual QString signatureToolTip( const GpgME::UserID::Signature & sig, int column ) const; - virtual const QPixmap * signaturePixmap( const GpgME::UserID::Signature &, int ) const { return 0; } + virtual TQString signatureText( const GpgME::UserID::Signature &, int ) const { return TQString::null; } + 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; }; @@ -235,25 +235,25 @@ namespace Kleo { public: virtual ~DisplayStrategy(); //font - virtual QFont keyFont( const GpgME::Key &, const QFont & ) const; - virtual QFont subkeyFont( const GpgME::Subkey &, const QFont & ) const; - virtual QFont useridFont( const GpgME::UserID &, const QFont & ) const; - virtual QFont signatureFont( const GpgME::UserID::Signature & , const QFont & ) const; + virtual TQFont keyFont( const GpgME::Key &, const TQFont & ) const; + virtual TQFont subkeyFont( const GpgME::Subkey &, const TQFont & ) const; + virtual TQFont useridFont( const GpgME::UserID &, const TQFont & ) const; + virtual TQFont signatureFont( const GpgME::UserID::Signature & , const TQFont & ) const; //foreground - virtual QColor keyForeground( const GpgME::Key & , const QColor & ) const; - virtual QColor subkeyForeground( const GpgME::Subkey &, const QColor & ) const; - virtual QColor useridForeground( const GpgME::UserID &, const QColor & ) const; - virtual QColor signatureForeground( const GpgME::UserID::Signature &, const QColor & ) const; + virtual TQColor keyForeground( const GpgME::Key & , const TQColor & ) const; + virtual TQColor subkeyForeground( const GpgME::Subkey &, const TQColor & ) const; + virtual TQColor useridForeground( const GpgME::UserID &, const TQColor & ) const; + virtual TQColor signatureForeground( const GpgME::UserID::Signature &, const TQColor & ) const; //background - virtual QColor keyBackground( const GpgME::Key &, const QColor & ) const; - virtual QColor subkeyBackground( const GpgME::Subkey &, const QColor & ) const; - virtual QColor useridBackground( const GpgME::UserID &, const QColor & ) const; - virtual QColor signatureBackground( const GpgME::UserID::Signature &, const QColor & ) const; + virtual TQColor keyBackground( const GpgME::Key &, const TQColor & ) const; + virtual TQColor subkeyBackground( const GpgME::Subkey &, const TQColor & ) const; + virtual TQColor useridBackground( const GpgME::UserID &, const TQColor & ) const; + virtual TQColor signatureBackground( const GpgME::UserID::Signature &, const TQColor & ) const; }; KeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display=0, - QWidget * parent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KeyListView(); @@ -267,13 +267,13 @@ namespace Kleo { bool hasSelection() const; - KeyListViewItem * itemByFingerprint( const QCString & ) const; + KeyListViewItem * itemByFingerprint( const TQCString & ) const; signals: - void doubleClicked( Kleo::KeyListViewItem*, const QPoint&, int ); + void doubleClicked( Kleo::KeyListViewItem*, const TQPoint&, int ); void returnPressed( Kleo::KeyListViewItem* ); void selectionChanged( Kleo::KeyListViewItem* ); - void contextMenu( Kleo::KeyListViewItem*, const QPoint& ); + void contextMenu( Kleo::KeyListViewItem*, const TQPoint& ); public slots: virtual void slotAddKey( const GpgME::Key & key ); @@ -283,30 +283,30 @@ namespace Kleo { // Only boring stuff below: // private slots: - void slotEmitDoubleClicked( QListViewItem*, const QPoint&, int ); - void slotEmitReturnPressed( QListViewItem* ); - void slotEmitSelectionChanged( QListViewItem* ); - void slotEmitContextMenu( KListView*, QListViewItem*, const QPoint& ); + void slotEmitDoubleClicked( TQListViewItem*, const TQPoint&, int ); + void slotEmitReturnPressed( TQListViewItem* ); + void slotEmitSelectionChanged( TQListViewItem* ); + void slotEmitContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotUpdateTimeout(); public: /*! \reimp for covariant return */ KeyListViewItem * selectedItem() const; /*! \reimp */ - QPtrList<KeyListViewItem> selectedItems() const; + TQPtrList<KeyListViewItem> selectedItems() const; /*! \reimp for covariant return */ KeyListViewItem * firstChild() const; /*! \reimp */ void clear(); /*! \reimp */ - void insertItem( QListViewItem * ); + void insertItem( TQListViewItem * ); /*! \reimp */ - void takeItem( QListViewItem * ); + void takeItem( TQListViewItem * ); private: void doHierarchicalInsert( const GpgME::Key & ); void gatherScattered(); - void scatterGathered( QListViewItem * ); + void scatterGathered( TQListViewItem * ); void registerItem( KeyListViewItem * ); void deregisterItem( const KeyListViewItem * ); diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index d537affc..3a883dea 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -71,19 +71,19 @@ #include <kpushbutton.h> // Qt -#include <qapplication.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qlabel.h> -#include <qregexp.h> +#include <tqapplication.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqlabel.h> +#include <tqregexp.h> #include <assert.h> Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, - QWidget * parent, const char * name ) - : QWidget( parent, name ), + TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( multipleKeys ), @@ -94,8 +94,8 @@ Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, init(); } -Kleo::KeyRequester::KeyRequester( QWidget * parent, const char * name ) - : QWidget( parent, name ), +Kleo::KeyRequester::KeyRequester( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( false ), @@ -108,33 +108,33 @@ Kleo::KeyRequester::KeyRequester( QWidget * parent, const char * name ) void Kleo::KeyRequester::init() { - QHBoxLayout * hlay = new QHBoxLayout( this, 0, KDialog::spacingHint() ); + TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); // the label where the key id is to be displayed: - mLabel = new QLabel( this ); - mLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + mLabel = new TQLabel( this ); + mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // the button to unset any key: mEraseButton = new KPushButton( this ); mEraseButton->setAutoDefault( false ); - mEraseButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, - QSizePolicy::Minimum ) ); - mEraseButton->setIconSet( SmallIconSet( QApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); - QToolTip::add( mEraseButton, i18n("Clear") ); + mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + TQSizePolicy::Minimum ) ); + mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); + TQToolTip::add( mEraseButton, i18n("Clear") ); // the button to call the KeySelectionDialog: - mDialogButton = new QPushButton( i18n("Change..."), this ); + mDialogButton = new TQPushButton( i18n("Change..."), this ); mDialogButton->setAutoDefault( false ); hlay->addWidget( mLabel, 1 ); hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, SIGNAL(clicked()), SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, SIGNAL(clicked()), SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); - setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, - QSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + TQSizePolicy::Fixed ) ); setAllowedKeys( mKeyUsage ); } @@ -169,15 +169,15 @@ void Kleo::KeyRequester::setKey( const GpgME::Key & key ) { updateKeys(); } -QString Kleo::KeyRequester::fingerprint() const { +TQString Kleo::KeyRequester::fingerprint() const { if ( mKeys.empty() ) - return QString::null; + return TQString::null; else return mKeys.front().primaryFingerprint(); } -QStringList Kleo::KeyRequester::fingerprints() const { - QStringList result; +TQStringList Kleo::KeyRequester::fingerprints() const { + TQStringList result; for ( std::vector<GpgME::Key>::const_iterator it = mKeys.begin() ; it != mKeys.end() ; ++it ) if ( !it->isNull() ) if ( const char * fpr = it->primaryFingerprint() ) @@ -185,11 +185,11 @@ QStringList Kleo::KeyRequester::fingerprints() const { return result; } -void Kleo::KeyRequester::setFingerprint( const QString & fingerprint ) { +void Kleo::KeyRequester::setFingerprint( const TQString & fingerprint ) { startKeyListJob( fingerprint ); } -void Kleo::KeyRequester::setFingerprints( const QStringList & fingerprints ) { +void Kleo::KeyRequester::setFingerprints( const TQStringList & fingerprints ) { startKeyListJob( fingerprints ); } @@ -201,17 +201,17 @@ void Kleo::KeyRequester::updateKeys() { if ( mKeys.size() > 1 ) setMultipleKeysEnabled( true ); - QStringList labelTexts; - QString toolTipText; + TQStringList labelTexts; + TQString toolTipText; for ( std::vector<GpgME::Key>::const_iterator it = mKeys.begin() ; it != mKeys.end() ; ++it ) { if ( it->isNull() ) continue; - const QString fpr = it->primaryFingerprint(); + const TQString fpr = it->primaryFingerprint(); labelTexts.push_back( fpr.right(8) ); toolTipText += fpr.right(8) + ": "; if ( const char * uid = it->userID(0).id() ) if ( it->protocol() == GpgME::Context::OpenPGP ) - toolTipText += QString::fromUtf8( uid ); + toolTipText += TQString::fromUtf8( uid ); else toolTipText += Kleo::DN( uid ).prettyDN(); else @@ -220,24 +220,24 @@ void Kleo::KeyRequester::updateKeys() { } mLabel->setText( labelTexts.join(", ") ); - QToolTip::remove( mLabel ); - QToolTip::add( mLabel, toolTipText ); + TQToolTip::remove( mLabel ); + TQToolTip::add( mLabel, toolTipText ); } #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( QWidget * parent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); - const QString msg = i18n( "<qt><p>An error occurred while fetching " + const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .arg( QString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -void Kleo::KeyRequester::startKeyListJob( const QStringList & fingerprints ) { +void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { if ( !mSMIMEBackend && !mOpenPGPBackend ) return; @@ -245,7 +245,7 @@ void Kleo::KeyRequester::startKeyListJob( const QStringList & fingerprints ) { mJobs = 0; unsigned int count = 0; - for ( QStringList::const_iterator it = fingerprints.begin() ; it != fingerprints.end() ; ++it ) + for ( TQStringList::const_iterator it = fingerprints.begin() ; it != fingerprints.end() ; ++it ) if ( !(*it).stripWhiteSpace().isEmpty() ) ++count; @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const QStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, SIGNAL(result(const GpgME::KeyListResult&)), - SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, SIGNAL(nextKey(const GpgME::Key&)), - SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), + TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + TQT_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const QStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, SIGNAL(result(const GpgME::KeyListResult&)), - SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, SIGNAL(nextKey(const GpgME::Key&)), - SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), + TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + TQT_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -334,7 +334,7 @@ void Kleo::KeyRequester::slotDialogButtonClicked() { ? new KeySelectionDialog( mDialogCaption, mDialogMessage, mInitialQuery, mKeyUsage, mMulti, false, this ) : new KeySelectionDialog( mDialogCaption, mDialogCaption, mKeys, mKeyUsage, mMulti, false, this ) ; - if ( dlg->exec() == QDialog::Accepted ) { + if ( dlg->exec() == TQDialog::Accepted ) { if ( mMulti ) setKeys( dlg->selectedKeys() ); else @@ -352,11 +352,11 @@ void Kleo::KeyRequester::slotEraseButtonClicked() { updateKeys(); } -void Kleo::KeyRequester::setDialogCaption( const QString & caption ) { +void Kleo::KeyRequester::setDialogCaption( const TQString & caption ) { mDialogCaption = caption; } -void Kleo::KeyRequester::setDialogMessage( const QString & msg ) { +void Kleo::KeyRequester::setDialogMessage( const TQString & msg ) { mDialogMessage = msg; } @@ -400,11 +400,11 @@ void Kleo::KeyRequester::setAllowedKeys( unsigned int keyUsage ) { } } -QPushButton * Kleo::KeyRequester::dialogButton() { +TQPushButton * Kleo::KeyRequester::dialogButton() { return mDialogButton; } -QPushButton * Kleo::KeyRequester::eraseButton() { +TQPushButton * Kleo::KeyRequester::eraseButton() { return mEraseButton; } @@ -430,14 +430,14 @@ static inline unsigned int signingKeyUsage( bool openpgp, bool smime, bool trust } Kleo::EncryptionKeyRequester::EncryptionKeyRequester( bool multi, unsigned int proto, - QWidget * parent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( encryptionKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, parent, name ) { } -Kleo::EncryptionKeyRequester::EncryptionKeyRequester( QWidget * parent, const char * name ) +Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * parent, const char * name ) : KeyRequester( 0, false, parent, name ) { } @@ -451,14 +451,14 @@ void Kleo::EncryptionKeyRequester::setAllowedKeys( unsigned int proto, bool only } Kleo::SigningKeyRequester::SigningKeyRequester( bool multi, unsigned int proto, - QWidget * parent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( signingKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, parent, name ) { } -Kleo::SigningKeyRequester::SigningKeyRequester( QWidget * parent, const char * name ) +Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * parent, const char * name ) : KeyRequester( 0, false, parent, name ) { } diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 3de9c508..6392f5c6 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -49,7 +49,7 @@ #ifndef __KLEO_UI_KEYREQUESTER_H__ #define __KLEO_UI_KEYREQUESTER_H__ -#include <qwidget.h> +#include <tqwidget.h> #include <kleo/cryptobackend.h> #include <vector> @@ -73,13 +73,13 @@ class QLabel; namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester - class KDE_EXPORT KeyRequester : public QWidget { + class KDE_EXPORT KeyRequester : public TQWidget { Q_OBJECT public: KeyRequester( unsigned int allowedKeys, bool multipleKeys=false, - QWidget * parent=0, const char * name=0 ); + TQWidget * parent=0, const char * name=0 ); // Constructor for Qt Designer - KeyRequester( QWidget * parent=0, const char * name=0 ); + KeyRequester( TQWidget * parent=0, const char * name=0 ); ~KeyRequester(); const GpgME::Key & key() const; @@ -95,24 +95,24 @@ namespace Kleo { */ void setKeys( const std::vector<GpgME::Key> & keys ); - QString fingerprint() const; + TQString fingerprint() const; /** Set the key by fingerprint. Starts a background KeyListJob to retrive the complete GpgME::Key object */ - void setFingerprint( const QString & fingerprint ); + void setFingerprint( const TQString & fingerprint ); - QStringList fingerprints() const; + TQStringList fingerprints() const; /** Set the keys by fingerprint. Starts a background KeyListJob to retrive the complete GpgME::Key objects */ - void setFingerprints( const QStringList & fingerprints ); + void setFingerprints( const TQStringList & fingerprints ); - QPushButton * eraseButton(); - QPushButton * dialogButton(); + TQPushButton * eraseButton(); + TQPushButton * dialogButton(); - void setDialogCaption( const QString & caption ); - void setDialogMessage( const QString & message ); + void setDialogCaption( const TQString & caption ); + void setDialogMessage( const TQString & message ); bool isMultipleKeysEnabled() const; void setMultipleKeysEnabled( bool enable ); @@ -120,15 +120,15 @@ namespace Kleo { unsigned int allowedKeys() const; void setAllowedKeys( unsigned int allowed ); - void setInitialQuery( const QString & s ) { mInitialQuery = s; } - const QString & initialQuery() const { return mInitialQuery; } + void setInitialQuery( const TQString & s ) { mInitialQuery = s; } + const TQString & initialQuery() const { return mInitialQuery; } signals: void changed(); private: void init(); - void startKeyListJob( const QStringList & fingerprints ); + void startKeyListJob( const TQStringList & fingerprints ); void updateKeys(); private slots: @@ -140,10 +140,10 @@ namespace Kleo { private: const CryptoBackend::Protocol * mOpenPGPBackend; const CryptoBackend::Protocol * mSMIMEBackend; - QLabel * mLabel; - QPushButton * mEraseButton; - QPushButton * mDialogButton; - QString mDialogCaption, mDialogMessage, mInitialQuery; + TQLabel * mLabel; + TQPushButton * mEraseButton; + TQPushButton * mDialogButton; + TQString mDialogCaption, mDialogMessage, mInitialQuery; bool mMulti; unsigned int mKeyUsage; int mJobs; @@ -167,12 +167,12 @@ namespace Kleo { * Preferred constructor */ EncryptionKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - QWidget * parent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for Qt designer */ - EncryptionKeyRequester( QWidget * parent=0, const char * name=0 ); + EncryptionKeyRequester( TQWidget * parent=0, const char * name=0 ); ~EncryptionKeyRequester(); void setAllowedKeys( unsigned int proto, bool onlyTrusted=true, bool onlyValid=true ); @@ -199,12 +199,12 @@ namespace Kleo { * @param onlyValid only show valid keys */ SigningKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - QWidget * parent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for Qt designer */ - SigningKeyRequester( QWidget * parent=0, const char * name=0 ); + SigningKeyRequester( TQWidget * parent=0, const char * name=0 ); ~SigningKeyRequester(); /* diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index e21cb39d..fcb25751 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -63,17 +63,17 @@ #include <kprocess.h> // Qt -#include <qcheckbox.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qwhatsthis.h> -#include <qpopupmenu.h> -#include <qregexp.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqwhatsthis.h> +#include <tqpopupmenu.h> +#include <tqregexp.h> +#include <tqpushbutton.h> #include <algorithm> #include <iterator> @@ -151,8 +151,8 @@ static bool checkKeyUsage( const std::vector<GpgME::Key> & keys, unsigned int ke return true; } -static inline QString time_t2string( time_t t ) { - QDateTime dt; +static inline TQString time_t2string( time_t t ) { + TQDateTime dt; dt.setTime_t( t ); return dt.toString(); } @@ -163,15 +163,15 @@ namespace { public: ColumnStrategy( unsigned int keyUsage ); - QString title( int col ) const; - int width( int col, const QFontMetrics & fm ) const; + TQString title( int col ) const; + int width( int col, const TQFontMetrics & fm ) const; - QString text( const GpgME::Key & key, int col ) const; - QString toolTip( const GpgME::Key & key, int col ) const; - const QPixmap * pixmap( const GpgME::Key & key, int col ) const; + TQString text( const GpgME::Key & key, int col ) const; + TQString toolTip( const GpgME::Key & key, int col ) const; + const TQPixmap * pixmap( const GpgME::Key & key, int col ) const; private: - const QPixmap mKeyGoodPix, mKeyBadPix, mKeyUnknownPix, mKeyValidPix; + const TQPixmap mKeyGoodPix, mKeyBadPix, mKeyUnknownPix, mKeyValidPix; const unsigned int mKeyUsage; }; @@ -187,31 +187,31 @@ namespace { << "KeySelectionDialog: keyUsage == 0. You want to use AllKeys instead." << endl; } - QString ColumnStrategy::title( int col ) const { + TQString ColumnStrategy::title( int col ) const { switch ( col ) { case 0: return i18n("Key ID"); case 1: return i18n("User ID"); - default: return QString::null; + default: return TQString::null; } } - int ColumnStrategy::width( int col, const QFontMetrics & fm ) const { + int ColumnStrategy::width( int col, const TQFontMetrics & fm ) const { if ( col == 0 ) { static const char hexchars[] = "0123456789ABCDEF"; int maxWidth = 0; for ( unsigned int i = 0 ; i < 16 ; ++i ) - maxWidth = kMax( fm.width( QChar( hexchars[i] ) ), maxWidth ); + maxWidth = kMax( fm.width( TQChar( hexchars[i] ) ), maxWidth ); return 8 * maxWidth + 2 * mKeyGoodPix.width(); } return Kleo::KeyListView::ColumnStrategy::width( col, fm ); } - QString ColumnStrategy::text( const GpgME::Key & key, int col ) const { + TQString ColumnStrategy::text( const GpgME::Key & key, int col ) const { switch ( col ) { case 0: { if ( key.shortKeyID() ) - return QString::fromUtf8( key.shortKeyID() ); + return TQString::fromUtf8( key.shortKeyID() ); else return i18n("<unknown>"); } @@ -220,30 +220,30 @@ namespace { { const char * uid = key.userID(0).id(); if ( key.protocol() == GpgME::Context::OpenPGP ) - return uid && *uid ? QString::fromUtf8( uid ) : QString::null ; + return uid && *uid ? TQString::fromUtf8( uid ) : TQString::null ; else // CMS return Kleo::DN( uid ).prettyDN(); } break; - default: return QString::null; + default: return TQString::null; } } - QString ColumnStrategy::toolTip( const GpgME::Key & key, int ) const { + TQString ColumnStrategy::toolTip( const GpgME::Key & key, int ) const { const char * uid = key.userID(0).id(); const char * fpr = key.primaryFingerprint(); const char * issuer = key.issuerName(); const GpgME::Subkey subkey = key.subkey(0); - const QString expiry = subkey.neverExpires() ? i18n("never") : time_t2string( subkey.expirationTime() ) ; - const QString creation = time_t2string( subkey.creationTime() ); + const TQString expiry = subkey.neverExpires() ? i18n("never") : time_t2string( subkey.expirationTime() ) ; + const TQString creation = time_t2string( subkey.creationTime() ); if ( key.protocol() == GpgME::Context::OpenPGP ) return i18n( "OpenPGP key for %1\n" "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4" ) - .arg( uid ? QString::fromUtf8( uid ) : i18n("unknown"), + .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, - fpr ? QString::fromLatin1( fpr ) : i18n("unknown") ); + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); else return i18n( "S/MIME key for %1\n" "Created: %2\n" @@ -252,11 +252,11 @@ namespace { "Issuer: %5" ) .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, - fpr ? QString::fromLatin1( fpr ) : i18n("unknown") ) + fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } - const QPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { + const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { if ( col != 0 ) return 0; // this key did not undergo a validating keylisting yet: @@ -288,13 +288,13 @@ namespace { static const int sCheckSelectionDelay = 250; -Kleo::KeySelectionDialog::KeySelectionDialog( const QString & title, - const QString & text, +Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, + const TQString & text, const std::vector<GpgME::Key> & selectedKeys, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - QWidget * parent, const char * name, + TQWidget * parent, const char * name, bool modal ) : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), @@ -304,16 +304,16 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const QString & title, mKeyUsage( keyUsage ), mCurrentContextMenuItem( 0 ) { - init( rememberChoice, extendedSelection, text, QString::null ); + init( rememberChoice, extendedSelection, text, TQString::null ); } -Kleo::KeySelectionDialog::KeySelectionDialog( const QString & title, - const QString & text, - const QString & initialQuery, +Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, + const TQString & text, + const TQString & initialQuery, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - QWidget * parent, const char * name, + TQWidget * parent, const char * name, bool modal ) : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), @@ -327,81 +327,81 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const QString & title, } void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection, - const QString & text, const QString & initialQuery ) { + const TQString & text, const TQString & initialQuery ) { if ( mKeyUsage & OpenPGPKeys ) mOpenPGPBackend = Kleo::CryptoBackendFactory::instance()->openpgp(); if ( mKeyUsage & SMIMEKeys ) mSMIMEBackend = Kleo::CryptoBackendFactory::instance()->smime(); - mCheckSelectionTimer = new QTimer( this ); - mStartSearchTimer = new QTimer( this ); + mCheckSelectionTimer = new TQTimer( this ); + mStartSearchTimer = new TQTimer( this ); - QFrame *page = makeMainWidget(); - mTopLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQFrame *page = makeMainWidget(); + mTopLayout = new TQVBoxLayout( page, 0, spacingHint() ); if ( !text.isEmpty() ) { - QLabel* textLabel = new QLabel( text, page ); + TQLabel* textLabel = new TQLabel( text, page ); textLabel->setAlignment( textLabel->alignment() | Qt::WordBreak ); mTopLayout->addWidget( textLabel ); } - QHBoxLayout * hlay = new QHBoxLayout( mTopLayout ); // inherits spacing - QLineEdit * le = new QLineEdit( page ); + TQHBoxLayout * hlay = new TQHBoxLayout( mTopLayout ); // inherits spacing + TQLineEdit * le = new TQLineEdit( page ); le->setText( initialQuery ); - QToolButton *clearButton = new QToolButton( page ); + TQToolButton *clearButton = new TQToolButton( page ); clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet( KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) ); hlay->addWidget( clearButton ); - hlay->addWidget( new QLabel( le, i18n("&Search for:"), page ) ); + hlay->addWidget( new TQLabel( le, i18n("&Search for:"), page ) ); hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, SIGNAL( clicked() ), le, SLOT( clear() ) ); - connect( le, SIGNAL(textChanged(const QString&)), - this, SLOT(slotSearch(const QString&)) ); - connect( mStartSearchTimer, SIGNAL(timeout()), SLOT(slotFilter()) ); + connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); + connect( le, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); - mKeyListView->setResizeMode( QListView::LastColumn ); + mKeyListView->setResizeMode( TQListView::LastColumn ); mKeyListView->setRootIsDecorated( true ); mKeyListView->setShowSortIndicator( true ); mKeyListView->setSorting( 1, true ); // sort by User ID mKeyListView->setShowToolTips( true ); if ( extendedSelection ) - mKeyListView->setSelectionMode( QListView::Extended ); + mKeyListView->setSelectionMode( TQListView::Extended ); mTopLayout->addWidget( mKeyListView, 10 ); if ( rememberChoice ) { - mRememberCB = new QCheckBox( i18n("&Remember choice"), page ); + mRememberCB = new TQCheckBox( i18n("&Remember choice"), page ); mTopLayout->addWidget( mRememberCB ); - QWhatsThis::add( mRememberCB, + TQWhatsThis::add( mRememberCB, i18n("<qt><p>If you check this box your choice will " "be stored and you will not be asked again." "</p></qt>") ); } - connect( mCheckSelectionTimer, SIGNAL(timeout()), - SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), + TQT_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const QPoint&,int)), - SLOT(slotTryOk()) ); + TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQT_SLOT(slotTryOk()) ); connect( mKeyListView, - SIGNAL(contextMenu(Kleo::KeyListViewItem*,const QPoint&)), - SLOT(slotRMB(Kleo::KeyListViewItem*,const QPoint&)) ); + TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, SIGNAL(defaultClicked()), this, SLOT(slotRereadKeys()) ); - connect( this, SIGNAL(helpClicked()), this, SLOT(slotStartCertificateManager()) ); + connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); + connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); if ( kapp ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); - QSize dialogSize( 500, 400 ); + TQSize dialogSize( 500, 400 ); KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" ); dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize ); @@ -418,20 +418,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, SIGNAL(selectionChanged()), - SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -440,20 +440,20 @@ const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { return mKeyListView->selectedItem()->key(); } -QString Kleo::KeySelectionDialog::fingerprint() const { +TQString Kleo::KeySelectionDialog::fingerprint() const { return selectedKey().primaryFingerprint(); } -QStringList Kleo::KeySelectionDialog::fingerprints() const { - QStringList result; +TQStringList Kleo::KeySelectionDialog::fingerprints() const { + TQStringList result; for ( std::vector<GpgME::Key>::const_iterator it = mSelectedKeys.begin() ; it != mSelectedKeys.end() ; ++it ) if ( const char * fpr = it->primaryFingerprint() ) result.push_back( fpr ); return result; } -QStringList Kleo::KeySelectionDialog::pgpKeyFingerprints() const { - QStringList result; +TQStringList Kleo::KeySelectionDialog::pgpKeyFingerprints() const { + TQStringList result; for ( std::vector<GpgME::Key>::const_iterator it = mSelectedKeys.begin() ; it != mSelectedKeys.end() ; ++it ) if ( it->protocol() == GpgME::Context::OpenPGP ) if ( const char * fpr = it->primaryFingerprint() ) @@ -461,8 +461,8 @@ QStringList Kleo::KeySelectionDialog::pgpKeyFingerprints() const { return result; } -QStringList Kleo::KeySelectionDialog::smimeFingerprints() const { - QStringList result; +TQStringList Kleo::KeySelectionDialog::smimeFingerprints() const { + TQStringList result; for ( std::vector<GpgME::Key>::const_iterator it = mSelectedKeys.begin() ; it != mSelectedKeys.end() ; ++it ) if ( it->protocol() == GpgME::Context::CMS ) if ( const char * fpr = it->primaryFingerprint() ) @@ -515,12 +515,12 @@ void Kleo::KeySelectionDialog::slotStartCertificateManager() #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( QWidget * parent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); - const QString msg = i18n( "<qt><p>An error occurred while fetching " + const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) - .arg( QString::fromLocal8Bit( err.asString() ) ); + .arg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } @@ -528,7 +528,7 @@ static void showKeyListError( QWidget * parent, const GpgME::Error & err ) { namespace { struct ExtractFingerprint { - QString operator()( const GpgME::Key & key ) { + TQString operator()( const GpgME::Key & key ) { return key.primaryFingerprint(); } }; @@ -540,14 +540,14 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P if ( !job ) return; - connect( job, SIGNAL(result(const GpgME::KeyListResult&)), - SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), + TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - SLOT(slotRefreshKey(const GpgME::Key&)) : - SLOT(slotAddKey(const GpgME::Key&)) ); + TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - QStringList fprs; + TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); const GpgME::Error err = job->start( fprs, mKeyUsage & SecretKeys && !( mKeyUsage & PublicKeys ) ); @@ -685,13 +685,13 @@ bool Kleo::KeySelectionDialog::rememberSelection() const { return mRememberCB && mRememberCB->isChecked() ; } -void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const QPoint & p ) { +void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPoint & p ) { if ( !item ) return; mCurrentContextMenuItem = item; - QPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, SLOT(slotRecheckKey()) ); + TQPopupMenu menu; + menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); menu.exec( p ); } @@ -725,7 +725,7 @@ void Kleo::KeySelectionDialog::slotCancel() { reject(); } -void Kleo::KeySelectionDialog::slotSearch( const QString & text ) { +void Kleo::KeySelectionDialog::slotSearch( const TQString & text ) { mSearchText = text.stripWhiteSpace().upper(); slotSearch(); } @@ -741,7 +741,7 @@ void Kleo::KeySelectionDialog::slotFilter() { } // OK, so we need to filter: - QRegExp keyIdRegExp( "(?:0x)?[A-F0-9]{1,8}", false /*case-insens.*/ ); + TQRegExp keyIdRegExp( "(?:0x)?[A-F0-9]{1,8}", false /*case-insens.*/ ); if ( keyIdRegExp.exactMatch( mSearchText ) ) { if ( mSearchText.startsWith( "0X" ) ) // search for keyID only: @@ -755,7 +755,7 @@ void Kleo::KeySelectionDialog::slotFilter() { } } -void Kleo::KeySelectionDialog::filterByKeyID( const QString & keyID ) { +void Kleo::KeySelectionDialog::filterByKeyID( const TQString & keyID ) { assert( keyID.length() <= 8 ); assert( !keyID.isEmpty() ); // regexp in slotFilter should prevent these if ( keyID.isEmpty() ) @@ -765,33 +765,33 @@ void Kleo::KeySelectionDialog::filterByKeyID( const QString & keyID ) { item->setVisible( item->text( 0 ).upper().startsWith( keyID ) ); } -static bool anyUIDMatches( const Kleo::KeyListViewItem * item, QRegExp & rx ) { +static bool anyUIDMatches( const Kleo::KeyListViewItem * item, TQRegExp & rx ) { if ( !item ) return false; const std::vector<GpgME::UserID> uids = item->key().userIDs(); for ( std::vector<GpgME::UserID>::const_iterator it = uids.begin() ; it != uids.end() ; ++it ) - if ( it->id() && rx.search( QString::fromUtf8( it->id() ) ) >= 0 ) + if ( it->id() && rx.search( TQString::fromUtf8( it->id() ) ) >= 0 ) return true; return false; } -void Kleo::KeySelectionDialog::filterByKeyIDOrUID( const QString & str ) { +void Kleo::KeySelectionDialog::filterByKeyIDOrUID( const TQString & str ) { assert( !str.isEmpty() ); // match beginnings of words: - QRegExp rx( "\\b" + QRegExp::escape( str ), false ); + TQRegExp rx( "\\b" + TQRegExp::escape( str ), false ); for ( KeyListViewItem * item = mKeyListView->firstChild() ; item ; item = item->nextSibling() ) item->setVisible( item->text( 0 ).upper().startsWith( str ) || anyUIDMatches( item, rx ) ); } -void Kleo::KeySelectionDialog::filterByUID( const QString & str ) { +void Kleo::KeySelectionDialog::filterByUID( const TQString & str ) { assert( !str.isEmpty() ); // match beginnings of words: - QRegExp rx( "\\b" + QRegExp::escape( str ), false ); + TQRegExp rx( "\\b" + TQRegExp::escape( str ), false ); for ( KeyListViewItem * item = mKeyListView->firstChild() ; item ; item = item->nextSibling() ) item->setVisible( anyUIDMatches( item, rx ) ); diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index f274398b..efb87d5e 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -83,21 +83,21 @@ namespace Kleo { ValidTrustedEncryptionKeys = AllKeys | EncryptionKeys | ValidKeys | TrustedKeys }; - KeySelectionDialog( const QString & title, - const QString & text, + KeySelectionDialog( const TQString & title, + const TQString & text, const std::vector<GpgME::Key> & selectedKeys=std::vector<GpgME::Key>(), unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - QWidget * parent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); - KeySelectionDialog( const QString & title, - const QString & text, - const QString & initialPattern, + KeySelectionDialog( const TQString & title, + const TQString & text, + const TQString & initialPattern, unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - QWidget * parent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeySelectionDialog(); @@ -105,18 +105,18 @@ namespace Kleo { Otherwise it returns a null key. */ const GpgME::Key & selectedKey() const; - QString fingerprint() const; + TQString fingerprint() const; /** Returns a list of selected key IDs. */ const std::vector<GpgME::Key> & selectedKeys() const { return mSelectedKeys; } /// Return all the selected fingerprints - QStringList fingerprints() const; + TQStringList fingerprints() const; /// Return the selected openpgp fingerprints - QStringList pgpKeyFingerprints() const; + TQStringList pgpKeyFingerprints() const; /// Return the selected smime fingerprints - QStringList smimeFingerprints() const; + TQStringList smimeFingerprints() const; bool rememberSelection() const; protected slots: @@ -125,7 +125,7 @@ namespace Kleo { void slotHelp(); // Could be used by derived classes to insert their own widget - QVBoxLayout* topLayout() const { return mTopLayout; } + TQVBoxLayout* topLayout() const { return mTopLayout; } private slots: void slotRereadKeys(); @@ -134,21 +134,21 @@ namespace Kleo { void slotSelectionChanged(); void slotCheckSelection() { slotCheckSelection( 0 ); } void slotCheckSelection( Kleo::KeyListViewItem * ); - void slotRMB( Kleo::KeyListViewItem *, const QPoint & ); + void slotRMB( Kleo::KeyListViewItem *, const TQPoint & ); void slotRecheckKey(); void slotTryOk(); void slotOk(); void slotCancel(); - void slotSearch( const QString & text ); + void slotSearch( const TQString & text ); void slotSearch(); void slotFilter(); private: - void filterByKeyID( const QString & keyID ); - void filterByKeyIDOrUID( const QString & keyID ); - void filterByUID( const QString & uid ); + void filterByKeyID( const TQString & keyID ); + void filterByKeyIDOrUID( const TQString & keyID ); + void filterByUID( const TQString & uid ); void showAllItems(); - bool anyChildMatches( const Kleo::KeyListViewItem * item, QRegExp & rx ) const; + bool anyChildMatches( const Kleo::KeyListViewItem * item, TQRegExp & rx ) const; void connectSignals(); void disconnectSignals(); @@ -156,20 +156,20 @@ namespace Kleo { void startKeyListJobForBackend( const Kleo::CryptoBackend::Protocol *, const std::vector<GpgME::Key> &, bool ); void startValidatingKeyListing(); - void init( bool, bool, const QString &, const QString & ); + void init( bool, bool, const TQString &, const TQString & ); private: - QVBoxLayout* mTopLayout; + TQVBoxLayout* mTopLayout; Kleo::KeyListView * mKeyListView; const Kleo::CryptoBackend::Protocol * mOpenPGPBackend; const Kleo::CryptoBackend::Protocol * mSMIMEBackend; - QCheckBox * mRememberCB; + TQCheckBox * mRememberCB; std::vector<GpgME::Key> mSelectedKeys, mKeysToCheck; unsigned int mKeyUsage; - QTimer * mCheckSelectionTimer; - QTimer * mStartSearchTimer; + TQTimer * mCheckSelectionTimer; + TQTimer * mStartSearchTimer; // cross-eventloop temporaries: - QString mSearchText; + TQString mSearchText; Kleo::KeyListViewItem * mCurrentContextMenuItem; int mTruncated, mListJobCount, mSavedOffsetY; }; diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 283d3310..ddce8f04 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -47,9 +47,9 @@ #include <ksavefile.h> #include <kguiitem.h> -#include <qtextedit.h> -#include <qtextstream.h> -#include <qvbox.h> +#include <tqtextedit.h> +#include <tqtextstream.h> +#include <tqvbox.h> using namespace Kleo; using namespace GpgME; @@ -71,40 +71,40 @@ static KGuiItem KGuiItem_showAuditLog() { class AuditLogViewer : public KDialogBase { // Q_OBJECT public: - explicit AuditLogViewer( const QString & log, QWidget * parent=0, const char * name=0, WFlags f=0 ) + explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 ) : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"), Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ), - m_textEdit( new QTextEdit( this, "m_textEdit" ) ) + m_textEdit( new TQTextEdit( this, "m_textEdit" ) ) { setWFlags( f ); setMainWidget( m_textEdit ); - m_textEdit->setTextFormat( QTextEdit::RichText ); + m_textEdit->setTextFormat( TQTextEdit::RichText ); m_textEdit->setReadOnly( true ); setAuditLog( log ); } ~AuditLogViewer() {} - void setAuditLog( const QString & log ) { + void setAuditLog( const TQString & log ) { m_textEdit->setText( log ); } private: void slotUser1() { - const QString fileName = KFileDialog::getSaveFileName( QString(), QString(), + const TQString fileName = KFileDialog::getSaveFileName( TQString(), TQString(), this, i18n("Choose File to Save GnuPG Audit Log to") ); if ( fileName.isEmpty() ) return; KSaveFile file( fileName ); - if ( QTextStream * const s = file.textStream() ) { + if ( TQTextStream * const s = file.textStream() ) { *s << m_textEdit->text() << endl; file.close(); } if ( const int err = file.status() ) KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2") - .arg( file.name(), QString::fromLocal8Bit( strerror( err ) ) ), + .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), i18n("File Save Error") ); } void slotUser2() { @@ -114,13 +114,13 @@ private: } private: - QTextEdit * m_textEdit; + TQTextEdit * m_textEdit; }; } // anon namespace // static -void MessageBox::auditLog( QWidget * parent, const Job * job, const QString & caption ) { +void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) { if ( !job ) return; @@ -131,7 +131,7 @@ void MessageBox::auditLog( QWidget * parent, const Job * job, const QString & ca return; } - const QString log = job->auditLogAsHtml(); + const TQString log = job->auditLogAsHtml(); if ( log.isEmpty() ) { KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."), i18n("No GnuPG Audit Log") ); @@ -142,112 +142,112 @@ void MessageBox::auditLog( QWidget * parent, const Job * job, const QString & ca } // static -void MessageBox::auditLog( QWidget * parent, const QString & log, const QString & caption ) { +void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) { AuditLogViewer * const alv = new AuditLogViewer( "<qt>" + log + "</qt>", parent, "alv", Qt::WDestructiveClose ); alv->setCaption( caption ); alv->show(); } // static -void MessageBox::auditLog( QWidget * parent, const Job * job ) { +void MessageBox::auditLog( TQWidget * parent, const Job * job ) { auditLog( parent, job, i18n("GnuPG Audit Log Viewer") ); } // static -void MessageBox::auditLog( QWidget * parent, const QString & log ) { +void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { auditLog( parent, log, i18n("GnuPG Audit Log Viewer") ); } -static QString to_information_string( const SigningResult & result ) { +static TQString to_information_string( const SigningResult & result ) { return result.error() - ? i18n("Signing failed: %1").arg( QString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Signing successful") ; } -static QString to_error_string( const SigningResult & result ) { +static TQString to_error_string( const SigningResult & result ) { return to_information_string( result ); } -static QString to_information_string( const EncryptionResult & result ) { +static TQString to_information_string( const EncryptionResult & result ) { return result.error() - ? i18n("Encryption failed: %1").arg( QString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Encryption successful") ; } -static QString to_error_string( const EncryptionResult & result ) { +static TQString to_error_string( const EncryptionResult & result ) { return to_information_string( result ); } -static QString to_information_string( const SigningResult & sresult, const EncryptionResult & eresult ) { +static TQString to_information_string( const SigningResult & sresult, const EncryptionResult & eresult ) { return to_information_string( sresult ) + '\n' + to_information_string( eresult ); } -static QString to_error_string( const SigningResult & sresult, const EncryptionResult & eresult ) { +static TQString to_error_string( const SigningResult & sresult, const EncryptionResult & eresult ) { return to_information_string( sresult, eresult ); } // static -void MessageBox::information( QWidget * parent, const SigningResult & result, const Job * job, int options ) { +void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { information( parent, result, job, i18n("Signing Result"), options ); } // static -void MessageBox::information( QWidget * parent, const SigningResult & result, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Information, to_information_string( result ), job, caption, options ); +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 ); } // static -void MessageBox::error( QWidget * parent, const SigningResult & result, const Job * job, int options ) { +void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { error( parent, result, job, i18n("Signing Error"), options ); } // static -void MessageBox::error( QWidget * parent, const SigningResult & result, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Critical, to_error_string( result ), job, caption, options ); +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 ); } // static -void MessageBox::information( QWidget * parent, const EncryptionResult & result, const Job * job, int options ) { +void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { information( parent, result, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( QWidget * parent, const EncryptionResult & result, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Information, to_information_string( result ), job, caption, options ); +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 ); } // static -void MessageBox::error( QWidget * parent, const EncryptionResult & result, const Job * job, int options ) { +void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { error( parent, result, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( QWidget * parent, const EncryptionResult & result, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Critical, to_error_string( result ), job, caption, options ); +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 ); } // static -void MessageBox::information( QWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { +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 ); } // static -void MessageBox::information( QWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); +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 ); } // static -void MessageBox::error( QWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { +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 ); } // static -void MessageBox::error( QWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const QString & caption, int options ) { - make( parent, QMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); +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 ); } // static -void MessageBox::make( QWidget * parent, QMessageBox::Icon icon, const QString & text, const Job * job, const QString & caption, int options ) { +void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { KDialogBase * dialog = GpgME::hasFeature( GpgME::AuditLogFeature ) ? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes, KDialogBase::Yes, @@ -260,6 +260,6 @@ void MessageBox::make( QWidget * parent, QMessageBox::Icon icon, const QString & if ( options & KMessageBox::PlainCaption ) dialog->setPlainCaption( caption ); - if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, QStringList(), QString::null, 0, options ) ) + if ( KDialogBase::No == KMessageBox::createKMessageBox( dialog, icon, text, TQStringList(), TQString::null, 0, options ) ) auditLog( 0, job ); } diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index a84f86e1..dad984d0 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -53,28 +53,28 @@ namespace Kleo { class MessageBox { public: - static void information( QWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void information( QWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( QWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void information( QWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( QWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void information( QWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const QString & caption, int options=KMessageBox::Notify ); - static void error( QWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void auditLog( QWidget * parent, const Kleo::Job * job, const QString & caption ); - static void auditLog( QWidget * parent, const Kleo::Job * job ); - static void auditLog( QWidget * parent, const QString & log, const QString & caption ); - static void auditLog( QWidget * parent, const QString & log ); + 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 ); private: - static void make( QWidget * parent, QMessageBox::Icon icon, const QString & text, const Kleo::Job * job, const QString & caption, int options ); + static void make( TQWidget * parent, 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 5915387f..a0bc7295 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -56,33 +56,33 @@ #include <kiconloader.h> #include <klocale.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qfontmetrics.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqfontmetrics.h> struct Kleo::PassphraseDialog::Private { KPasswordEdit * lineedit; }; -Kleo::PassphraseDialog::PassphraseDialog( const QString & msg, const QString & caption, - QWidget * parent, const char * name, bool modal ) +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 ) { d = new Private(); - QWidget * w = new QWidget( this ); + TQWidget * w = new TQWidget( this ); setMainWidget( w ); - QHBoxLayout * hlay = new QHBoxLayout( w, 0, spacingHint() ); + TQHBoxLayout * hlay = new TQHBoxLayout( w, 0, spacingHint() ); - QLabel * label = new QLabel( w ); + TQLabel * label = new TQLabel( w ); label->setPixmap( DesktopIcon( "pgp-keys", KIcon::SizeMedium ) ); hlay->addWidget( label, 0, AlignTop ); - QVBoxLayout * vlay = new QVBoxLayout( hlay ); // inherits spacing + TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing - vlay->addWidget( new QLabel( msg.isEmpty() ? i18n("Please enter your passphrase:") : msg, w ) ); + vlay->addWidget( new TQLabel( msg.isEmpty() ? i18n("Please enter your passphrase:") : msg, w ) ); d->lineedit = new KPasswordEdit( KPasswordEdit::OneStar, w, "d->lineedit" ); d->lineedit->setMinimumWidth( fontMetrics().width("*") * 20 ); @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const QString & msg, const QString & c vlay->addWidget( d->lineedit ); - connect( d->lineedit, SIGNAL(returnPressed()), SLOT(slotOk()) ); + connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 12a434e1..43b54042 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -56,9 +56,9 @@ namespace Kleo { class PassphraseDialog : public KDialogBase { Q_OBJECT public: - PassphraseDialog( const QString & description, - const QString & caption=QString::null, - QWidget * parent=0, const char * name=0, + PassphraseDialog( const TQString & description, + const TQString & caption=TQString::null, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~PassphraseDialog(); diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 96f51fa8..1b14868d 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -33,26 +33,26 @@ #include "config.h" #include "progressbar.h" -#include <qtimer.h> +#include <tqtimer.h> #include <kdebug.h> static const int busyTimerTickInterval = 100; static const int busyTimerTickIncrement = 5; -Kleo::ProgressBar::ProgressBar( QWidget * parent, const char * name, WFlags f ) - : QProgressBar( 0, parent, name, f ), +Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) + : TQProgressBar( 0, parent, name, f ), mRealProgress( -1 ) { - mBusyTimer = new QTimer( this ); - connect( mBusyTimer, SIGNAL(timeout()), SLOT(slotBusyTimerTick()) ); + mBusyTimer = new TQTimer( this ); + connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); fixup( true ); } -void Kleo::ProgressBar::slotProgress( const QString &, int cur, int tot ) { +void Kleo::ProgressBar::slotProgress( const TQString &, int cur, int tot ) { setProgress( cur, tot ); } -void Kleo::ProgressBar::slotProgress( const QString &, int, int cur, int tot ) { +void Kleo::ProgressBar::slotProgress( const TQString &, int, int cur, int tot ) { setProgress( cur, tot ); } @@ -60,7 +60,7 @@ void Kleo::ProgressBar::setTotalSteps( int total ) { kdDebug() << "Kleo::ProgressBar::setTotalSteps( " << total << " )" << endl; if ( total == totalSteps() ) return; - QProgressBar::setTotalSteps( 0 ); + TQProgressBar::setTotalSteps( 0 ); fixup( false ); } @@ -78,12 +78,12 @@ void Kleo::ProgressBar::reset() { void Kleo::ProgressBar::slotBusyTimerTick() { fixup( false ); if ( mBusyTimer->isActive() ) - QProgressBar::setProgress( QProgressBar::progress() + busyTimerTickIncrement ); + TQProgressBar::setProgress( TQProgressBar::progress() + busyTimerTickIncrement ); } void Kleo::ProgressBar::fixup( bool newValue ) { - const int cur = QProgressBar::progress(); - const int tot = QProgressBar::totalSteps(); + const int cur = TQProgressBar::progress(); + const int tot = TQProgressBar::totalSteps(); kdDebug() << "Kleo::ProgressBar::startStopBusyTimer() cur = " << cur << "; tot = " << tot << "; real = " << mRealProgress << endl; @@ -91,20 +91,20 @@ void Kleo::ProgressBar::fixup( bool newValue ) { kdDebug() << "(new value) switch to reset" << endl; mBusyTimer->stop(); if ( newValue ) - QProgressBar::reset(); + TQProgressBar::reset(); mRealProgress = -1; } else if ( tot == 0 ) { kdDebug() << "(new value) switch or stay in busy" << endl; if ( !mBusyTimer->isActive() ) { mBusyTimer->start( busyTimerTickInterval ); if ( newValue ) - QProgressBar::setProgress( mRealProgress ); + TQProgressBar::setProgress( mRealProgress ); } } else { kdDebug() << "(new value) normal progress" << endl; mBusyTimer->stop(); - if ( QProgressBar::progress() != mRealProgress ) - QProgressBar::setProgress( mRealProgress ); + if ( TQProgressBar::progress() != mRealProgress ) + TQProgressBar::setProgress( mRealProgress ); } } diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 41d96796..1120a0dd 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -33,23 +33,23 @@ #ifndef __KLEO_PROGRESSBAR_H__ #define __KLEO_PROGRESSBAR_H__ -#include <qprogressbar.h> +#include <tqprogressbar.h> #include <kdepimmacros.h> class QTimer; namespace Kleo { /** - @short A QProgressBar with self-powered busy indicator + @short A TQProgressBar with self-powered busy indicator */ - class KDE_EXPORT ProgressBar : public QProgressBar { + class KDE_EXPORT ProgressBar : public TQProgressBar { Q_OBJECT public: - ProgressBar( QWidget * parent=0, const char * name=0, WFlags f=0 ); + ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); public slots: - void slotProgress( const QString & message, int type, int current, int total ); - void slotProgress( const QString & message, int current, int total ); + void slotProgress( const TQString & message, int type, int current, int total ); + void slotProgress( const TQString & message, int current, int total ); /*! reimplementation to support self-powered busy indicator */ void setProgress( int progress ); /*! reimplementation to support self-powered busy indicator */ @@ -57,7 +57,7 @@ namespace Kleo { /*! reimplementation to support self-powered busy indicator */ void reset(); /*! reimplementation to preserve visibility */ - void setProgress( int cur, int tot ) { QProgressBar::setProgress( cur, tot ); } + void setProgress( int cur, int tot ) { TQProgressBar::setProgress( cur, tot ); } private slots: void slotBusyTimerTick(); @@ -66,7 +66,7 @@ namespace Kleo { void fixup( bool ); private: - QTimer * mBusyTimer; + TQTimer * mBusyTimer; int mRealProgress; }; } diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index bb66aca1..1418bb65 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -39,13 +39,13 @@ #include <kdebug.h> #include <klocale.h> -#include <qtimer.h> +#include <tqtimer.h> #include <assert.h> -Kleo::ProgressDialog::ProgressDialog( Job * job, const QString & baseText, - QWidget * creator, const char * name, WFlags f ) - : QProgressDialog( creator, name, false, f ), mBaseText( baseText ) +Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, + TQWidget * creator, const char * name, WFlags f ) + : TQProgressDialog( creator, name, false, f ), mBaseText( baseText ) { assert( job ); setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) ); @@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const QString & baseText, setLabelText( baseText ); setProgress( 0, 0 ); // activate busy indicator - connect( job, SIGNAL(progress(const QString&,int,int)), - SLOT(slotProgress(const QString&,int,int)) ); - connect( job, SIGNAL(done()), SLOT(slotDone()) ); - connect( this, SIGNAL(canceled()), - job, SLOT(slotCancel()) ); + connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), + TQT_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); + connect( this, TQT_SIGNAL(canceled()), + job, TQT_SLOT(slotCancel()) ); - QTimer::singleShot( minimumDuration(), this, SLOT(forceShow()) ); + TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) ); } Kleo::ProgressDialog::~ProgressDialog() { @@ -71,11 +71,11 @@ Kleo::ProgressDialog::~ProgressDialog() { void Kleo::ProgressDialog::setMinimumDuration( int ms ) { if ( 0 < ms && ms < minimumDuration() ) - QTimer::singleShot( ms, this, SLOT(forceShow()) ); - QProgressDialog::setMinimumDuration( ms ); + TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) ); + TQProgressDialog::setMinimumDuration( ms ); } -void Kleo::ProgressDialog::slotProgress( const QString & what, int current, int total ) { +void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int total ) { kdDebug(5150) << "Kleo::ProgressDialog::slotProgress( \"" << what << "\", " << current << ", " << total << " )" << endl; if ( mBaseText.isEmpty() ) diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index 0b419aab..64f53f37 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -33,8 +33,8 @@ #ifndef __KLEO_PROGRESSDIALOG_H__ #define __KLEO_PROGRESSDIALOG_H__ -#include <qprogressdialog.h> -#include <qstring.h> +#include <tqprogressdialog.h> +#include <tqstring.h> #include <kdepimmacros.h> namespace Kleo { @@ -43,11 +43,11 @@ namespace Kleo { /** @short A progress dialog for Kleo::Jobs */ - class KDE_EXPORT ProgressDialog : public QProgressDialog { + class KDE_EXPORT ProgressDialog : public TQProgressDialog { Q_OBJECT public: - ProgressDialog( Job * job, const QString & baseText, - QWidget * creator=0, const char * name=0, WFlags f=0 ); + ProgressDialog( Job * job, const TQString & baseText, + TQWidget * creator=0, const char * name=0, WFlags f=0 ); ~ProgressDialog(); public slots: @@ -55,10 +55,10 @@ namespace Kleo { void setMinimumDuration( int ms ); private slots: - void slotProgress( const QString & what, int current, int total ); + void slotProgress( const TQString & what, int current, int total ); void slotDone(); private: - QString mBaseText; + TQString mBaseText; }; } |