From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:49:30 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 certmanager/certmanager.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'certmanager/certmanager.cpp')

diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 2fd144d4c..66f53fe19 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -930,10 +930,10 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
   assert( processname );
   assert( mDirmngrProc );
   mErrorbuffer = TQString();
-  connect( mDirmngrProc, TQT_SIGNAL(processExited(KProcess*)), slot );
-  connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int) ),
-           this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
-  if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
+  connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot );
+  connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ),
+           this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
+  if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) {
     delete mDirmngrProc; mDirmngrProc = 0;
     KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
     return false;
@@ -945,7 +945,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile )
 {
   assert( !mDirmngrProc );
   mImportCRLTempFile = isTempFile ? filename : TQString();
-  mDirmngrProc = new KProcess();
+  mDirmngrProc = new TDEProcess();
   *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename;
   if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) {
     updateImportActions( true );
@@ -956,13 +956,13 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile )
 
 void CertManager::startClearCRLs() {
   assert( !mDirmngrProc );
-  mDirmngrProc = new KProcess();
+  mDirmngrProc = new TDEProcess();
   *mDirmngrProc << "dirmngr" << "--flush";
   //*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented!
   connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" );
 }
 
-void CertManager::slotStderr( KProcess*, char* buf, int len ) {
+void CertManager::slotStderr( TDEProcess*, char* buf, int len ) {
   mErrorbuffer += TQString::fromLocal8Bit( buf, len );
 }
 
@@ -1423,10 +1423,10 @@ void CertManager::importNextURLOrRedisplay()
 
 void CertManager::slotStartWatchGnuPG()
 {
-  KProcess certManagerProc;
+  TDEProcess certManagerProc;
   certManagerProc << "kwatchgnupg";
 
-  if( !certManagerProc.start( KProcess::DontCare ) )
+  if( !certManagerProc.start( TDEProcess::DontCare ) )
     KMessageBox::error( this, i18n( "Could not start GnuPG LogViewer (kwatchgnupg). "
                                     "Please check your installation!" ),
                                     i18n( "Kleopatra Error" ) );
-- 
cgit v1.2.1