← Back to branch summary

~kubuntu-members/kdepimlibs/4.11

« back to all changes in this revision

Viewing changes to akonadi/calendar/incidencechanger.cpp

  • Committer: Sergio Martins
  • Date: 2013-10-31 23:23:27 UTC
  • Revision ID: git-v1:926f28341eeb7a10f61e9248431cd04c30c3cac6
Reduce nesting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
akonadi/calendar/incidencechanger.cpp
479
479
      break;
480
480
      case IncidenceChanger::ChangeTypeModify:
481
481
      {
482
 
        if ( !change->originalItems.isEmpty() ) {
483
 
          Q_ASSERT( change->originalItems.count() == 1 );
484
 
          Incidence::Ptr oldIncidence = change->originalItems.first().payload<KCalCore::Incidence::Ptr>();
485
 
          Incidence::Ptr newIncidence = change->newItem.payload<KCalCore::Incidence::Ptr>();
486
 
 
487
 
          if ( oldIncidence->supportsGroupwareCommunication() ) {
488
 
            const bool modify = handler.handleIncidenceAboutToBeModified( newIncidence );
489
 
            if ( !modify ) {
490
 
              if ( newIncidence->type() == oldIncidence->type() ) {
491
 
                IncidenceBase *i1 = newIncidence.data();
492
 
                IncidenceBase *i2 = oldIncidence.data();
493
 
                *i1 = *i2;
494
 
              }
495
 
              result = false;
496
 
            }
497
 
          }
498
 
        }
 
482
        if ( change->originalItems.isEmpty() ) {
 
483
          break;
 
484
        }
 
485
 
 
486
        Q_ASSERT( change->originalItems.count() == 1 );
 
487
        Incidence::Ptr oldIncidence = change->originalItems.first().payload<KCalCore::Incidence::Ptr>();
 
488
        Incidence::Ptr newIncidence = change->newItem.payload<KCalCore::Incidence::Ptr>();
 
489
 
 
490
        if ( !oldIncidence->supportsGroupwareCommunication() ) {
 
491
          break;
 
492
        }
 
493
 
 
494
        const bool modify = handler.handleIncidenceAboutToBeModified( newIncidence );
 
495
        if ( modify ) {
 
496
          break;
 
497
        }
 
498
 
 
499
        if ( newIncidence->type() == oldIncidence->type() ) {
 
500
          IncidenceBase *i1 = newIncidence.data();
 
501
          IncidenceBase *i2 = oldIncidence.data();
 
502
          *i1 = *i2;
 
503
        }
 
504
        result = false;
499
505
      }
500
506
      break;
501
507
      default: