Behaviour-preserving change in preparation of the fix for kolab/issue3855:

if ( C1 ) { E1 } else if ( C2 ) { E2 } else { E3 }

||
VV

if ( C1 ) { E1 } else { const bool b2 = C2; if ( b2 ) { E2 } else { E3 } }

svn path=/branches/kdepim/enterprise/kdepim/; revision=1022241