Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: remove unused private class

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-12 02:56:54 +03:00
parent fca678651b
commit 4f448f84ec
2 changed files with 13 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plasma/applets/kickoff/applet/applet.cpp
View file

@ -196,9 +196,10 @@ void LauncherApplet::createConfigurationInterface(KConfigDialog *parent)
d->ui.setupUi(widget);
parent->addPage(widget, i18nc("General configuration page", "General"), icon());
const QList<KPluginInfo> 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

48
plasma/applets/kickoff/core/krunnermodel.cpp
View file

@ -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<Plasma::QueryMatch>)),
this,
SLOT(matchesChanged(QList<Plasma::QueryMatch>)));
connect(
runnerManager(), SIGNAL(matchesChanged(QList<Plasma::QueryMatch>)),
this, SLOT(matchesChanged(QList<Plasma::QueryMatch>))
);
}
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()) {