diff --git a/classic/CategoryList.cpp b/classic/CategoryList.cpp --- a/classic/CategoryList.cpp +++ b/classic/CategoryList.cpp @@ -82,7 +82,6 @@ { QString content; QString moduleName; - KIconLoader * iconL = KIconLoader::global(); d->itemMap.clear(); const QString templatePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("systemsettings/classic/main.html") ); diff --git a/classic/ClassicMode.cpp b/classic/ClassicMode.cpp --- a/classic/ClassicMode.cpp +++ b/classic/ClassicMode.cpp @@ -71,7 +71,6 @@ i18n("(c) 2009, Ben Cooksley")); d->aboutClassic->addAuthor(i18n("Ben Cooksley"), i18n("Author"), QStringLiteral("bcooksley@kde.org")); d->aboutClassic->addAuthor(i18n("Mathias Soeken"), i18n("Developer"), QStringLiteral("msoeken@informatik.uni-bremen.de")); - d->aboutClassic->setProgramIconName(QStringLiteral("view-list-tree")); } ClassicMode::~ClassicMode() @@ -250,7 +249,7 @@ { QWidget * configWidget = new QWidget( config ); d->classicConfig.setupUi( configWidget ); - config->addPage( configWidget, i18n("Tree View"), aboutData()->programIconName() ); + config->addPage( configWidget, i18n("Tree View"), QStringLiteral("view-list-tree") ); } void ClassicMode::loadConfiguration() diff --git a/core/ModuleView.cpp b/core/ModuleView.cpp --- a/core/ModuleView.cpp +++ b/core/ModuleView.cpp @@ -129,11 +129,7 @@ if( activeModule ) { aboutData = const_cast( activeModule->aboutData() ); } - if ( aboutData ) { - aboutData->setProgramIconName( activeModule->moduleInfo().service()->icon() ); - return aboutData; - } - return nullptr; + return aboutData; } void ModuleView::loadModule( const QModelIndex &menuItem ) diff --git a/icons/IconMode.cpp b/icons/IconMode.cpp --- a/icons/IconMode.cpp +++ b/icons/IconMode.cpp @@ -61,7 +61,6 @@ KAboutLicense::GPL, i18n( "(c) 2009, Ben Cooksley" ) ); d->aboutIcon->addAuthor( i18n( "Ben Cooksley" ), i18n( "Author" ), QStringLiteral("bcooksley@kde.org") ); d->aboutIcon->addAuthor( i18n( "Mathias Soeken" ), i18n( "Developer" ), QStringLiteral("msoeken@informatik.uni-bremen.de") ); - d->aboutIcon->setProgramIconName( QStringLiteral("view-list-icons") ); d->backAction = KStandardAction::back( this, SLOT(backToOverview()), this ); d->backAction->setText( i18n( "All Settings" ) ); diff --git a/sidebar/SidebarDelegate.cpp b/sidebar/SidebarDelegate.cpp --- a/sidebar/SidebarDelegate.cpp +++ b/sidebar/SidebarDelegate.cpp @@ -36,6 +36,7 @@ QSize SidebarDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { + Q_UNUSED(index) return QSize(option.decorationSize.width() + s_margin * 2, option.decorationSize.height() + s_margin * 2); } diff --git a/sidebar/SidebarMode.cpp b/sidebar/SidebarMode.cpp --- a/sidebar/SidebarMode.cpp +++ b/sidebar/SidebarMode.cpp @@ -265,7 +265,6 @@ d->aboutIcon->addAuthor( i18n( "Marco Martin" ), i18n( "Author" ), QStringLiteral("mart@kde.org") ); d->aboutIcon->addAuthor( i18n( "Ben Cooksley" ), i18n( "Author" ), QStringLiteral("bcooksley@kde.org") ); d->aboutIcon->addAuthor( i18n( "Mathias Soeken" ), i18n( "Developer" ), QStringLiteral("msoeken@informatik.uni-bremen.de") ); - d->aboutIcon->setProgramIconName( QStringLiteral("view-sidetree") ); qmlRegisterType(); }