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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-06-24 22:24:19
Message-ID: 1245882259.418894.30900.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 986708 by tmcguire:

Merged revisions 977463 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977463 | cberzan | 2009-06-04 12:36:35 +0200 (Thu, 04 Jun 2009) | 2 lines
  
  Akonadi::TransportResource class for resources implementing sending.
........


 _M            . (directory)  
 M  +5 -0      akonadi/CMakeLists.txt  
 A             akonadi/interfaces/org.freedesktop.Akonadi.Resource.Transport.xml   \
branches/kdepim/soc/kdepimlibs/akonadi/interfaces/org.freedesktop.Akonadi.Resource.Transport.xml#977463
  M  +6 -6      akonadi/resourcebase.h  
 A             akonadi/transportresource.cpp   \
branches/kdepim/soc/kdepimlibs/akonadi/transportresource.cpp#977463 [License: LGPL \
(v2+)]  A             akonadi/transportresource.h   \
branches/kdepim/soc/kdepimlibs/akonadi/transportresource.h#977463 [License: LGPL \
(v2+)]


** branches/work/akonadi-ports/kdepimlibs #property svnmerge-integrated
   - /branches/kdepim/soc/kdepimlibs:1-976463,977460 /trunk/KDE/kdepimlibs:1-985564
   + /branches/kdepim/soc/kdepimlibs:1-976463,977460,977463 \
                /trunk/KDE/kdepimlibs:1-985564
--- branches/work/akonadi-ports/kdepimlibs/akonadi/CMakeLists.txt #986707:986708
@@ -114,6 +114,7 @@
   subscriptionmodel.cpp
   transactionjobs.cpp
   transactionsequence.cpp
+  transportresource.cpp
   unlinkjob.cpp
 # Temporary until ported to Qt-plugin framework
   pluginloader.cpp
@@ -128,6 +129,9 @@
 qt4_add_dbus_adaptor( akonadikde_LIB_SRC \
${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Resource.xml resourcebase.h \
Akonadi::ResourceBase )  qt4_add_dbus_adaptor( akonadikde_LIB_SRC \
${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Status.xml agentbase.h \
Akonadi::AgentBase )  qt4_add_dbus_adaptor( akonadikde_LIB_SRC \
${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml agentbase.h \
Akonadi::AgentBase ) +# TODO move this to kdesupport/akonadi/interfaces
+qt4_add_dbus_adaptor( akonadikde_LIB_SRC \
interfaces/org.freedesktop.Akonadi.Resource.Transport.xml transportresource.h \
Akonadi::TransportResource ) +#qt4_add_dbus_interface( akonadikde_LIB_SRC \
interfaces/org.freedesktop.Akonadi.Resource.Transport.xml resourcetransportinterface \
)  
 kde4_add_ui_files( akonadikde_LIB_SRC
   cachepolicypage.ui
@@ -221,6 +225,7 @@
   standardactionmanager.h
   transactionjobs.h
   transactionsequence.h
+  transportresource.h
   unlinkjob.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi COMPONENT Devel
 )
--- branches/work/akonadi-ports/kdepimlibs/akonadi/resourcebase.h #986707:986708
@@ -224,19 +224,19 @@
      * If incremental retrieval is not possible, provide the full listing by calling
      * itemsRetrieved( const Item::List& ).
      * In any case, ensure that all items have a correctly set remote identifier
-     * to allow synchronizing with already locally existing items.
-     * In case you don't want to use the built-in item syncing code, store the \
retrived +     * to allow synchronizing with items already existing locally.
+     * In case you don't want to use the built-in item syncing code, store the \
                retrieved
      * items manually and call itemsRetrieved() once you are done.
-     * @param collection The collection to sync.
-     * @see itemsRetrieved( const Item::List &), itemsRetrievedIncremental(), \
itemsRetrieved(), currentCollection() +     * @param collection The collection whose \
items to retrieve. +     * @see itemsRetrieved( const Item::List& ), \
                itemsRetrievedIncremental(), itemsRetrieved(), currentCollection()
      */
     virtual void retrieveItems( const Akonadi::Collection &collection ) = 0;
 
     /**
      * Retrieve a single item from the backend. The item to retrieve is provided as \
                @p item.
      * Add the requested payload parts and call itemRetrieved() when done.
-     * @param item The empty item which payload should be retrieved. Use this object \
                when delivering
-     * the result instead of creating a new item to ensure conflict detection to \
work. +     * @param item The empty item whose payload should be retrieved. Use this \
object when delivering +     * the result instead of creating a new item to ensure \
                conflict detection will work.
      * @param parts The item parts that should be retrieved.
      * @return false if there is an immediate error when retrieving the item.
      * @see itemRetrieved()


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