Port to KPluginMetaData::fromJsonFile()

KPluginMetaData::KPluginMetaData(QString) assumes that the file
specified in the string corresponds to a binary plugin now, not a
metadata file.

This fixes scripted effect kcms not working.
remotes/origin/work/zamundaaa/better-confinement
Vlad Zahorodnii 3 years ago
parent f88ff99d82
commit 25440385e7
  1. 2
      src/plugins/kdecorations/aurorae/src/aurorae.cpp
  2. 8
      src/plugins/kpackage/aurorae/aurorae.cpp
  3. 4
      src/plugins/kpackage/decoration/decoration.cpp
  4. 3
      src/plugins/kpackage/effect/effect.cpp
  5. 4
      src/plugins/kpackage/scripts/scripts.cpp
  6. 4
      src/plugins/kpackage/windowswitcher/windowswitcher.cpp
  7. 2
      src/scripting/genericscriptedconfig.cpp

@ -751,7 +751,7 @@ void ConfigurationModule::initQml()
return;
}
KPluginMetaData metaData(packageRoot + QLatin1String("/metadata.json"));
const KPluginMetaData metaData = KPluginMetaData::fromJsonFile(packageRoot + QLatin1String("/metadata.json"));
if (!metaData.isValid()) {
return;
}

@ -58,12 +58,8 @@ void AuroraePackage::pathChanged(KPackage::Package *package)
return;
}
KPluginMetaData md(package->metadata().fileName());
if (!md.pluginId().isEmpty()) {
QString configrc = md.pluginId() + "rc";
package->addFileDefinition("configrc", configrc, i18n("Configuration file"));
}
const QString configrc = package->metadata().pluginId() + "rc";
package->addFileDefinition("configrc", configrc, i18n("Configuration file"));
}
K_PLUGIN_CLASS_WITH_JSON(AuroraePackage, "kwin-packagestructure-aurorae.json")

@ -35,9 +35,7 @@ void DecorationPackage::pathChanged(KPackage::Package *package)
return;
}
KPluginMetaData md(package->metadata().fileName());
QString mainScript = md.value("X-Plasma-MainScript");
const QString mainScript = package->metadata().value("X-Plasma-MainScript");
if (!mainScript.isEmpty()) {
package->addFileDefinition("mainscript", mainScript, i18n("Main Script File"));
}

@ -36,8 +36,7 @@ void EffectPackageStructure::pathChanged(KPackage::Package *package)
return;
}
const KPluginMetaData md(package->metadata().fileName());
const QString mainScript = md.value("X-Plasma-MainScript");
const QString mainScript = package->metadata().value("X-Plasma-MainScript");
if (mainScript.isEmpty()) {
return;
}

@ -35,9 +35,7 @@ void ScriptsPackage::pathChanged(KPackage::Package *package)
return;
}
KPluginMetaData md(package->metadata().fileName());
QString mainScript = md.value("X-Plasma-MainScript");
const QString mainScript = package->metadata().value("X-Plasma-MainScript");
if (!mainScript.isEmpty()) {
package->addFileDefinition("mainscript", mainScript, i18n("Main Script File"));
}

@ -35,9 +35,7 @@ void SwitcherPackage::pathChanged(KPackage::Package *package)
return;
}
KPluginMetaData md(package->metadata().fileName());
QString mainScript = md.value("X-Plasma-MainScript");
const QString mainScript = package->metadata().value("X-Plasma-MainScript");
if (!mainScript.isEmpty()) {
package->addFileDefinition("mainscript", mainScript, i18n("Main Script File"));
}

@ -70,7 +70,7 @@ void GenericScriptedConfig::createUi()
return;
}
KPluginMetaData metaData(packageRoot + QLatin1String("/metadata.json"));
const KPluginMetaData metaData = KPluginMetaData::fromJsonFile(packageRoot + QLatin1String("/metadata.json"));
if (!metaData.isValid()) {
layout->addWidget(new QLabel(i18nc("Required file does not exist", "%1 does not contain a valid metadata.json file", qPrintable(packageRoot))));
return;

Loading…
Cancel
Save