From kde-commits  Thu Oct 31 23:24:20 2013
From: Sergio Martins <iamsergio () gmail ! com>
Date: Thu, 31 Oct 2013 23:24:20 +0000
To: kde-commits
Subject: [kdepimlibs/KDE/4.11] akonadi/calendar: Reduce nesting.
Message-Id: <E1Vc1bA-000581-19 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138326187608749

Git commit 926f28341eeb7a10f61e9248431cd04c30c3cac6 by Sergio Martins.
Committed on 31/10/2013 at 23:23.
Pushed by smartins into branch 'KDE/4.11'.

Reduce nesting.

M  +22   -16   akonadi/calendar/incidencechanger.cpp

http://commits.kde.org/kdepimlibs/926f28341eeb7a10f61e9248431cd04c30c3cac6

diff --git a/akonadi/calendar/incidencechanger.cpp b/akonadi/calendar/incid=
encechanger.cpp
index d65a60a..5233548 100644
--- a/akonadi/calendar/incidencechanger.cpp
+++ b/akonadi/calendar/incidencechanger.cpp
@@ -479,23 +479,29 @@ bool IncidenceChanger::Private::handleInvitationsBefo=
reChange( const Change::Ptr
       break;
       case IncidenceChanger::ChangeTypeModify:
       {
-        if ( !change->originalItems.isEmpty() ) {
-          Q_ASSERT( change->originalItems.count() =3D=3D 1 );
-          Incidence::Ptr oldIncidence =3D change->originalItems.first().pa=
yload<KCalCore::Incidence::Ptr>();
-          Incidence::Ptr newIncidence =3D change->newItem.payload<KCalCore=
::Incidence::Ptr>();
-
-          if ( oldIncidence->supportsGroupwareCommunication() ) {
-            const bool modify =3D handler.handleIncidenceAboutToBeModified=
( newIncidence );
-            if ( !modify ) {
-              if ( newIncidence->type() =3D=3D oldIncidence->type() ) {
-                IncidenceBase *i1 =3D newIncidence.data();
-                IncidenceBase *i2 =3D oldIncidence.data();
-                *i1 =3D *i2;
-              }
-              result =3D false;
-            }
-          }
+        if ( change->originalItems.isEmpty() ) {
+          break;
+        }
+
+        Q_ASSERT( change->originalItems.count() =3D=3D 1 );
+        Incidence::Ptr oldIncidence =3D change->originalItems.first().payl=
oad<KCalCore::Incidence::Ptr>();
+        Incidence::Ptr newIncidence =3D change->newItem.payload<KCalCore::=
Incidence::Ptr>();
+
+        if ( !oldIncidence->supportsGroupwareCommunication() ) {
+          break;
+        }
+
+        const bool modify =3D handler.handleIncidenceAboutToBeModified( ne=
wIncidence );
+        if ( modify ) {
+          break;
+        }
+
+        if ( newIncidence->type() =3D=3D oldIncidence->type() ) {
+          IncidenceBase *i1 =3D newIncidence.data();
+          IncidenceBase *i2 =3D oldIncidence.data();
+          *i1 =3D *i2;
         }
+        result =3D false;
       }
       break;
       default: