Use new KCursorSaver from kguiaddons

src/CMakeLists.txt

@@ -355,6 +355,7 @@ target_link_libraries(kmailprivate
     KF5::AkonadiSearchPIM
     KF5::WebEngineViewer
     KF5::SyntaxHighlighting
+    KF5::GuiAddons
     ${kmail_userfeedback_LIB}
     )
 target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageList,INTERFACE_INCLUDE_DIRECTORIES>)

src/editor/kmcomposerwin.cpp

@@ -87,9 +87,14 @@
 #include <Libkdepim/StatusbarProgressWidget>
 #include <followupreminder.h>
 
+#include <kguiaddons_version.h>
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
 #include <Libkdepim/KCursorSaver>
 #endif
+#else
+#include <KCursorSaver>
+#endif
 
 #include <Libkleo/KeySelectionDialog>
 #include <Libkleo/ProgressDialog>
@@ -2789,8 +2794,12 @@ void KMComposerWin::applyComposerSetting(MessageComposer::ComposerViewBase *mCom
 
 void KMComposerWin::doDelayedSend(MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn)
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     applyComposerSetting(mComposerBase);
     if (mForceDisableHtml) {

src/kmcommands.cpp

@@ -107,9 +107,15 @@
 
 #include <Libkdepim/ProgressManager>
 #include <PimCommon/BroadcastStatus>
+
+#include <kguiaddons_version.h>
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
 #include <Libkdepim/KCursorSaver>
 #endif
+#else
+#include <KCursorSaver>
+#endif
 
 #include <gpgme++/error.h>
 
@@ -852,8 +858,12 @@ KMReplyCommand::KMReplyCommand(QWidget *parent, const Akonadi::Item &msg, Messag
 
 KMCommand::Result KMReplyCommand::execute()
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     Akonadi::Item item = retrievedMessage();
     KMime::Message::Ptr msg = MessageComposer::Util::message(item);
@@ -915,9 +925,13 @@ KMCommand::Result KMForwardCommand::createComposer(const Akonadi::Item &item)
     if (!msg) {
         return Failed;
     }
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
 #endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
+#endif
 
     CreateForwardMessageJobSettings settings;
     settings.item = item;
@@ -1330,8 +1344,12 @@ KMFilterActionCommand::KMFilterActionCommand(QWidget *parent, const QVector<qlon
 
 KMCommand::Result KMFilterActionCommand::execute()
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     int msgCount = 0;
     const int msgCountToFilter = mMsgListId.count();
@@ -1521,8 +1539,12 @@ void KMMoveCommand::slotMoveResult(KJob *job)
 
 KMCommand::Result KMMoveCommand::execute()
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     setEmitsCompletedItself(true);
     setDeletesItself(true);
@@ -1649,8 +1671,12 @@ Akonadi::Collection KMTrashMsgCommand::findTrashFolder(const Akonadi::Collection
 
 KMCommand::Result KMTrashMsgCommand::execute()
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     setEmitsCompletedItself(true);
     setDeletesItself(true);

src/kmmainwidget.cpp

@@ -88,9 +88,14 @@
 
 #include <MessageViewer/AttachmentStrategy>
 
+#include <kguiaddons_version.h>
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
 #include <Libkdepim/KCursorSaver>
 #endif
+#else
+#include <KCursorSaver>
+#endif
 
 #include <MessageComposer/MessageSender>
 #include <MessageComposer/MessageHelper>
@@ -522,9 +527,13 @@ void KMMainWidget::folderSelected(const Akonadi::Collection &col)
     }
 
     mGoToFirstUnreadMessageInSelectedFolder = false;
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
 #endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
+#endif
 
     if (mMsgView) {
         mMsgView->clear(true);
@@ -1483,8 +1492,12 @@ void KMMainWidget::slotEmptyFolder()
         != KMessageBox::Continue) {
         return;
     }
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     slotSelectAllMessages();
     if (isTrash) {
@@ -2249,25 +2262,37 @@ void KMMainWidget::slotApplyFilterOnFolder(bool recursive)
 
 void KMMainWidget::applyFilters(const Akonadi::Item::List &selectedMessages)
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
 #endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
+#endif
 
     MailCommon::FilterManager::instance()->filter(selectedMessages);
 }
 
 void KMMainWidget::applyFilters(const Akonadi::Collection::List &selectedCols)
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     MailCommon::FilterManager::instance()->filter(selectedCols);
 }
 
 void KMMainWidget::applyFilter(const Akonadi::Collection::List &selectedCols, const QString &filter)
 {
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     MailCommon::FilterManager::instance()->filter(selectedCols, { filter });
 }
@@ -3665,17 +3690,24 @@ void KMMainWidget::slotCollapseThread()
 void KMMainWidget::slotExpandAllThreads()
 {
     // TODO: Make this asynchronous ? (if there is enough demand)
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     mMessagePane->setAllThreadsExpanded(true);
 }
 
 void KMMainWidget::slotCollapseAllThreads()
 {
-    // TODO: Make this asynchronous ? (if there is enough demand)
+#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
 #ifndef QT_NO_CURSOR
     KPIM::KCursorSaver busy(KPIM::KBusyPtr::busy());
+#endif
+#else
+    KCursorSaver saver(Qt::WaitCursor);
 #endif
     mMessagePane->setAllThreadsExpanded(false);
 }