diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-19 11:59:01 -0600 |
commit | 716a5de8870d7c02bb4d0aed72f30291b17b763a (patch) | |
tree | 29e58b213ead28151ccf7eb33d12c968ea844120 /certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp | |
parent | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (diff) | |
download | tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.tar.gz tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp')
-rw-r--r-- | certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index 57811c6e5..53142fad8 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -45,11 +45,11 @@ #include <assert.h> struct Kleo::GnuPGProcessBase::Private { - Private() : useStatusFD( false ), statnot( 0 ) { + Private() : usetStatusFD( false ), statnot( 0 ) { statusFD[0] = statusFD[1] = -1; } - bool useStatusFD; + bool usetStatusFD; int statusFD[2]; TQSocketNotifier * statnot; TQCString statusBuffer; @@ -66,13 +66,13 @@ Kleo::GnuPGProcessBase::~GnuPGProcessBase() { delete d; d = 0; } -void Kleo::GnuPGProcessBase::setUseStatusFD( bool use ) { +void Kleo::GnuPGProcessBase::setUsetStatusFD( bool use ) { assert( d ); - d->useStatusFD = use; + d->usetStatusFD = use; } bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { // set up the status-fd. This should be in setupCommunication(), // but then it's too late: we need the fd of the pipe to pass it // as argument to the --status-fd option: @@ -100,7 +100,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) { int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) { if ( int ok = KProcess::setupCommunication( comm ) ) return ok; - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { // base class impl returned error, so close our fd's, too ::close( d->statusFD[0] ); ::close( d->statusFD[1] ); @@ -110,7 +110,7 @@ int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) { } int Kleo::GnuPGProcessBase::commSetupDoneP() { - if ( d->useStatusFD ) { + if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); @@ -119,20 +119,20 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { } int Kleo::GnuPGProcessBase::commSetupDoneC() { - if ( d->useStatusFD ) + if ( d->usetStatusFD ) ::fcntl( d->statusFD[1], F_SETFD, 0 ); return KProcess::commSetupDoneC(); } void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) { if ( !childStatus(fd) ) - closeStatus(); + closetStatus(); } -bool Kleo::GnuPGProcessBase::closeStatus() { - if ( !d->useStatusFD ) +bool Kleo::GnuPGProcessBase::closetStatus() { + if ( !d->usetStatusFD ) return false; - d->useStatusFD = false; + d->usetStatusFD = false; delete d->statnot; d->statnot = 0; ::close( d->statusFD[0] ); d->statusFD[0] = -1; return true; @@ -144,7 +144,7 @@ int Kleo::GnuPGProcessBase::childStatus( int fd ) { if ( len > 0 ) { buf[len] = 0; d->statusBuffer += buf; - parseStatusOutput(); + parsetStatusOutput(); } return len; } @@ -153,7 +153,7 @@ static TQString fromHexEscapedUtf8( const TQCString & str ) { return KURL::decode_string( str.data(), 106 /* utf-8 */ ); } -void Kleo::GnuPGProcessBase::parseStatusOutput() { +void Kleo::GnuPGProcessBase::parsetStatusOutput() { static const char startToken[] = "[GNUPG:] "; static const int startTokenLen = sizeof startToken / sizeof *startToken - 1; |