From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- certmanager/certificatewizardimpl.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'certmanager/certificatewizardimpl.cpp') diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 789f24b06..364c5cd05 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -129,7 +129,7 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ), this, TQT_SLOT( slotURLSelected( const TQString& ) ) ); - const KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); + const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); caEmailED->setText( config.readEntry( "CAEmailAddress" ) ); connect( this, TQT_SIGNAL( helpClicked() ), @@ -337,7 +337,7 @@ void CertificateWizardImpl::createPersonalDataPage() TQGridLayout* grid = new TQGridLayout( edContainer, 2, 1, KDialog::marginHint(), KDialog::spacingHint() ); - KConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); + TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); TQStringList attrOrder = config.readListEntry( "DNAttributeOrder" ); if ( attrOrder.empty() ) attrOrder << "CN!" << "L" << "OU" << "O!" << "C!" << "EMAIL!"; @@ -477,7 +477,7 @@ void CertificateWizardImpl::accept() // Save in file/URL KURL url = saveFileUrl(); bool overwrite = false; - if ( KIO::NetAccess::exists( url, false /*dest*/, this ) ) { + if ( TDEIO::NetAccess::exists( url, false /*dest*/, this ) ) { if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " @@ -488,10 +488,10 @@ void CertificateWizardImpl::accept() overwrite = true; } - KIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ ); + TDEIO::Job* uploadJob = KIOext::put( _keyData, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( KIO::Job* ) ) ); + connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); // Can't press finish again during the upload setFinishEnabled( finishPage, false ); } @@ -501,7 +501,7 @@ void CertificateWizardImpl::accept() This slot is invoked by the KIO job used in newCertificate to save/upload the certificate, when finished (success or error). */ -void CertificateWizardImpl::slotUploadResult( KIO::Job* job ) +void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job ) { if ( job->error() ) { job->showErrorDialog(); -- cgit v1.2.1