Commit 7dafb8c9 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Make sure AgentBase::cleanup() base impl is always called

parent b92f5f79
......@@ -150,7 +150,7 @@ void DavGroupwareResource::collectionRemoved(const Akonadi::Collection &collecti
void DavGroupwareResource::cleanup()
{
Settings::self()->cleanup();
Akonadi::AgentBase::cleanup();
ResourceBase::cleanup();
}
QDateTime DavGroupwareResource::lastCacheUpdate() const
......
......@@ -63,6 +63,7 @@ void FacebookResource::abortActivity()
void FacebookResource::cleanup()
{
(new LogoutJob(this))->exec();
ResourceBase::cleanup();
}
Akonadi::Collection FacebookResource::makeCollection(Graph::RSVP rsvp, const QString &name, const Akonadi::Collection &parent)
......
......@@ -67,7 +67,7 @@ GoogleResource::~GoogleResource()
void GoogleResource::cleanup()
{
accountManager()->cleanup(settings()->account());
Akonadi::AgentBase::cleanup();
ResourceBase::cleanup();
}
AccountPtr GoogleResource::account() const
......
......@@ -90,9 +90,3 @@ void ImapResource::onConfigurationDone(int result)
}
dlg->deleteLater();
}
void ImapResource::cleanup()
{
settings()->cleanup();
Akonadi::AgentBase::cleanup();
}
......@@ -38,7 +38,6 @@ public:
virtual ~ImapResource();
QDialog *createConfigureDialog(WId windowId) override;
void cleanup() override;
protected:
QString defaultName() const override;
......
......@@ -715,6 +715,8 @@ QStringList ImapResourceBase::serverCapabilities() const
void ImapResourceBase::cleanup()
{
settings()->cleanup();
ResourceBase::cleanup();
}
QString ImapResourceBase::dumpResourceToString() const
......
......@@ -76,12 +76,6 @@ Settings *KolabResource::settings() const
return m_settings;
}
void KolabResource::cleanup()
{
settings()->cleanup();
Akonadi::AgentBase::cleanup();
}
void KolabResource::delayedInit()
{
ImapResourceBase::delayedInit();
......
......@@ -36,7 +36,6 @@ public:
QDialog *createConfigureDialog(WId windowId) override;
Settings *settings() const override;
void cleanup() override;
protected Q_SLOTS:
void retrieveCollections() override;
......
......@@ -1028,7 +1028,7 @@ void POP3Resource::cleanup()
mWallet->removeEntry(identifier());
}
}
Akonadi::AgentBase::cleanup();
ResourceBase::cleanup();
}
void POP3Resource::doSetOnline(bool online)
......
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