[pim/kdepim-runtime] resources/dav/resource: Make the DAV resource widget based again
Kevin Ottens <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 52798bf013b99b10e6561113a3be5378ef5ec1a4 by Kevin Ottens, on behalf of Kevin Ottens.
Committed on 29/07/2026 at 06:03.
Pushed by ervin into branch 'master'.
Make the DAV resource widget based again
This will be required to be able to display the usual GUI for SSL errors
to the user.
M +2 -2 resources/dav/resource/CMakeLists.txt
M +2 -2 resources/dav/resource/davgroupwareresource.cpp
M +2 -2 resources/dav/resource/davgroupwareresource.h
https://invent.kde.org/pim/kdepim-runtime/-/commit/52798bf013b99b10e6561113a3be5378ef5ec1a4
diff --git a/resources/dav/resource/CMakeLists.txt b/resources/dav/resource/CMakeLists.txt
index 104917fbb..193804878 100644
--- a/resources/dav/resource/CMakeLists.txt
+++ b/resources/dav/resource/CMakeLists.txt
@@ -99,11 +99,11 @@ target_link_libraries(
Qt::Xml
KF6::I18n
KF6::Contacts
- KF6::KIOCore
+ KF6::KIOWidgets
KF6::CalendarCore
KF6::ConfigCore
KF6::DAV
- KPim6::AkonadiAgentBase
+ KPim6::AkonadiAgentWidgetBase
KPim6::AkonadiCore
KPim6::AkonadiCalendarCore
qt6keychain
diff --git a/resources/dav/resource/davgroupwareresource.cpp b/resources/dav/resource/davgroupwareresource.cpp
index df5e69684..c395990ae 100644
--- a/resources/dav/resource/davgroupwareresource.cpp
+++ b/resources/dav/resource/davgroupwareresource.cpp
@@ -67,7 +67,7 @@ using IncidencePtr = QSharedPointer<KCalendarCore::Incidence>;
using namespace Qt::Literals::StringLiterals;
DavGroupwareResource::DavGroupwareResource(const QString &id)
- : ResourceBase(id)
+ : ResourceWidgetBase(id)
, FreeBusyProviderBase()
, AccountBase(this)
, mFreeBusyHandler(new DavFreeBusyHandler(settings(), this))
@@ -1934,7 +1934,7 @@ void DavGroupwareResource::setCollectionIcon(Akonadi::Collection &collection)
}
}
-AKONADI_RESOURCE_CORE_MAIN(DavGroupwareResource)
+AKONADI_RESOURCE_MAIN(DavGroupwareResource)
#include "davgroupwareresource.moc"
diff --git a/resources/dav/resource/davgroupwareresource.h b/resources/dav/resource/davgroupwareresource.h
index 48cff968c..c7f9e9466 100644
--- a/resources/dav/resource/davgroupwareresource.h
+++ b/resources/dav/resource/davgroupwareresource.h
@@ -11,7 +11,7 @@
#include "settings.h"
#include <Akonadi/AccountBase>
#include <Akonadi/FreeBusyProviderBase>
-#include <Akonadi/ResourceBase>
+#include <Akonadi/ResourceWidgetBase>
#include <KDAV/DavCollection>
class DavItemCache;
@@ -26,7 +26,7 @@ namespace KDAV
class DavItem;
}
-class DavGroupwareResource : public Akonadi::ResourceBase,
+class DavGroupwareResource : public Akonadi::ResourceWidgetBase,
public Akonadi::AgentBase::Observer,
public Akonadi::FreeBusyProviderBase,
public Akonadi::AgentBase::TagObserver,