[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/crypto
From:       Guy Maurel <guy-kde () maurel ! de>
Date:       2009-11-29 18:04:59
Message-ID: 1259517899.752981.8779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056248 by guymaurel:

complete with some more parentheses

 M  +4 -4      signencryptfilescontroller.cpp  


--- trunk/KDE/kdepim/kleopatra/crypto/signencryptfilescontroller.cpp #1056247:1056248
@@ -205,7 +205,7 @@
 void SignEncryptFilesController::setOperationMode( unsigned int mode ) {
     Private::assertValidOperation( mode );
     if ( contains_dir( d->files ) )
-        mode = mode & ~ArchiveMask | ArchiveForced ;
+        ( mode = mode & ~ArchiveMask ) | ArchiveForced ;
     d->operation = mode;
     d->updateWizardMode();
 }
@@ -266,7 +266,7 @@
     kleo_assert( !files.empty() );
     d->files = files;
     if ( contains_dir( files ) )
-        setOperationMode( operationMode() & ~ArchiveMask | ArchiveForced );
+        setOperationMode( ( operationMode() & ~ArchiveMask ) | ArchiveForced );
     d->ensureWizardCreated();
     d->wizard->setFiles( files );
 }
@@ -376,11 +376,11 @@
 
     const bool shallPgpSign = sign && !pgpSigners.empty();
     const bool shallPgpEncrypt = encrypt && !pgpRecipients.empty();
-    const bool pgp = shallPgpEncrypt && ( !sign || shallPgpSign ) || !encrypt && shallPgpSign;
+    const bool pgp = ( shallPgpEncrypt && ( !sign || shallPgpSign )) || ( !encrypt && shallPgpSign );
 
     const bool shallCmsSign = sign && !cmsSigners.empty();
     const bool shallCmsEncrypt = encrypt && !cmsRecipients.empty();
-    const bool cms = shallCmsEncrypt && ( !sign || shallCmsSign ) || !encrypt && shallCmsSign;
+    const bool cms = ( shallCmsEncrypt && ( !sign || shallCmsSign )) || ( !encrypt && shallCmsSign );
 
     result.reserve( pgp + cms );
 
[prev in list] [next in list] [prev in thread] [next in thread]