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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kresources/kolab/kcal (silent)
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-08-02 22:23:13
Message-ID: 20100802222313.17605AC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1158521 by smartins:

SVN_SILENT:

Fix identation to 2 spaces and other stuff while trying to understand the conflict resultion code.

MERGE: none

 M  +13 -6     resourcekolab.cpp  


--- branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/resourcekolab.cpp #1158520:1158521
@@ -331,20 +331,25 @@
 }
 void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
-  if ( incidencebase->isReadOnly() ) return;
+  if ( incidencebase->isReadOnly() ) {
+    return;
+  }
+
   incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
   incidencebase->setLastModified( QDateTime::currentDateTime() );
+
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
   incidenceUpdatedSilent( incidencebase );
-
 }
 
 void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subresource, Q_UINT32 sernum )
 {
-    if ( ! inc )
+  if ( !inc ) {
         return;
+   }
+
     if ( ! mResolveConflict ) {
         // we should do no conflict resolution
         delete inc;
@@ -364,10 +369,12 @@
         ch->setIncidence( local ,inc );
         if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
           connect ( this, SIGNAL( useGlobalMode() ), ch, SLOT (  useGlobalMode() ) );
-          if ( ch->exec() )
-            if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
+         if ( ch->exec() ) {
+           if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) {
               emit useGlobalMode() ;
         }
+         }
+       }
         result = ch->getIncidence();
         delete ch;
       }
@@ -386,7 +393,7 @@
         addedIncidence->setUid( CalFormat::createUniqueId() );
         localIncidence = local;
     }
-    bool silent = mSilent;
+   const bool silent = mSilent;
     mSilent = false;
     if ( !localIncidence ) {
         deleteIncidence( local ); // remove local from kmail
[prev in list] [next in list] [prev in thread] [next in thread]