summaryrefslogtreecommitdiffstats
path: root/certmanager
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager')
-rw-r--r--certmanager/certificateinfowidgetimpl.cpp6
-rw-r--r--certmanager/certificatewizardimpl.cpp8
-rw-r--r--certmanager/certmanager.cpp4
-rw-r--r--certmanager/conf/configuredialog.cpp2
-rw-r--r--certmanager/customactions.cpp6
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp4
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp18
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.h4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmebackend.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp20
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmejob.cpp2
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp4
-rw-r--r--certmanager/lib/kleo/dn.cpp4
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp4
16 files changed, 48 insertions, 48 deletions
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 9ff6b15a5..f0d738a5e 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -51,7 +51,7 @@
#include <kdialogbase.h>
#include <tdemessagebox.h>
#include <kdebug.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdeglobalsettings.h>
// TQt
@@ -274,12 +274,12 @@ void CertificateInfoWidgetImpl::startCertificateDump() {
void CertificateInfoWidgetImpl::slotCollectStdout(TDEProcess *, char *buffer, int buflen)
{
- mDumpOutput += TQCString(buffer, buflen+1); // like KProcIO does
+ mDumpOutput += TQCString(buffer, buflen+1); // like TDEProcIO does
}
void CertificateInfoWidgetImpl::slotCollectStderr(TDEProcess *, char *buffer, int buflen)
{
- mDumpError += TQCString(buffer, buflen+1); // like KProcIO does
+ mDumpError += TQCString(buffer, buflen+1); // like TDEProcIO does
}
void CertificateInfoWidgetImpl::slotDumpProcessExited(TDEProcess* proc) {
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index ae14bf36d..7e7c18b00 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -290,7 +290,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
void CertificateWizardImpl::slotHelpClicked()
{
- kapp->invokeHelp( "newcert" );
+ tdeApp->invokeHelp( "newcert" );
}
void CertificateWizardImpl::slotSetValuesFromWhoAmI()
@@ -441,16 +441,16 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
TQCString dummy;
// OK, so kmail (or kontact) is running. Now ensure the object we want is available.
// [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
- if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+ if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
DCOPReply reply = ref.call( "load()" );
if ( reply.isValid() && (bool)reply ) {
- Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+ Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
} else
kdWarning() << "Error loading " << dcopService << endl;
}
- DCOPClient* dcopClient = kapp->dcopClient();
+ DCOPClient* dcopClient = tdeApp->dcopClient();
TQByteArray data;
TQDataStream arg( data, IO_WriteOnly );
arg << email;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 74b845578..f74673912 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -80,7 +80,7 @@
#include <dcopclient.h>
#include <tdetoolbar.h>
#include <kstatusbar.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kkeydialog.h>
@@ -405,7 +405,7 @@ void CertManager::slotConfigureGpgME() {
if ( result == TQDialog::Accepted )
{
// Tell other apps (e.g. kmail) that the gpgconf data might have changed
- kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
+ tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
}
}
}
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 4d0d1e682..cf6923f01 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -41,7 +41,7 @@
ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )
{
- KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+ KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
showButton( User1, true );
addModule( "kleopatra_config_dirserv", false );
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index 9c88491e6..2db64ebb9 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -47,7 +47,7 @@ LabelAction::LabelAction( const TQString & text, TDEActionCollection * parent,
}
int LabelAction::plug( TQWidget * widget, int index ) {
- if ( kapp && !kapp->authorizeTDEAction( name() ) )
+ if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
return -1;
if ( widget->inherits( "TDEToolBar" ) ) {
TDEToolBar * bar = (TDEToolBar *)widget;
@@ -71,7 +71,7 @@ LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * par
}
int LineEditAction::plug( TQWidget * widget, int index ) {
- if ( kapp && !kapp->authorizeTDEAction( name() ) )
+ if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
return -1;
if ( widget->inherits( "TDEToolBar" ) ) {
TDEToolBar *bar = (TDEToolBar *)widget;
@@ -118,7 +118,7 @@ ComboAction::ComboAction( const TQStringList & lst, TDEActionCollection * paren
}
int ComboAction::plug( TQWidget * widget, int index ) {
- if ( kapp && !kapp->authorizeTDEAction( name() ) )
+ if ( tdeApp && !tdeApp->authorizeTDEAction( name() ) )
return -1;
if ( widget->inherits( "TDEToolBar" ) ) {
TDEToolBar *bar = (TDEToolBar *)widget;
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 25b7dc065..f92960bbe 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -157,7 +157,7 @@ void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() {
void KWatchGnuPGConfig::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
mExeED->setURL( config->readEntry( "Executable", "watchgnupg" ) );
mSocketED->setURL( config->readEntry( "Socket", TQDir::home().canonicalPath()
@@ -175,7 +175,7 @@ void KWatchGnuPGConfig::loadConfig()
void KWatchGnuPGConfig::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
config->writeEntry( "Executable", mExeED->url() );
config->writeEntry( "Socket", mSocketED->url() );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index ef189a6e2..647056ab6 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -43,7 +43,7 @@
#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <kedittoolbar.h>
@@ -68,10 +68,10 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name
mCentralWidget->setTextFormat( TQTextEdit::LogText );
setCentralWidget( mCentralWidget );
- mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
+ mWatcher = new TDEProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) );
connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
this, TQ_SLOT( slotWatcherExited() ) );
- connect( mWatcher, TQ_SIGNAL( readReady(KProcIO*) ),
+ connect( mWatcher, TQ_SIGNAL( readReady(TDEProcIO*) ),
this, TQ_SLOT( slotReadStdout() ) );
slotReadConfig();
@@ -132,13 +132,13 @@ void KWatchGnuPGMainWindow::startWatcher()
if( mWatcher->isRunning() ) {
mWatcher->kill();
while( mWatcher->isRunning() ) {
- kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+ tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
mCentralWidget->append(i18n("[%1] Log stopped")
.arg( TQDateTime::currentDateTime().toString(TQt::ISODate)));
}
mWatcher->clearArguments();
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
*mWatcher << config->readEntry("Executable", WATCHGNUPGBINARY);
*mWatcher << "--force";
@@ -162,7 +162,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
if ( !cconfig )
return;
//Q_ASSERT( cconfig );
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("WatchGnuPG");
TQStringList comps = cconfig->componentList();
for( TQStringList::const_iterator it = comps.begin(); it != comps.end(); ++it ) {
@@ -254,7 +254,7 @@ void KWatchGnuPGMainWindow::slotQuit()
disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ),
this, TQ_SLOT( slotWatcherExited() ) );
mWatcher->kill();
- kapp->quit();
+ tdeApp->quit();
}
void KWatchGnuPGMainWindow::slotConfigure()
@@ -270,7 +270,7 @@ void KWatchGnuPGMainWindow::slotConfigure()
void KWatchGnuPGMainWindow::slotReadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("LogWindow");
mCentralWidget->setWordWrap( config->readBoolEntry("WordWrap", false)
?TQTextEdit::WidgetWidth
@@ -282,7 +282,7 @@ void KWatchGnuPGMainWindow::slotReadConfig()
bool KWatchGnuPGMainWindow::queryClose()
{
- if ( !kapp->sessionSaving() ) {
+ if ( !tdeApp->sessionSaving() ) {
hide();
return false;
}
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index 6d08fe055..da0a15867 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -37,7 +37,7 @@
class KWatchGnuPGTray;
class KWatchGnuPGConfig;
-class KProcIO;
+class TDEProcIO;
class TQTextEdit;
class KWatchGnuPGMainWindow : public TDEMainWindow {
@@ -68,7 +68,7 @@ private:
void startWatcher();
void setGnuPGConfig();
- KProcIO* mWatcher;
+ TDEProcIO* mWatcher;
TQTextEdit* mCentralWidget;
KWatchGnuPGTray* mSysTray;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index ee4128bfd..86439bb99 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -43,7 +43,7 @@
#include <gpgmepp/engineinfo.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqfile.h>
#include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 2b81c6b1a..c77dcb208 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -32,7 +32,7 @@
#include "qgpgmecryptoconfig.h"
#include <kdebug.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <errno.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
@@ -71,12 +71,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
{
// Run gpgconf --list-components to make the list of components
- KProcIO proc( TQTextCodec::codecForName( "utf8" ) );
+ TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) );
proc << "gpgconf"; // must be in the PATH
proc << "--list-components";
- TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
- this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ),
+ this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) );
// run the process:
int rc = 0;
@@ -100,7 +100,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
mParsed = true;
}
-void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc )
+void QGpgMECryptoConfig::slotCollectStdOut( TDEProcIO* proc )
{
TQString line;
int result;
@@ -166,15 +166,15 @@ void QGpgMECryptoConfigComponent::runGpgConf()
{
// Run gpgconf --list-options <component>, and create all groups and entries for that component
- KProcIO proc( TQTextCodec::codecForName( "utf8" ) );
+ TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) );
proc << "gpgconf"; // must be in the PATH
proc << "--list-options";
proc << mName;
//kdDebug(5150) << "Running gpgconf --list-options " << mName << endl;
- TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ),
- this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ),
+ this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) );
mCurrentGroup = 0;
// run the process:
@@ -192,7 +192,7 @@ void QGpgMECryptoConfigComponent::runGpgConf()
}
}
-void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc )
+void QGpgMECryptoConfigComponent::slotCollectStdOut( TDEProcIO* proc )
{
TQString line;
int result;
@@ -265,7 +265,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
line += ":16:";
}
line += '\n';
- TQCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading.
+ TQCString line8bit = line.utf8(); // encode with utf8, and TDEProcIO uses utf8 when reading.
tmpFile.file()->writeBlock( line8bit.data(), line8bit.size()-1 /*no 0*/ );
dirtyEntries.append( it.current() );
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index 710fa1686..5fbc9f639 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -38,7 +38,7 @@
#include <tqstringlist.h>
#include <tqobject.h>
#include <tqvariant.h>
-class KProcIO;
+class TDEProcIO;
class QGpgMECryptoConfigComponent;
class QGpgMECryptoConfigEntry;
@@ -65,7 +65,7 @@ public:
virtual void sync( bool runtime );
private slots:
- void slotCollectStdOut( KProcIO* proc );
+ void slotCollectStdOut( TDEProcIO* proc );
private:
/// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found
void runGpgConf( bool showErrors );
@@ -95,7 +95,7 @@ public:
void sync( bool runtime );
private slots:
- void slotCollectStdOut( KProcIO* proc );
+ void slotCollectStdOut( TDEProcIO* proc );
private:
void runGpgConf();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 71fe0b57c..8c378536f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -47,7 +47,7 @@
#include <gpgmepp/data.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 5bd5675b3..f1246f39c 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -569,7 +569,7 @@ bool CryptPlugWrapper::checkMessageSignature( char** cleartext,
int signatureLen,
CryptPlug::SignatureMetaData* sigmeta )
{
- DNBeautifier dnBeautifier( kapp->config(),
+ DNBeautifier dnBeautifier( tdeApp->config(),
"DN",
"AttributeOrder",
"UnknownAttributes" );
@@ -607,7 +607,7 @@ bool CryptPlugWrapper::decryptAndCheckMessage(
int* errId,
char** errTxt )
{
- DNBeautifier dnBeautifier( kapp->config(),
+ DNBeautifier dnBeautifier( tdeApp->config(),
"DN",
"AttributeOrder",
"UnknownAttributes" );
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index d4ed13018..d6db7d183 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private()
Kleo::DNAttributeMapper::DNAttributeMapper() {
d = new Private();
- const TDEConfigGroup config( kapp->config(), "DN" );
+ const TDEConfigGroup config( tdeApp->config(), "DN" );
d->attributeOrder = config.readListEntry( "AttributeOrder" );
if ( d->attributeOrder.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
@@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) {
if ( order.empty() )
std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder,
std::back_inserter( d->attributeOrder ) );
- TDEConfigGroup config( kapp->config(), "DN" );
+ TDEConfigGroup config( tdeApp->config(), "DN" );
config.writeEntry( "AttributeOrder", order );
}
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 82db7d7aa..43b1c13f5 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -304,7 +304,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() {
int result = dlg.exec();
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()", TQByteArray() );
+ tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() );
// and schedule a rescan, in case the updates make a backend valid
TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) );
}
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 7e652cd8f..78bb441d8 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -449,8 +449,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
slotRereadKeys();
mTopLayout->activate();
- if ( kapp ) {
- KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
+ if ( tdeApp ) {
+ KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() );
TQSize dialogSize( 500, 400 );
TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" );
generated by cgit v1.2.1 (git 2.18.0) at 2025-03-11 03:02:44 +0000