Commit 7cdaae14 authored by Shashwat Jolly's avatar Shashwat Jolly
Browse files

Change ResourceBase::Prepend to EteSyncResource::Prepend in BaseHandler

This was needed because it is a protected variable in ResourceBase, but accessible through EteSyncResource as BaseHandler is a friend of EteSyncResource.
Also added minor logging details.
parent 3d698cec
......@@ -127,7 +127,7 @@ bool BaseHandler::handleConflictError(const Collection &collection)
if (etesync_get_error_code() == EteSyncErrorCode::ETESYNC_ERROR_CODE_CONFLICT) {
qCDebug(ETESYNC_LOG) << "Conflict error";
mResource->deferTask();
mResource->scheduleCustomTask(this, "syncCollection", QVariant::fromValue(collection), ResourceBase::Prepend);
mResource->scheduleCustomTask(this, "syncCollection", QVariant::fromValue(collection), EteSyncResource::Prepend);
return true;
}
return false;
......
......@@ -33,7 +33,7 @@ void CalendarTaskBaseHandler::getItemListFromEntries(std::vector<EteSyncEntryPtr
{
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "SetupItems: Could not get journal";
qCDebug(ETESYNC_LOG) << "SetupItems: Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -172,7 +172,7 @@ void CalendarTaskBaseHandler::itemAdded(const Akonadi::Item &item,
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -214,7 +214,7 @@ void CalendarTaskBaseHandler::itemChanged(const Akonadi::Item &item,
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -309,7 +309,7 @@ void CalendarTaskBaseHandler::collectionChanged(const Akonadi::Collection &colle
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -351,7 +351,7 @@ void CalendarTaskBaseHandler::collectionRemoved(const Akonadi::Collection &colle
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......
......@@ -38,7 +38,7 @@ void ContactHandler::getItemListFromEntries(std::vector<EteSyncEntryPtr> &entrie
{
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "SetupItems: Could not get journal";
qCDebug(ETESYNC_LOG) << "SetupItems: Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -159,7 +159,7 @@ void ContactHandler::itemAdded(const Akonadi::Item &item,
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -206,7 +206,7 @@ void ContactHandler::itemChanged(const Akonadi::Item &item,
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -312,7 +312,7 @@ void ContactHandler::collectionChanged(const Akonadi::Collection &collection)
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......@@ -346,7 +346,7 @@ void ContactHandler::collectionRemoved(const Akonadi::Collection &collection)
const EteSyncJournalPtr &journal = mResource->getJournal(journalUid);
if (!journal) {
qCDebug(ETESYNC_LOG) << "Could not get journal";
qCDebug(ETESYNC_LOG) << "Could not get journal" << journalUid;
mResource->cancelTask(i18n("Could not get journal"));
return;
}
......
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