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

List:       kde-commits
Subject:    [kdepimlibs/KDE/4.11] akonadi/calendar: Reduce nesting.
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2013-10-31 23:24:20
Message-ID: E1Vc1bA-000581-19 () scm ! kde ! org
[Download RAW message or body]

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/incidencechanger.cpp index d65a60a..5233548 100644
--- a/akonadi/calendar/incidencechanger.cpp
+++ b/akonadi/calendar/incidencechanger.cpp
@@ -479,23 +479,29 @@ bool IncidenceChanger::Private::handleInvitationsBeforeChange( \
const Change::Ptr  break;
       case IncidenceChanger::ChangeTypeModify:
       {
-        if ( !change->originalItems.isEmpty() ) {
-          Q_ASSERT( change->originalItems.count() == 1 );
-          Incidence::Ptr oldIncidence = \
                change->originalItems.first().payload<KCalCore::Incidence::Ptr>();
-          Incidence::Ptr newIncidence = \
                change->newItem.payload<KCalCore::Incidence::Ptr>();
-
-          if ( oldIncidence->supportsGroupwareCommunication() ) {
-            const bool modify = handler.handleIncidenceAboutToBeModified( \
                newIncidence );
-            if ( !modify ) {
-              if ( newIncidence->type() == oldIncidence->type() ) {
-                IncidenceBase *i1 = newIncidence.data();
-                IncidenceBase *i2 = oldIncidence.data();
-                *i1 = *i2;
-              }
-              result = false;
-            }
-          }
+        if ( change->originalItems.isEmpty() ) {
+          break;
+        }
+
+        Q_ASSERT( change->originalItems.count() == 1 );
+        Incidence::Ptr oldIncidence = \
change->originalItems.first().payload<KCalCore::Incidence::Ptr>(); +        \
Incidence::Ptr newIncidence = change->newItem.payload<KCalCore::Incidence::Ptr>(); +
+        if ( !oldIncidence->supportsGroupwareCommunication() ) {
+          break;
+        }
+
+        const bool modify = handler.handleIncidenceAboutToBeModified( newIncidence \
); +        if ( modify ) {
+          break;
+        }
+
+        if ( newIncidence->type() == oldIncidence->type() ) {
+          IncidenceBase *i1 = newIncidence.data();
+          IncidenceBase *i2 = oldIncidence.data();
+          *i1 = *i2;
         }
+        result = false;
       }
       break;
       default:


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