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

List:       kde-commits
Subject:    branches/work/akonadi-ports
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-09-08 8:00:16
Message-ID: 1252396816.056446.6732.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021109 by vkrause:

Remove ItemCreateJob::collection() now that the created item has the
correct parent collection set.


 M  +3 -3      kdepim/korganizer/akonadicalendar_p.h  
 M  +0 -7      kdepimlibs/akonadi/itemcreatejob.cpp  
 M  +0 -6      kdepimlibs/akonadi/itemcreatejob.h  


--- branches/work/akonadi-ports/kdepim/korganizer/akonadicalendar_p.h \
#1021108:1021109 @@ -272,13 +272,13 @@
             return;
         }
         Akonadi::ItemCreateJob *createjob = static_cast<Akonadi::ItemCreateJob*>( \
                job );
-        if ( m_collectionMap.contains( createjob->collection().id() ) ) {
+        if ( m_collectionMap.contains( createjob->item().parentCollection().id() ) ) \
{  // yes, adding to an un-viewed collection happens
-          itemAdded( createjob->item(), createjob->collection() );
+          itemAdded( createjob->item(), createjob->item().parentCollection() );
         } else {
           // FIXME show dialog indicating that the creation worked, but the \
incidence will  // not show, since the collection isn't
-          kWarning() << "Collection with id=" << createjob->collection().id() << " \
not in m_collectionMap"; +          kWarning() << "Collection with id=" << \
createjob->item().parentCollection() << " not in m_collectionMap";  }
     }
 
--- branches/work/akonadi-ports/kdepimlibs/akonadi/itemcreatejob.cpp #1021108:1021109
@@ -166,11 +166,4 @@
   return item;
 }
 
-Collection ItemCreateJob::collection() const
-{
-  Q_D( const ItemCreateJob );
-
-  return d->mCollection;
-}
-
 #include "itemcreatejob.moc"
--- branches/work/akonadi-ports/kdepimlibs/akonadi/itemcreatejob.h #1021108:1021109
@@ -85,12 +85,6 @@
      */
     Item item() const;
 
-    /**
-     * Returns the collection the created item is child of. This is the same \
                collection
-     * passed in on in the constructor.
-     */
-    Collection collection() const;
-
   protected:
     virtual void doStart();
     virtual void doHandleResponse( const QByteArray &tag, const QByteArray &data );


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