Changeset View
Changeset View
Standalone View
Standalone View
kcmkwin/kwindesktop/main.cpp
| Show First 20 Lines • Show All 565 Lines • ▼ Show 20 Line(s) | 549 | { | |||
|---|---|---|---|---|---|
| 566 | } | 566 | } | ||
| 567 | auto showDialog = [this](const KAboutData &aboutData) { | 567 | auto showDialog = [this](const KAboutData &aboutData) { | ||
| 568 | QPointer<KAboutApplicationDialog> aboutPlugin = new KAboutApplicationDialog(aboutData, this); | 568 | QPointer<KAboutApplicationDialog> aboutPlugin = new KAboutApplicationDialog(aboutData, this); | ||
| 569 | aboutPlugin->exec(); | 569 | aboutPlugin->exec(); | ||
| 570 | delete aboutPlugin; | 570 | delete aboutPlugin; | ||
| 571 | }; | 571 | }; | ||
| 572 | if (fromKService) { | 572 | if (fromKService) { | ||
| 573 | KServiceTypeTrader* trader = KServiceTypeTrader::self(); | 573 | KServiceTypeTrader* trader = KServiceTypeTrader::self(); | ||
| 574 | KService::List services; | 574 | const KService::List services = trader->query( | ||
| 575 | services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_" + effect + '\''); | 575 | QStringLiteral("KWin/Effect"), | ||
| 576 | if (services.isEmpty()) | 576 | QStringLiteral("[X-KDE-PluginInfo-Name] == 'kwin4_effect_%1'").arg(effect)); | ||
apol: Why did you change how the string is constructed? | |||||
IMHO, that's more cleaner. But, yeah, that's most likely unrelated change. zzag: IMHO, that's more cleaner. But, yeah, that's most likely unrelated change. | |||||
| 577 | if (services.isEmpty()) { | ||||
| 577 | return; | 578 | return; | ||
| 578 | KPluginInfo pluginInfo(services.first()); | 579 | } | ||
| 580 | const QString effectPluginPath = QStandardPaths::locate( | ||||
| 581 | QStandardPaths::GenericDataLocation, | ||||
| 582 | QStringLiteral("kservices5/") + services.first()->entryPath(), | ||||
| 583 | QStandardPaths::LocateFile); | ||||
| 584 | const KPluginInfo pluginInfo(effectPluginPath); | ||||
| 579 | 585 | | |||
| 580 | const QString name = pluginInfo.name(); | 586 | const QString name = pluginInfo.name(); | ||
| 581 | const QString comment = pluginInfo.comment(); | 587 | const QString comment = pluginInfo.comment(); | ||
| 582 | const QString author = pluginInfo.author(); | 588 | const QString author = pluginInfo.author(); | ||
| 583 | const QString email = pluginInfo.email(); | 589 | const QString email = pluginInfo.email(); | ||
| 584 | const QString website = pluginInfo.website(); | 590 | const QString website = pluginInfo.website(); | ||
| 585 | const QString version = pluginInfo.version(); | 591 | const QString version = pluginInfo.version(); | ||
| 586 | const QString license = pluginInfo.license(); | 592 | const QString license = pluginInfo.license(); | ||
| ▲ Show 20 Lines • Show All 76 Lines • Show Last 20 Lines | |||||
Why did you change how the string is constructed?