From 713324011a080d0ea16db8cb9cf7b8c030b651e7 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 28 Oct 2015 05:39:38 +0200
Subject: [PATCH] generic: stop using obsolete code paths

---
 kcontrol/componentchooser/componentchooserfilemanager.cpp | 2 +-
 libs/plasmagenericshell/backgrounddialog.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kcontrol/componentchooser/componentchooserfilemanager.cpp b/kcontrol/componentchooser/componentchooserfilemanager.cpp
index 4c730b01..c73e1a30 100644
--- a/kcontrol/componentchooser/componentchooserfilemanager.cpp
+++ b/kcontrol/componentchooser/componentchooserfilemanager.cpp
@@ -76,7 +76,7 @@ void CfgFileManager::load(KConfig *) {
 void CfgFileManager::save(KConfig *)
 {
     QString storageId;
-    Q_FOREACH(QRadioButton* button, qFindChildren<QRadioButton*>(this)) {
+    Q_FOREACH(QRadioButton* button, this->findChildren<QRadioButton*>()) {
         if (button->isChecked()) {
             storageId = button->property("storageId").toString();
         }
diff --git a/libs/plasmagenericshell/backgrounddialog.cpp b/libs/plasmagenericshell/backgrounddialog.cpp
index d5e3232e..2f9a3a36 100644
--- a/libs/plasmagenericshell/backgrounddialog.cpp
+++ b/libs/plasmagenericshell/backgrounddialog.cpp
@@ -116,7 +116,7 @@ void AppletDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option
                Qt::AlignTop | Qt::AlignLeft, description);
 
     // Main icon
-    const QIcon& icon = qVariantValue<QIcon>(index.model()->data(index, Qt::DecorationRole));
+    const QIcon& icon = qvariant_cast<QIcon>(index.model()->data(index, Qt::DecorationRole));
     icon.paint(&p,
         leftToRight ? left + UNIVERSAL_PADDING : left + width - UNIVERSAL_PADDING - MAIN_ICON_SIZE,
         top + UNIVERSAL_PADDING, MAIN_ICON_SIZE, MAIN_ICON_SIZE, Qt::AlignCenter, iconMode);
-- 
2.11.0