diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp index 74486144f..935bf430c 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -529,28 +529,6 @@ QtScriptResolver::saveConfig() } -QWidget* -QtScriptResolver::findWidget(QWidget* widget, const QString& objectName) -{ - if( !widget || !widget->isWidgetType() ) - return 0; - - if( widget->objectName() == objectName ) - return widget; - - - foreach( QObject* child, widget->children() ) - { - QWidget* found = findWidget(qobject_cast< QWidget* >( child ), objectName); - - if( found ) - return found; - } - - return 0; -} - - QVariant QtScriptResolver::widgetData(QWidget* widget, const QString& property) { @@ -589,7 +567,7 @@ QtScriptResolver::loadDataFromWidgets() QVariantMap data = dataWidget.toMap(); QString widgetName = data["widget"].toString(); - QWidget* widget= findWidget( m_configWidget.data(), widgetName ); + QWidget* widget= m_configWidget->findChild< QWidget* >( widgetName ); QVariant value = widgetData( widget, data["property"].toString() ); @@ -606,7 +584,7 @@ QtScriptResolver::fillDataInWidgets( const QVariantMap& data ) foreach(const QVariant& dataWidget, m_dataWidgets) { QString widgetName = dataWidget.toMap()["widget"].toString(); - QWidget* widget= findWidget( m_configWidget.data(), widgetName ); + QWidget* widget= m_configWidget->find< QWidget* >( widgetName ); if( !widget ) { tLog() << Q_FUNC_INFO << "Widget specified in resolver was not found:" << widgetName; diff --git a/src/libtomahawk/resolvers/QtScriptResolver.h b/src/libtomahawk/resolvers/QtScriptResolver.h index 392f29ecc..f2624f200 100644 --- a/src/libtomahawk/resolvers/QtScriptResolver.h +++ b/src/libtomahawk/resolvers/QtScriptResolver.h @@ -154,7 +154,6 @@ private: void init(); void loadUi(); - QWidget* findWidget( QWidget* widget, const QString& objectName ); void setWidgetData( const QVariant& value, QWidget* widget, const QString& property ); QVariant widgetData( QWidget* widget, const QString& property ); QVariantMap loadDataFromWidgets();