diff --git a/kcms/ksplash/kcm.h b/kcms/ksplash/kcm.h --- a/kcms/ksplash/kcm.h +++ b/kcms/ksplash/kcm.h @@ -21,7 +21,7 @@ #ifndef _KCM_SEARCH_H #define _KCM_SEARCH_H -#include +#include #include class QStandardItemModel; @@ -62,7 +62,7 @@ private: void loadModel(); - QList availablePackages(const QString &component); + QList availablePackages(const QString &component); SplashScreenSettings *m_settings; QStandardItemModel *m_model; diff --git a/kcms/ksplash/kcm.cpp b/kcms/ksplash/kcm.cpp --- a/kcms/ksplash/kcm.cpp +++ b/kcms/ksplash/kcm.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include @@ -63,9 +63,9 @@ loadModel(); } -QList KCMSplashScreen::availablePackages(const QString &component) +QList KCMSplashScreen::availablePackages(const QString &component) { - QList packages; + QList packages; QStringList paths; const QStringList dataPaths = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); @@ -75,9 +75,9 @@ } for (const QString &path : paths) { - Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); + KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); pkg.setPath(path); - pkg.setFallbackPackage(Plasma::Package()); + pkg.setFallbackPackage(KPackage::Package()); if (component.isEmpty() || !pkg.filePath(component.toUtf8()).isEmpty()) { packages << pkg; } @@ -111,12 +111,12 @@ { m_model->clear(); - const QList pkgs = availablePackages(QStringLiteral("splashmainscript")); - for (const Plasma::Package &pkg : pkgs) { + const QList pkgs = availablePackages(QStringLiteral("splashmainscript")); + for (const KPackage::Package &pkg : pkgs) { QStandardItem* row = new QStandardItem(pkg.metadata().name()); - row->setData(pkg.metadata().pluginName(), PluginNameRole); + row->setData(pkg.metadata().pluginId(), PluginNameRole); row->setData(pkg.filePath("previews", QStringLiteral("splash.png")), ScreenshotRole); - row->setData(pkg.metadata().comment(), DescriptionRole); + row->setData(pkg.metadata().description(), DescriptionRole); m_model->appendRow(row); } m_model->sort(0 /*column*/);