remove PackageMetadata usage

This commit is contained in:
Aaron Seigo 2011-05-31 00:07:13 +02:00
parent 2b771e41ed
commit 1ba57eb84c

View File

@ -292,10 +292,6 @@ QString AbstractRunner::name() const
return d->runnerDescription.name(); return d->runnerDescription.name();
} }
if (d->package) {
return d->package->metadata().name();
}
return objectName(); return objectName();
} }
@ -305,10 +301,6 @@ QIcon AbstractRunner::icon() const
return KIcon(d->runnerDescription.icon()); return KIcon(d->runnerDescription.icon());
} }
if (d->package) {
return KIcon(d->package->metadata().icon());
}
return QIcon(); return QIcon();
} }
@ -318,10 +310,6 @@ QString AbstractRunner::id() const
return d->runnerDescription.pluginName(); return d->runnerDescription.pluginName();
} }
if (d->package) {
return d->package->metadata().pluginName();
}
return objectName(); return objectName();
} }
@ -331,10 +319,6 @@ QString AbstractRunner::description() const
return d->runnerDescription.property("Comment").toString(); return d->runnerDescription.property("Comment").toString();
} }
if (d->package) {
return d->package->metadata().description();
}
return objectName(); return objectName();
} }
@ -464,7 +448,7 @@ void AbstractRunnerPrivate::setupScriptSupport()
QString translationsPath = package->filePath("translations"); QString translationsPath = package->filePath("translations");
if (!translationsPath.isEmpty()) { if (!translationsPath.isEmpty()) {
KGlobal::dirs()->addResourceDir("locale", translationsPath); KGlobal::dirs()->addResourceDir("locale", translationsPath);
KGlobal::locale()->insertCatalog(package->metadata().pluginName()); KGlobal::locale()->insertCatalog(runnerDescription.pluginName());
} }
} }