Index: kcmodule/activities/activitypage.h
===================================================================
--- kcmodule/activities/activitypage.h
+++ kcmodule/activities/activitypage.h
@@ -57,8 +57,8 @@
 
     KActivities::Consumer *m_activityConsumer;
     QList< ActivityWidget* > m_activityWidgets;
-    QWeakPointer< ErrorOverlay > m_errorOverlay;
-    QWeakPointer< KMessageWidget > m_messageWidget;
+    ErrorOverlay *m_errorOverlay = nullptr;
+    KMessageWidget *m_messageWidget = nullptr;
     KActivities::Consumer::ServiceStatus m_previousServiceStatus;
 };
 
Index: kcmodule/activities/activitypage.cpp
===================================================================
--- kcmodule/activities/activitypage.cpp
+++ kcmodule/activities/activitypage.cpp
@@ -75,10 +75,10 @@
     // Message widget
     m_messageWidget = new KMessageWidget(i18n("The activity service is running with bare functionalities.\n"
                                                           "Names and icons of the activities might not be available."));
-    m_messageWidget.data()->setMessageType(KMessageWidget::Warning);
-    m_messageWidget.data()->hide();
+    m_messageWidget->setMessageType(KMessageWidget::Warning);
+    m_messageWidget->hide();
 
-    lay->addWidget(m_messageWidget.data());
+    lay->addWidget(m_messageWidget);
     lay->addWidget(m_tabWidget);
     setLayout(lay);
 
@@ -142,7 +142,7 @@
         case KActivities::Consumer::Unknown: // fall through
         case KActivities::Consumer::NotRunning:
             // Create error overlay, if not present
-            if (m_errorOverlay.isNull()) {
+            if (!m_errorOverlay) {
                 m_errorOverlay = new ErrorOverlay(this, i18n("The activity service is not running.\n"
                                                              "It is necessary to have the activity manager running "
                                                              "to configure activity-specific power management behavior."),
@@ -152,8 +152,9 @@
         case KActivities::Consumer::Running:
             if (m_previousServiceStatus != KActivities::Consumer::Running) {
 
-                if (!m_errorOverlay.isNull()) {
-                    m_errorOverlay.data()->deleteLater();
+                if (m_errorOverlay) {
+                    m_errorOverlay->deleteLater();
+                    m_errorOverlay = nullptr;
                     if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Solid.PowerManagement")) {
                         onServiceRegistered("org.kde.Solid.PowerManagement");
                     } else {
@@ -164,8 +165,8 @@
                 populateTabs();
             }
 
-            if (m_messageWidget.data()->isVisible()) {
-                m_messageWidget.data()->hide();
+            if (m_messageWidget->isVisible()) {
+                m_messageWidget->hide();
             }
 
             break;
@@ -223,8 +224,9 @@
 {
     Q_UNUSED(service);
 
-    if (!m_errorOverlay.isNull()) {
-        m_errorOverlay.data()->deleteLater();
+    if (m_errorOverlay) {
+        m_errorOverlay->deleteLater();
+        m_errorOverlay = nullptr;
     }
 }
 
@@ -232,7 +234,7 @@
 {
     Q_UNUSED(service);
 
-    if (!m_errorOverlay.isNull()) {
+    if (m_errorOverlay) {
         return;
     }
 
Index: kcmodule/global/GeneralPage.h
===================================================================
--- kcmodule/global/GeneralPage.h
+++ kcmodule/global/GeneralPage.h
@@ -44,7 +44,7 @@
     void onServiceUnregistered(const QString &service);
 
 private:
-    QWeakPointer< ErrorOverlay > m_errorOverlay;
+    ErrorOverlay *m_errorOverlay = nullptr;
 };
 
 #endif /* GENERALPAGE_H */
Index: kcmodule/global/GeneralPage.cpp
===================================================================
--- kcmodule/global/GeneralPage.cpp
+++ kcmodule/global/GeneralPage.cpp
@@ -187,8 +187,9 @@
 {
     Q_UNUSED(service);
 
-    if (!m_errorOverlay.isNull()) {
-        m_errorOverlay.data()->deleteLater();
+    if (m_errorOverlay) {
+        m_errorOverlay->deleteLater();
+        m_errorOverlay = nullptr;
     }
 }
 
@@ -196,8 +197,8 @@
 {
     Q_UNUSED(service);
 
-    if (!m_errorOverlay.isNull()) {
-        m_errorOverlay.data()->deleteLater();
+    if (m_errorOverlay) {
+        m_errorOverlay->deleteLater();
     }
 
     m_errorOverlay = new ErrorOverlay(this, i18n("The Power Management Service appears not to be running.\n"
Index: kcmodule/profiles/EditPage.h
===================================================================
--- kcmodule/profiles/EditPage.h
+++ kcmodule/profiles/EditPage.h
@@ -63,7 +63,7 @@
 private:
     KSharedConfig::Ptr m_profilesConfig;
     QHash< QString, bool > m_profileEdited;
-    QWeakPointer< ErrorOverlay > m_errorOverlay;
+    ErrorOverlay *m_errorOverlay = nullptr;
     QHash< QString, ActionEditWidget* > m_editWidgets;
 };
 
Index: kcmodule/profiles/EditPage.cpp
===================================================================
--- kcmodule/profiles/EditPage.cpp
+++ kcmodule/profiles/EditPage.cpp
@@ -258,8 +258,9 @@
         watcher->deleteLater();
     });
 
-    if (!m_errorOverlay.isNull()) {
-        m_errorOverlay.data()->deleteLater();
+    if (m_errorOverlay) {
+        m_errorOverlay->deleteLater();
+        m_errorOverlay = nullptr;
     }
 }
 
@@ -267,8 +268,8 @@
 {
     Q_UNUSED(service);
 
-    if (!m_errorOverlay.isNull()) {
-        m_errorOverlay.data()->deleteLater();
+    if (m_errorOverlay) {
+        m_errorOverlay->deleteLater();
     }
 
     m_errorOverlay = new ErrorOverlay(this, i18n("The Power Management Service appears not to be running.\n"