diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-21 13:17:48 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 04:25:16 +0200 |
commit | c34a46b466d8b30bc5490c64a5c77f5bf6f0b6c4 (patch) | |
tree | 1b245a0731c22ee39e8da4b1fe4d5795281fc99c /certmanager/lib | |
parent | 6d45b35a4abcf3cab08b6d99e3cde8ad8da820f8 (diff) | |
download | tdepim-c34a46b466d8b30bc5490c64a5c77f5bf6f0b6c4.tar.gz tdepim-c34a46b466d8b30bc5490c64a5c77f5bf6f0b6c4.zip |
Fix a number of build warnings
(cherry picked from commit 292e3c830032a4634f04c3095d6bfa272b65d712)
Diffstat (limited to 'certmanager/lib')
4 files changed, 18 insertions, 10 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index d083947e9..053a8b924 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -661,13 +661,17 @@ void QGpgMECryptoConfigEntry::resetToDefault() { mSet = false; mDirty = true; - if ( mFlags & GPGCONF_FLAG_DEFAULT ) + if ( mFlags & GPGCONF_FLAG_DEFAULT ) { mValue = mDefaultValue; - else if ( mArgType == ArgType_None ) - if ( isList() ) + } + else if ( mArgType == ArgType_None ) { + if ( isList() ) { mValue = 0U; - else + } + else { mValue = false; + } + } } void QGpgMECryptoConfigEntry::setBoolValue( bool b ) diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index a17aca9e0..16846b59b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -190,11 +190,14 @@ void Kleo::QGpgMERefreshKeysJob::slotProcessExited( KProcess * proc ) { if ( proc != mProcess ) return; - if ( !mError && !mPatternsToDo.empty() ) - if ( const GpgME::Error err = startAProcess() ) + if ( !mError && !mPatternsToDo.empty() ) { + if ( const GpgME::Error err = startAProcess() ) { mError = err; - else + } + else { return; + } + } emit done(); if ( !mError && diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index d5fa009db..1392afd5e 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -115,8 +115,8 @@ void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { } void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { - if ( mResult.first.error() && !mResult.first.error().isCanceled() || - mResult.second.error() && !mResult.second.error().isCanceled() ) + if ( (mResult.first.error() && !mResult.first.error().isCanceled()) || + (mResult.second.error() && !mResult.second.error().isCanceled()) ) Kleo::MessageBox::error( parent, mResult.first, mResult.second, this, caption ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index af80e9ece..edb7ef201 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -86,13 +86,14 @@ static bool checkKeyUsage( const GpgME::Key & key, unsigned int keyUsage ) { if ( keyUsage & Kleo::KeySelectionDialog::ValidKeys ) { - if ( key.isInvalid() ) + if ( key.isInvalid() ) { if ( key.keyListMode() & GpgME::Context::Validate ) { kdDebug() << "key is invalid" << endl; return false; } else { kdDebug() << "key is invalid - ignoring" << endl; } + } if ( key.isExpired() ) { kdDebug() << "key is expired" << endl; return false; |