← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdepimlibs/quantal-proposed

« back to all changes in this revision

Viewing changes to akonadi/collectionsync.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-14 14:37:07 UTC
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: package-import@ubuntu.com-20111214143707-m0qplh3hsd957ukv
Tags: upstream-4.7.90
Import upstream version 4.7.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
akonadi/collectionsync.cpp
295
295
        c.setParentCollection( localNode->collection.parentCollection() );
296
296
        ++pendingJobs;
297
297
        CollectionModifyJob *mod = new CollectionModifyJob( c, q );
298
 
        connect( mod, SIGNAL( result( KJob* ) ), q, SLOT( updateLocalCollectionResult( KJob* ) ) );
 
298
        connect( mod, SIGNAL(result(KJob*)), q, SLOT(updateLocalCollectionResult(KJob*)) );
299
299
      }
300
300
 
301
301
      // detecting moves is only possible with global RIDs
307
307
        if ( newParent && oldParent != newParent ) {
308
308
          ++pendingJobs;
309
309
          CollectionMoveJob *move = new CollectionMoveJob( upd, newParent->collection, q );
310
 
          connect( move, SIGNAL( result( KJob* ) ), q, SLOT( updateLocalCollectionResult( KJob* ) ) );
 
310
          connect( move, SIGNAL(result(KJob*)), q, SLOT(updateLocalCollectionResult(KJob*)) );
311
311
        }
312
312
      }
313
313
 
338
338
        CollectionCreateJob *create = new CollectionCreateJob( col, q );
339
339
        create->setProperty( LOCAL_NODE, QVariant::fromValue( localParent ) );
340
340
        create->setProperty( REMOTE_NODE, QVariant::fromValue( remoteNode ) );
341
 
        connect( create, SIGNAL( result( KJob* ) ), q, SLOT( createLocalCollectionResult( KJob* ) ) );
 
341
        connect( create, SIGNAL(result(KJob*)), q, SLOT(createLocalCollectionResult(KJob*)) );
342
342
      }
343
343
    }
344
344
 
421
421
      foreach ( const Collection &col, cols ) {
422
422
        ++pendingJobs;
423
423
        CollectionDeleteJob *job = new CollectionDeleteJob( col, q );
424
 
        connect( job, SIGNAL( result( KJob* ) ), q, SLOT( deleteLocalCollectionsResult( KJob* ) ) );
 
424
        connect( job, SIGNAL(result(KJob*)), q, SLOT(deleteLocalCollectionsResult(KJob*)) );
425
425
 
426
426
        // It can happen that the groupware servers report us deleted collections
427
427
        // twice, in this case this collection delete job will fail on the second try.
576
576
  job->fetchScope().setResource( d->resourceId );
577
577
  job->fetchScope().setIncludeUnsubscribed( true );
578
578
  job->fetchScope().setAncestorRetrieval( CollectionFetchScope::Parent );
579
 
  connect( job, SIGNAL( collectionsReceived( const Akonadi::Collection::List& ) ),
580
 
           SLOT( localCollectionsReceived( const Akonadi::Collection::List& ) ) );
581
 
  connect( job, SIGNAL( result( KJob* ) ), SLOT( localCollectionFetchResult( KJob* ) ) );
 
579
  connect( job, SIGNAL(collectionsReceived(Akonadi::Collection::List)),
 
580
           SLOT(localCollectionsReceived(Akonadi::Collection::List)) );
 
581
  connect( job, SIGNAL(result(KJob*)), SLOT(localCollectionFetchResult(KJob*)) );
582
582
}
583
583
 
584
584
void CollectionSync::setStreamingEnabled( bool streaming )