alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qml/plasmoid/containmentinterface.cpp - fix compile with Qt5.6

Browse Source
This commit is contained in:
Allen Winter 2017-02-20 11:36:55 -05:00
parent f684e6b2e0
commit c4b01b0155
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -509,9 +509,9 @@ void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y, KI
foreach (const KPluginInfo &info, seenPlugins) { foreach (const KPluginInfo &info, seenPlugins) {
QAction *action; QAction *action;
if (!info.icon().isEmpty()) { if (!info.icon().isEmpty()) {
action = new QAction(QIcon::fromTheme(info.icon()), info.name()); action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
} else { } else {
action = new QAction(info.name()); action = new QAction(info.name(), nullptr);
} }
extraActions << action; extraActions << action;
if (choices) { if (choices) {
@ -623,11 +623,11 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
choices->addSection(i18n("Plasma Package")); choices->addSection(i18n("Plasma Package"));
installPlasmaPackageAction = choices->addAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install")); installPlasmaPackageAction = choices->addAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install"));
} else { } else {
QAction *action = new QAction(i18n("Plasma Package")); QAction *action = new QAction(i18n("Plasma Package"), nullptr);
action->setSeparator(true); action->setSeparator(true);
dropActions << action; dropActions << action;
installPlasmaPackageAction = new QAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install")); installPlasmaPackageAction = new QAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install"), nullptr);
Q_ASSERT(dropJob); Q_ASSERT(dropJob);
dropActions << installPlasmaPackageAction; dropActions << installPlasmaPackageAction;
dropJob->setApplicationActions(dropActions); dropJob->setApplicationActions(dropActions);
@ -673,7 +673,7 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
if (choices) { if (choices) {
choices->addSection(i18n("Widgets")); choices->addSection(i18n("Widgets"));
} else { } else {
QAction *action = new QAction(i18n("Widgets")); QAction *action = new QAction(i18n("Widgets"), nullptr);
action->setSeparator(true); action->setSeparator(true);
dropActions << action; dropActions << action;
} }
@ -681,9 +681,9 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
qDebug() << info.name(); qDebug() << info.name();
QAction *action; QAction *action;
if (!info.icon().isEmpty()) { if (!info.icon().isEmpty()) {
action = new QAction(QIcon::fromTheme(info.icon()), info.name()); action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
} else { } else {
action = new QAction(info.name()); action = new QAction(info.name(), nullptr);
} }
if (choices) { if (choices) {
@ -699,7 +699,7 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
}); });
} }
{ {
QAction *action = new QAction(i18n("Icon")); QAction *action = new QAction(i18n("Icon"), nullptr);
if (choices) { if (choices) {
choices->addAction(action); choices->addAction(action);
} }
@ -717,7 +717,7 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
if (choices) { if (choices) {
choices->addSection(i18n("Wallpaper")); choices->addSection(i18n("Wallpaper"));
} else { } else {
QAction *action = new QAction(i18n("Wallpaper")); QAction *action = new QAction(i18n("Wallpaper"), nullptr);
action->setSeparator(true); action->setSeparator(true);
dropActions << action; dropActions << action;
} }
@ -730,9 +730,9 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
foreach (const KPluginInfo &info, wallpaperList) { foreach (const KPluginInfo &info, wallpaperList) {
QAction *action; QAction *action;
if (!info.icon().isEmpty()) { if (!info.icon().isEmpty()) {
action = new QAction(QIcon::fromTheme(info.icon()), info.name()); action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
} else { } else {
action = new QAction(info.name()); action = new QAction(info.name(), nullptr);
} }
if (choices) { if (choices) {
@ -761,11 +761,11 @@ void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimet
choices->addSection(i18n("Widgets")); choices->addSection(i18n("Widgets"));
action = choices->addAction(i18n("Icon")); action = choices->addAction(i18n("Icon"));
} else { } else {
QAction *sep = new QAction(i18n("Widgets")); QAction *sep = new QAction(i18n("Widgets"), nullptr);
sep->setSeparator(true); sep->setSeparator(true);
dropActions << sep; dropActions << sep;
// we can at least create an icon as a link to the URL // we can at least create an icon as a link to the URL
action = new QAction(i18n("Icon")); action = new QAction(i18n("Icon"), nullptr);
dropActions << action; dropActions << action;
} }