Use KPluginMetaData::fileName instead of KPluginMetaData::metaDataFileName

In KF6, the latter does not exist anymore and without desktoptojson compat code in KPackage, the values are the same anyway
master
Alexander Lohnau 2 years ago
parent 693ea96599
commit 34008b9dbd

@ -139,7 +139,7 @@ void Module::save()
PackageStructure *structure = PackageLoader::self()->loadPackageStructure(QStringLiteral("KWin/Script"));
for (const KPluginMetaData &info : std::as_const(m_pendingDeletions)) {
// We can get the package root from the entry path
QDir root = QFileInfo(info.metaDataFileName()).dir();
QDir root = QFileInfo(info.fileName()).dir();
root.cdUp();
KJob *uninstallJob = Package(structure).uninstall(info.pluginId(), root.absolutePath());
connect(uninstallJob, &KJob::result, this, [this, uninstallJob]() {

@ -38,7 +38,7 @@ public:
Q_INVOKABLE void togglePendingDeletion(const KPluginMetaData &data);
Q_INVOKABLE bool canDeleteEntry(const KPluginMetaData &data)
{
return QFileInfo(data.metaDataFileName()).isWritable();
return QFileInfo(data.fileName()).isWritable();
}
QList<KPluginMetaData> pendingDeletions()

@ -58,7 +58,7 @@ void AuroraePackage::pathChanged(KPackage::Package *package)
return;
}
KPluginMetaData md(package->metadata().metaDataFileName());
KPluginMetaData md(package->metadata().fileName());
if (!md.pluginId().isEmpty()) {
QString configrc = md.pluginId() + "rc";

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

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

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

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

Loading…
Cancel
Save