Changeset View
Changeset View
Standalone View
Standalone View
resources/dav/resource/davgroupwareresource.cpp
Show First 20 Lines • Show All 1176 Lines • ▼ Show 20 Line(s) | 1165 | { | |||
---|---|---|---|---|---|
1177 | } else { | 1177 | } else { | ||
1178 | Akonadi::Item item = job->property("item").value<Akonadi::Item>(); | 1178 | Akonadi::Item item = job->property("item").value<Akonadi::Item>(); | ||
1179 | Akonadi::Collection collection = job->property("collection").value<Akonadi::Collection>(); | 1179 | Akonadi::Collection collection = job->property("collection").value<Akonadi::Collection>(); | ||
1180 | mEtagCaches[collection.remoteId()]->removeEtag(item.remoteId()); | 1180 | mEtagCaches[collection.remoteId()]->removeEtag(item.remoteId()); | ||
1181 | changeProcessed(); | 1181 | changeProcessed(); | ||
1182 | } | 1182 | } | ||
1183 | } | 1183 | } | ||
1184 | 1184 | | |||
1185 | void DavGroupwareResource::onCollectionDiscovered(int protocol, const QString &collection, const QString &config) | 1185 | void DavGroupwareResource::onCollectionDiscovered(KDAV::Protocol protocol, const QString &collection, const QString &config) | ||
1186 | { | 1186 | { | ||
1187 | Settings::self()->addCollectionUrlMapping(KDAV::Protocol(protocol), collection, config); | 1187 | Settings::self()->addCollectionUrlMapping(protocol, collection, config); | ||
1188 | } | 1188 | } | ||
1189 | 1189 | | |||
1190 | void DavGroupwareResource::handleConflict(const Item &lI, const Item::List &localDependentItems, const KDAV::DavItem &rI, bool isLocalRemoval, int responseCode) | 1190 | void DavGroupwareResource::handleConflict(const Item &lI, const Item::List &localDependentItems, const KDAV::DavItem &rI, bool isLocalRemoval, int responseCode) | ||
1191 | { | 1191 | { | ||
1192 | Akonadi::Item localItem(lI); | 1192 | Akonadi::Item localItem(lI); | ||
1193 | Akonadi::Item remoteItem, tmpRemoteItem; // The tmp* vars are here to store the result of the parseDavData() call | 1193 | Akonadi::Item remoteItem, tmpRemoteItem; // The tmp* vars are here to store the result of the parseDavData() call | ||
1194 | Akonadi::Item::List remoteDependentItems, tmpRemoteDependentItems; // as we have no idea which item triggered the conflict. | 1194 | Akonadi::Item::List remoteDependentItems, tmpRemoteDependentItems; // as we have no idea which item triggered the conflict. | ||
1195 | qCDebug(DAVRESOURCE_LOG) << "Fresh response code is" << responseCode; | 1195 | qCDebug(DAVRESOURCE_LOG) << "Fresh response code is" << responseCode; | ||
▲ Show 20 Lines • Show All 176 Lines • Show Last 20 Lines |