From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- certmanager/certmanager.cpp | 56 +++++++++++++------------- certmanager/certmanager.h | 28 ++++++------- certmanager/conf/appearanceconfigwidget.cpp | 4 +- certmanager/customactions.cpp | 36 ++++++++--------- certmanager/customactions.h | 12 +++--- certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 10 ++--- certmanager/kwatchgnupg/kwatchgnupgmainwin.h | 2 +- certmanager/lib/ui/backendconfigwidget.cpp | 6 +-- certmanager/lib/ui/cryptoconfigdialog.cpp | 2 +- certmanager/lib/ui/keylistview.cpp | 18 ++++----- certmanager/lib/ui/keylistview.h | 4 +- 11 files changed, 89 insertions(+), 89 deletions(-) (limited to 'certmanager') diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 57ea1432..170f6426 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -162,7 +162,7 @@ namespace { CertManager::CertManager( bool remote, const TQString& query, const TQString & import, TQWidget* parent, const char* name, WFlags f ) - : KMainWindow( parent, name, f|WDestructiveClose ), + : TDEMainWindow( parent, name, f|WDestructiveClose ), mCrlView( 0 ), mDirmngrProc( 0 ), mHierarchyAnalyser( 0 ), @@ -250,104 +250,104 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { void CertManager::createActions() { - KAction * action = 0; + TDEAction * action = 0; (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); // work around the fact that the stdaction has no shortcut - KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); + TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); action->setShortcut( reloadShortcut ); connectEnableOperationSignal( TQT_TQOBJECT(this), action ); - action = new KAction( i18n("Stop Operation"), "stop", Key_Escape, + action = new TDEAction( i18n("Stop Operation"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()), actionCollection(), "view_stop_operations" ); action->setEnabled( false ); - (void) new KAction( i18n("New Key Pair..."), "filenew", 0, + (void) new TDEAction( i18n("New Key Pair..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); - connect( new KToggleAction( i18n("Hierarchical Key List"), 0, + connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, actionCollection(), "view_hierarchical" ), TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); - action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period, + action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); - action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma, + action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); - (void) new KAction( i18n("Refresh CRLs"), 0, 0, + (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY - mRevokeCertificateAction = new KAction( i18n("Revoke"), 0, + mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); - mExtendCertificateAction = new KAction( i18n("Extend"), 0, + mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), actionCollection(), "edit_extend_certificate" ); connectEnableOperationSignal( this, mExtendCertificateAction ); #endif - mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete, + mDeleteCertificateAction = new TDEAction( i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); - mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5, + mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction ); - mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0, + mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction ); - mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0, + mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction ); - mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0, + mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); - mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0, + mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction ); - mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0, + mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); - mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0, + mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), "download_certificate" ); const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" ); mDirMngrFound = !dirmngr.isEmpty(); - action = new KAction( i18n("Dump CRL Cache..."), 0, + action = new TDEAction( i18n("Dump CRL Cache..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()), actionCollection(), "crl_dump_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new KAction( i18n("Clear CRL Cache..."), 0, + action = new TDEAction( i18n("Clear CRL Cache..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()), actionCollection(), "crl_clear_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); @@ -363,13 +363,13 @@ void CertManager::createActions() { mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ), "location_combo_action", mNextFindRemote? 1 : 0 ); - mFindAction = new KAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), + mFindAction = new TDEAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), actionCollection(), "find" ); KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() ); KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); - new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), + new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -423,12 +423,12 @@ void CertManager::slotToggleHierarchicalView( bool hier ) { mHierarchicalView = hier; mKeyListView->setHierarchical( hier ); mKeyListView->setRootIsDecorated( hier ); - if ( KAction * act = action("view_expandall") ) + if ( TDEAction * act = action("view_expandall") ) act->setEnabled( hier ); - if ( KAction * act = action("view_collapseall" ) ) + if ( TDEAction * act = action("view_collapseall" ) ) act->setEnabled( hier ); - if ( KToggleAction * act = - static_cast( action("view_hierarchical") ) ) + if ( TDEToggleAction * act = + static_cast( action("view_hierarchical") ) ) act->setChecked( hier ); if ( hier && !mCurrentQuery.isEmpty() ) diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 2ecc5e9d..5ed440bd 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -55,8 +55,8 @@ namespace TDEIO { class Job; } class TDEProcess; -class KToolBar; -class KAction; +class TDEToolBar; +class TDEAction; class CRLView; class HierarchyAnalyser; @@ -76,7 +76,7 @@ namespace GpgME { class Key; } -class KDE_EXPORT CertManager : public KMainWindow { +class KDE_EXPORT CertManager : public TDEMainWindow { Q_OBJECT public: @@ -192,19 +192,19 @@ private: LineEditAction * mLineEditAction; ComboAction * mComboAction; - KAction * mFindAction; - KAction * mImportCertFromFileAction; - KAction * mImportCRLFromFileAction; - KAction * mExportCertificateAction; - KAction * mViewCertDetailsAction; - KAction * mDeleteCertificateAction; + TDEAction * mFindAction; + TDEAction * mImportCertFromFileAction; + TDEAction * mImportCRLFromFileAction; + TDEAction * mExportCertificateAction; + TDEAction * mViewCertDetailsAction; + TDEAction * mDeleteCertificateAction; #ifdef NOT_IMPLEMENTED_ANYWAY - KAction * mRevokeCertificateAction; - KAction * mExtendCertificateAction; + TDEAction * mRevokeCertificateAction; + TDEAction * mExtendCertificateAction; #endif - KAction * mExportSecretKeyAction; - KAction * mDownloadCertificateAction; - KAction * mValidateCertificateAction; + TDEAction * mExportSecretKeyAction; + TDEAction * mDownloadCertificateAction; + TDEAction * mValidateCertificateAction; TQString mImportCRLTempFile; TQString mCurrentQuery; diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 3c2c7c04..432f2ce9 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -305,8 +305,8 @@ void AppearanceConfigWidget::slotFontClicked() { if( !item ) return; TQFont font = item->font(); - int result = KFontDialog::getFont( font ); - if ( result == KFontDialog::Accepted ) { + int result = TDEFontDialog::getFont( font ); + if ( result == TDEFontDialog::Accepted ) { item->setFont( font ); item->repaint(); emit changed(); diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index 1e08876d..268b85ee 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -39,18 +39,18 @@ #include -LabelAction::LabelAction( const TQString & text, KActionCollection * parent, +LabelAction::LabelAction( const TQString & text, TDEActionCollection * parent, const char* name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ) + : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name ) { } int LabelAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar * bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar * bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); TQLabel* label = new TQLabel( text(), bar, "kde toolbar widget" ); bar->insertWidget( id_, label->width(), label, index ); @@ -59,22 +59,22 @@ int LabelAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } -LineEditAction::LineEditAction( const TQString & text, KActionCollection * parent, +LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ), + : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name ), _le(0), _receiver(receiver), _member(member) { } int LineEditAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); // The toolbar trick doesn't seem to work for lineedits //_le = new TQLineEdit( bar, "kde toolbar widget" ); @@ -87,7 +87,7 @@ int LineEditAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } void LineEditAction::clear() { @@ -108,20 +108,20 @@ void LineEditAction::setText( const TQString & txt ) { } -ComboAction::ComboAction( const TQStringList & lst, KActionCollection * parent, +ComboAction::ComboAction( const TQStringList & lst, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ) - : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, parent, name ), + : TDEAction( TQString(), TQIconSet(), TDEShortcut(), 0, 0, parent, name ), _lst(lst), _receiver(receiver), _member(member), _selectedId( selectedID ) { } int ComboAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member ); bar->setCurrentComboItem( id_,_selectedId ); @@ -130,7 +130,7 @@ int ComboAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } #include "customactions.moc" diff --git a/certmanager/customactions.h b/certmanager/customactions.h index 7d8626d6..c07157bd 100644 --- a/certmanager/customactions.h +++ b/certmanager/customactions.h @@ -39,21 +39,21 @@ class TQLineEdit; -class LabelAction : public KAction { +class LabelAction : public TDEAction { Q_OBJECT public: - LabelAction( const TQString & text, KActionCollection * parent, + LabelAction( const TQString & text, TDEActionCollection * parent, const char* name ); int plug( TQWidget * widget, int index=-1 ); }; -class LineEditAction : public KAction { +class LineEditAction : public TDEAction { Q_OBJECT public: - LineEditAction( const TQString & text, KActionCollection * parent, + LineEditAction( const TQString & text, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name ); int plug( TQWidget * widget, int index=-1 ); @@ -67,11 +67,11 @@ private: const char * _member; }; -class ComboAction : public KAction { +class ComboAction : public TDEAction { Q_OBJECT public: - ComboAction( const TQStringList & lst, KActionCollection * parent, + ComboAction( const TQStringList & lst, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 6dbca982..72949254 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -59,7 +59,7 @@ #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket") KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name ) - : KMainWindow( parent, name, WType_TopLevel ), mConfig(0) + : TDEMainWindow( parent, name, WType_TopLevel ), mConfig(0) { createActions(); createGUI(); @@ -95,7 +95,7 @@ void KWatchGnuPGMainWindow::slotClear() void KWatchGnuPGMainWindow::createActions() { - (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, + (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotClear() ), actionCollection(), "clear_log" ); (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() ); @@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions() (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 - (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), + (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), 0, this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -224,7 +224,7 @@ void KWatchGnuPGMainWindow::slotAckRead() { void KWatchGnuPGMainWindow::show() { mSysTray->setAttention(false); - KMainWindow::show(); + TDEMainWindow::show(); } void KWatchGnuPGMainWindow::slotSaveAs() @@ -286,7 +286,7 @@ bool KWatchGnuPGMainWindow::queryClose() hide(); return false; } - return KMainWindow::queryClose(); + return TDEMainWindow::queryClose(); } #include "kwatchgnupgmainwin.moc" diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index 01a5f123..9b6b4cd5 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -40,7 +40,7 @@ class KWatchGnuPGConfig; class KProcIO; class TQTextEdit; -class KWatchGnuPGMainWindow : public KMainWindow { +class KWatchGnuPGMainWindow : public TDEMainWindow { Q_OBJECT public: diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 47ca25d4..d2312c72 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -73,11 +73,11 @@ namespace Kleo { class ProtocolCheckListItem; } -class Kleo::BackendListView : public KListView +class Kleo::BackendListView : public TDEListView { public: BackendListView( BackendConfigWidget* parent, const char* name = 0 ) - : KListView( parent, name ) {} + : TDEListView( parent, name ) {} /// return backend for currently selected (/current) item. Used by Configure button. const Kleo::CryptoBackend* currentBackend() const; @@ -95,7 +95,7 @@ public: class Kleo::BackendListViewItem : public TQListViewItem { public: - BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) + BackendListViewItem( TDEListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) : TQListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend ) {} diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 65edb93e..d6dc823e 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -54,7 +54,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg } // Automatically assign accelerators - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } void Kleo::CryptoConfigDialog::slotOk() diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 100334f2..8e81b976 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -129,14 +129,14 @@ static const struct { 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&)) }, + { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) - : KListView( parent, name ), + : TDEListView( parent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), mHierarchical( false ) @@ -187,7 +187,7 @@ Kleo::KeyListView::~KeyListView() { void Kleo::KeyListView::insertItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::insertItem( " << qlvi << " )" << endl; - KListView::insertItem( qlvi ); + TDEListView::insertItem( qlvi ); if ( KeyListViewItem * item = lvi_cast( qlvi ) ) registerItem( item ); } @@ -196,7 +196,7 @@ void Kleo::KeyListView::takeItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::takeItem( " << qlvi << " )" << endl; if ( KeyListViewItem * item = lvi_cast( qlvi ) ) deregisterItem( item ); - KListView::takeItem( qlvi ); + TDEListView::takeItem( qlvi ); } @@ -244,7 +244,7 @@ void Kleo::KeyListView::slotUpdateTimeout() { void Kleo::KeyListView::clear() { d->updateTimer->stop(); d->keyBuffer.clear(); - KListView::clear(); + TDEListView::clear(); } void Kleo::KeyListView::registerItem( KeyListViewItem * item ) { @@ -359,7 +359,7 @@ void Kleo::KeyListView::slotEmitSelectionChanged( TQListViewItem * item ) { emit selectionChanged( static_cast( item ) ); } -void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, const TQPoint & p ) { +void Kleo::KeyListView::slotEmitContextMenu( TDEListView*, TQListViewItem * item, const TQPoint & p ) { if ( !item || lvi_cast( item ) ) emit contextMenu( static_cast( item ), p ); } @@ -833,11 +833,11 @@ Kleo::KeyListViewItem * Kleo::KeyListViewItem::nextSibling() const { } Kleo::KeyListViewItem * Kleo::KeyListView::firstChild() const { - return static_cast( KListView::firstChild() ); + return static_cast( TDEListView::firstChild() ); } Kleo::KeyListViewItem * Kleo::KeyListView::selectedItem() const { - return static_cast( KListView::selectedItem() ); + return static_cast( TDEListView::selectedItem() ); } static void selectedItems( TQPtrList & result, TQListViewItem * start ) { diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 5c711a77..2f383cc5 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -198,7 +198,7 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public KListView { + class KDE_EXPORT KeyListView : public TDEListView { Q_OBJECT friend class KeyListViewItem; @@ -287,7 +287,7 @@ namespace Kleo { void slotEmitDoubleClicked( TQListViewItem*, const TQPoint&, int ); void slotEmitReturnPressed( TQListViewItem* ); void slotEmitSelectionChanged( TQListViewItem* ); - void slotEmitContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotEmitContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotUpdateTimeout(); public: -- cgit v1.2.3