Commit 2dfc3da0 authored by Volker Krause's avatar Volker Krause
Browse files

Adapt to KDAV changes

Reviewers: ervin

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28566
parent 30ca062f
......@@ -1182,9 +1182,9 @@ void DavGroupwareResource::onItemRemovedFinished(KJob *job)
}
}
void DavGroupwareResource::onCollectionDiscovered(int protocol, const QString &collection, const QString &config)
void DavGroupwareResource::onCollectionDiscovered(KDAV::Protocol protocol, const QString &collection, const QString &config)
{
Settings::self()->addCollectionUrlMapping(KDAV::Protocol(protocol), collection, config);
Settings::self()->addCollectionUrlMapping(protocol, collection, config);
}
void DavGroupwareResource::handleConflict(const Item &lI, const Item::List &localDependentItems, const KDAV::DavItem &rI, bool isLocalRemoval, int responseCode)
......
......@@ -19,6 +19,7 @@
#ifndef DAVGROUPWARERESOURCE_H
#define DAVGROUPWARERESOURCE_H
#include <KDAV/Enums>
#include <KDAV/EtagCache>
#include <memory>
......@@ -105,7 +106,7 @@ private:
void onItemRemovalPrepared(KJob *);
void onItemRemovedFinished(KJob *);
void onCollectionDiscovered(int protocol, const QString &collectionUrl, const QString &configuredUrl);
void onCollectionDiscovered(KDAV::Protocol protocol, const QString &collectionUrl, const QString &configuredUrl);
void onConflictModifyJobFinished(KJob *job);
void onDeletedItemRecreated(KJob *job);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment