From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp') diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 053a8b924..191ff4279 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -80,7 +80,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -2 ; @@ -179,7 +179,7 @@ void QGpgMECryptoConfigComponent::runGpgConf() // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ; @@ -280,20 +280,20 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) if ( runtime ) commandLine += " --runtime"; commandLine += " --change-options "; - commandLine += KProcess::quote( mName ); + commandLine += TDEProcess::quote( mName ); commandLine += " < "; - commandLine += KProcess::quote( tmpFile.name() ); + commandLine += TDEProcess::quote( tmpFile.name() ); //kdDebug(5150) << commandLine << endl; //system( TQCString( "cat " ) + tmpFile.name().latin1() ); // DEBUG - KProcess proc; + TDEProcess proc; proc.setUseShell( true ); proc << commandLine; // run the process: int rc = 0; - if ( !proc.start( KProcess::Block ) ) + if ( !proc.start( TDEProcess::Block ) ) rc = -1; else rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ; -- cgit v1.2.1