From 4f448f84ec9ffb573c7d268598255d3ba8b7e1d6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 12 Apr 2024 02:56:54 +0300 Subject: [PATCH] plasma: remove unused private class Signed-off-by: Ivailo Monev --- plasma/applets/kickoff/applet/applet.cpp | 5 +- plasma/applets/kickoff/core/krunnermodel.cpp | 48 ++++---------------- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/plasma/applets/kickoff/applet/applet.cpp b/plasma/applets/kickoff/applet/applet.cpp index faa5f8a8..9f82c47f 100644 --- a/plasma/applets/kickoff/applet/applet.cpp +++ b/plasma/applets/kickoff/applet/applet.cpp @@ -196,9 +196,10 @@ void LauncherApplet::createConfigurationInterface(KConfigDialog *parent) d->ui.setupUi(widget); parent->addPage(widget, i18nc("General configuration page", "General"), icon()); + const QList plugins = Plasma::RunnerManager::listRunnerInfo(); d->selector = new KPluginSelector(widget); d->selector->addPlugins( - Plasma::RunnerManager::listRunnerInfo(), + plugins, KPluginSelector::ReadConfigFile, i18n("Available Plugins"), QString(), Kickoff::componentData().config() @@ -206,7 +207,7 @@ void LauncherApplet::createConfigurationInterface(KConfigDialog *parent) connect(d->selector, SIGNAL(changed(bool)), parent, SLOT(settingsModified())); parent->addPage(d->selector, i18n("Runners"), "preferences-plugin"); - foreach (const KPluginInfo& plugin, Plasma::RunnerManager::listRunnerInfo()) { + foreach (const KPluginInfo& plugin, plugins) { Kickoff::KRunnerModel::runnerManager()->loadRunner(plugin.service()); } // HACK: setup tooltips for the plugins diff --git a/plasma/applets/kickoff/core/krunnermodel.cpp b/plasma/applets/kickoff/core/krunnermodel.cpp index 32bf1d1b..6c7ebbb6 100644 --- a/plasma/applets/kickoff/core/krunnermodel.cpp +++ b/plasma/applets/kickoff/core/krunnermodel.cpp @@ -41,9 +41,9 @@ using namespace Kickoff; -Plasma::RunnerManager * _runnerManager = NULL; +Plasma::RunnerManager* _runnerManager = nullptr; -KService::Ptr serviceForUrl(const KUrl & url) +static KService::Ptr serviceForUrl(const KUrl &url) { QString runner = url.host(); QString id = url.path(); @@ -53,7 +53,7 @@ KService::Ptr serviceForUrl(const KUrl & url) } if (runner != QLatin1String("services")) { - return KService::Ptr(NULL); + return KService::Ptr(nullptr); } // URL path example: services_kde4-kate.desktop @@ -63,26 +63,6 @@ KService::Ptr serviceForUrl(const KUrl & url) return KService::serviceByStorageId(id); } - -class ResultItem { -public: - ResultItem() - { - } - - ResultItem(QIcon _icon, QString _name, QString _description, QVariant _data) - : icon(_icon), - name(_name), - description(_description), - data(_data) - { - } - - QIcon icon; - QString name, description; - QVariant data; -}; - bool KRunnerItemHandler::openUrl(const KUrl& url) { QString runner = url.host(); @@ -107,14 +87,6 @@ bool KRunnerItemHandler::openUrl(const KUrl& url) class KRunnerModel::Private { public: - Private() - { - } - - ~Private() - { - } - QBasicTimer searchDelay; QString searchQuery; DisplayOrder displayOrder; @@ -124,10 +96,10 @@ KRunnerModel::KRunnerModel(QObject *parent) : KickoffModel(parent) , d(new Private()) { - connect(runnerManager(), - SIGNAL(matchesChanged(QList)), - this, - SLOT(matchesChanged(QList))); + connect( + runnerManager(), SIGNAL(matchesChanged(QList)), + this, SLOT(matchesChanged(QList)) + ); } KRunnerModel::~KRunnerModel() @@ -199,7 +171,7 @@ Qt::ItemFlags KRunnerModel::flags(const QModelIndex &index) const KUrl url = data(index, UrlRole).toString(); QString host = url.host(); if (host != "services") { - flags &= ~ ( Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled ); + flags &= ~ (Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); } } else { flags = 0; @@ -212,7 +184,7 @@ QMimeData * KRunnerModel::mimeData(const QModelIndexList &indexes) const { KUrl::List urls; - foreach (const QModelIndex & index, indexes) { + foreach (const QModelIndex &index, indexes) { KUrl url = data(index, UrlRole).toString(); KService::Ptr service = serviceForUrl(url); @@ -234,7 +206,7 @@ QMimeData * KRunnerModel::mimeData(const QModelIndexList &indexes) const Plasma::RunnerManager* KRunnerModel::runnerManager() { - if (_runnerManager == NULL) { + if (!_runnerManager) { KConfigGroup conf = componentData().config()->group("Plugins"); QStringList allowed; foreach (KPluginInfo plugin, Plasma::RunnerManager::listRunnerInfo()) {