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

List:       kde-commits
Subject:    KDE/kdepimlibs (merge)
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-09-08 9:13:51
Message-ID: 1252401231.262938.13821.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021127 by vkrause:

SVN_MERGE making the diff between akonadi-ports branch and trunk a bit smaller

Merged revisions 983691,987583,1020907,1020912,1021109,1021125 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r983691 | sebsauer | 2009-06-18 21:48:29 +0200 (Thu, 18 Jun 2009) | 1 line
  
  Added Item::List getter for ItemCopyJob and ItemDeleteJob
........
  r987583 | sebsauer | 2009-06-26 14:15:05 +0200 (Fri, 26 Jun 2009) | 3 lines
  
  * added second itemRemoved signal to Monitor to pass as second argument the collection the item is in.
  * added item/collection getter in ItemFetchJob and ItemCreateJob
........
  r1020907 | vkrause | 2009-09-07 17:09:04 +0200 (Mon, 07 Sep 2009) | 3 lines
  
  Remove some public API that was newly added in this branch but is unused
  or no longer needed due to features merged from trunk.
........
  r1020912 | vkrause | 2009-09-07 17:13:26 +0200 (Mon, 07 Sep 2009) | 3 lines
  
  Remove ItemFetchJob::item() as well, it's slightly misleading as it does
  not return a retrieved item but the requested one.
........
  r1021109 | vkrause | 2009-09-08 10:00:15 +0200 (Tue, 08 Sep 2009) | 3 lines
  
  Remove ItemCreateJob::collection() now that the created item has the
  correct parent collection set.
........
  r1021125 | vkrause | 2009-09-08 11:00:29 +0200 (Tue, 08 Sep 2009) | 2 lines
  
  Remove ItemFetchJob::collection() in favor of Item::parentCollection().
........


 _M            . (directory)  
 M  +1 -0      akonadi/item.h  
 M  +1 -0      akonadi/itemcreatejob.cpp  
 M  +9 -0      akonadi/itemdeletejob.cpp  
 M  +6 -0      akonadi/itemdeletejob.h  
 M  +1 -0      akonadi/itemfetchjob.cpp  


--- trunk/KDE/kdepimlibs/akonadi/item.h #1021126:1021127
@@ -341,6 +341,7 @@
 
   private:
     //@cond PRIVATE
+    friend class ItemCreateJob;
     friend class ItemModifyJob;
     friend class ProtocolHelper;
     PayloadBase* payloadBase() const;
--- trunk/KDE/kdepimlibs/akonadi/itemcreatejob.cpp #1021126:1021127
@@ -162,6 +162,7 @@
   item.setRevision( 0 );
   item.setModificationTime( d->mDatetime );
   item.setParentCollection( d->mCollection );
+  item.setStorageCollectionId( d->mCollection.id() );
 
   return item;
 }
--- trunk/KDE/kdepimlibs/akonadi/itemdeletejob.cpp #1021126:1021127
@@ -70,6 +70,7 @@
   : Job( new ItemDeleteJobPrivate( this ), parent )
 {
   Q_D( ItemDeleteJob );
+
   d->mItems = items;
 }
 
@@ -77,6 +78,7 @@
   : Job( new ItemDeleteJobPrivate( this ), parent )
 {
   Q_D( ItemDeleteJob );
+
   d->mCollection = collection;
 }
 
@@ -84,6 +86,13 @@
 {
 }
 
+Item::List ItemDeleteJob::deletedItems() const
+{
+  Q_D( const ItemDeleteJob );
+
+  return d->mItems;
+}
+
 void ItemDeleteJob::doStart()
 {
   Q_D( ItemDeleteJob );
--- trunk/KDE/kdepimlibs/akonadi/itemdeletejob.h #1021126:1021127
@@ -105,6 +105,12 @@
      */
     ~ItemDeleteJob();
 
+    /**
+     * Returns the items passed on in the constructor.
+     * @since 4.4
+     */
+     Item::List deletedItems() const;
+
   protected:
     virtual void doStart();
 
--- trunk/KDE/kdepimlibs/akonadi/itemfetchjob.cpp #1021126:1021127
@@ -197,6 +197,7 @@
 void ItemFetchJob::setCollection(const Akonadi::Collection& collection)
 {
   Q_D( ItemFetchJob );
+
   d->mCollection = collection;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]