diff --git a/src/utils/clipboardmenu.cpp b/src/utils/clipboardmenu.cpp
index 8a4fad084..bbc7dc6f4 100644
--- a/src/utils/clipboardmenu.cpp
+++ b/src/utils/clipboardmenu.cpp
@@ -1,116 +1,112 @@
 /*
   SPDX-FileCopyrightText: 2014-2021 Laurent Montel <montel@kde.org>
 
   SPDX-License-Identifier: GPL-2.0-only
 */
 
 #include "clipboardmenu.h"
 
 #include "kdtoolsglobal.h"
 #include "mainwindow.h"
 
 #include <commands/importcertificatefromclipboardcommand.h>
 #include <commands/encryptclipboardcommand.h>
 #include <commands/signclipboardcommand.h>
 #include <commands/decryptverifyclipboardcommand.h>
 
 #include <KLocalizedString>
 #include <KActionMenu>
 
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
 #include <QSignalBlocker>
 
 using namespace Kleo;
 
 using namespace Kleo::Commands;
 
 ClipboardMenu::ClipboardMenu(QObject *parent)
-    : QObject(parent),
-      mWindow(nullptr)
+    : QObject{parent}
 {
     mClipboardMenu = new KActionMenu(i18n("Clipboard"), this);
     mImportClipboardAction = new QAction(i18n("Certificate Import"), this);
     mEncryptClipboardAction = new QAction(i18n("Encrypt..."), this);
     mSmimeSignClipboardAction = new QAction(i18n("S/MIME-Sign..."), this);
     mOpenPGPSignClipboardAction = new QAction(i18n("OpenPGP-Sign..."), this);
     mDecryptVerifyClipboardAction = new QAction(i18n("Decrypt/Verify..."), this);
 
     KDAB_SET_OBJECT_NAME(mClipboardMenu);
     KDAB_SET_OBJECT_NAME(mImportClipboardAction);
     KDAB_SET_OBJECT_NAME(mEncryptClipboardAction);
     KDAB_SET_OBJECT_NAME(mSmimeSignClipboardAction);
     KDAB_SET_OBJECT_NAME(mOpenPGPSignClipboardAction);
     KDAB_SET_OBJECT_NAME(mDecryptVerifyClipboardAction);
 
     connect(mImportClipboardAction, &QAction::triggered, this, &ClipboardMenu::slotImportClipboard);
     connect(mEncryptClipboardAction, &QAction::triggered, this, &ClipboardMenu::slotEncryptClipboard);
     connect(mSmimeSignClipboardAction, &QAction::triggered, this, &ClipboardMenu::slotSMIMESignClipboard);
     connect(mOpenPGPSignClipboardAction, &QAction::triggered, this, &ClipboardMenu::slotOpenPGPSignClipboard);
     connect(mDecryptVerifyClipboardAction, &QAction::triggered, this, &ClipboardMenu::slotDecryptVerifyClipboard);
     mClipboardMenu->addAction(mImportClipboardAction);
     mClipboardMenu->addAction(mEncryptClipboardAction);
     mClipboardMenu->addAction(mSmimeSignClipboardAction);
     mClipboardMenu->addAction(mOpenPGPSignClipboardAction);
     mClipboardMenu->addAction(mDecryptVerifyClipboardAction);
     connect(QApplication::clipboard(), &QClipboard::changed, this, &ClipboardMenu::slotEnableDisableActions);
     slotEnableDisableActions();
 }
 
-ClipboardMenu::~ClipboardMenu()
-{
-
-}
+ClipboardMenu::~ClipboardMenu() = default;
 
 void ClipboardMenu::setMainWindow(MainWindow *window)
 {
     mWindow = window;
 }
 
 KActionMenu *ClipboardMenu::clipboardMenu() const
 {
     return mClipboardMenu;
 }
 
 void ClipboardMenu::startCommand(Command *cmd)
 {
     Q_ASSERT(cmd);
     cmd->setParent(mWindow);
     cmd->start();
 }
 
 void ClipboardMenu::slotImportClipboard()
 {
     startCommand(new ImportCertificateFromClipboardCommand(nullptr));
 }
 
 void ClipboardMenu::slotEncryptClipboard()
 {
     startCommand(new EncryptClipboardCommand(nullptr));
 }
 
 void ClipboardMenu::slotOpenPGPSignClipboard()
 {
     startCommand(new SignClipboardCommand(GpgME::OpenPGP, nullptr));
 }
 
 void ClipboardMenu::slotSMIMESignClipboard()
 {
     startCommand(new SignClipboardCommand(GpgME::CMS, nullptr));
 }
 
 void ClipboardMenu::slotDecryptVerifyClipboard()
 {
     startCommand(new DecryptVerifyClipboardCommand(nullptr));
 }
 
 void ClipboardMenu::slotEnableDisableActions()
 {
     const QSignalBlocker blocker(QApplication::clipboard());
     mImportClipboardAction->setEnabled(ImportCertificateFromClipboardCommand::canImportCurrentClipboard());
     mEncryptClipboardAction->setEnabled(EncryptClipboardCommand::canEncryptCurrentClipboard());
     mOpenPGPSignClipboardAction->setEnabled(SignClipboardCommand::canSignCurrentClipboard());
     mSmimeSignClipboardAction->setEnabled(SignClipboardCommand::canSignCurrentClipboard());
     mDecryptVerifyClipboardAction->setEnabled(DecryptVerifyClipboardCommand::canDecryptVerifyCurrentClipboard());
 }
diff --git a/src/utils/clipboardmenu.h b/src/utils/clipboardmenu.h
index f3359b39c..1e0cfd51f 100644
--- a/src/utils/clipboardmenu.h
+++ b/src/utils/clipboardmenu.h
@@ -1,47 +1,50 @@
 /*
   SPDX-FileCopyrightText: 2014-2021 Laurent Montel <montel@kde.org>
 
   SPDX-License-Identifier: GPL-2.0-only
 */
 
 #pragma once
 
 #include <QObject>
+#include <QPointer>
+
 class KActionMenu;
 class QAction;
 class MainWindow;
+
 namespace Kleo
 {
 class Command;
 }
+
 class ClipboardMenu : public QObject
 {
     Q_OBJECT
 public:
     explicit ClipboardMenu(QObject *parent = nullptr);
     ~ClipboardMenu() override;
 
     void setMainWindow(MainWindow *window);
 
     KActionMenu *clipboardMenu() const;
 
 private Q_SLOTS:
     void slotImportClipboard();
     void slotEncryptClipboard();
     void slotOpenPGPSignClipboard();
     void slotSMIMESignClipboard();
     void slotDecryptVerifyClipboard();
     void slotEnableDisableActions();
 
 private:
     void startCommand(Kleo::Command *cmd);
 
-    KActionMenu *mClipboardMenu;
-    QAction *mImportClipboardAction;
-    QAction *mEncryptClipboardAction;
-    QAction *mSmimeSignClipboardAction;
-    QAction *mOpenPGPSignClipboardAction;
-    QAction *mDecryptVerifyClipboardAction;
-    MainWindow *mWindow;
+    QPointer<KActionMenu> mClipboardMenu;
+    QPointer<QAction> mImportClipboardAction;
+    QPointer<QAction> mEncryptClipboardAction;
+    QPointer<QAction> mSmimeSignClipboardAction;
+    QPointer<QAction> mOpenPGPSignClipboardAction;
+    QPointer<QAction> mDecryptVerifyClipboardAction;
+    QPointer<MainWindow> mWindow;
 };
-