Commit 6c40ed4c authored by David Edmundson's avatar David Edmundson

warnings--

Summary:
KAboutData::setProgramIconName isn't used in the AboutData dialog box,
instead the generic QApplication icon name is used.

Therefore there's little point setting it. It was also used by classic
mode to create an icon in the config page that it has, but we can do
that directly.

Test Plan:
Compiles
Looked at module about data
Looked at settings page

Reviewers: #plasma, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D18489
parent da729d54
......@@ -82,7 +82,6 @@ void CategoryList::updatePixmap()
{
QString content;
QString moduleName;
KIconLoader * iconL = KIconLoader::global();
d->itemMap.clear();
const QString templatePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("systemsettings/classic/main.html") );
......
......@@ -71,7 +71,6 @@ ClassicMode::ClassicMode( QObject * parent, const QVariantList& )
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 @@ void ClassicMode::addConfiguration( KConfigDialog * config )
{
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()
......
......@@ -129,11 +129,7 @@ const KAboutData * ModuleView::aboutData() const
if( activeModule ) {
aboutData = const_cast<KAboutData*>( activeModule->aboutData() );
}
if ( aboutData ) {
aboutData->setProgramIconName( activeModule->moduleInfo().service()->icon() );
return aboutData;
}
return nullptr;
return aboutData;
}
void ModuleView::loadModule( const QModelIndex &menuItem )
......
......@@ -61,7 +61,6 @@ IconMode::IconMode( QObject *parent, const QVariantList& )
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" ) );
......
......@@ -36,6 +36,7 @@ SidebarDelegate::~SidebarDelegate()
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);
}
......
......@@ -265,7 +265,6 @@ SidebarMode::SidebarMode( QObject *parent, const QVariantList& )
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<QAction>();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment