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 d88d80b3f..640f2e967 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;