Port away from deprecated functions which are obsolete or were replaced

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
master^2
Björn Bidar 2 years ago
parent d43763156c
commit d2b246fd36
  1. 2
      config.cpp
  2. 17
      pass.cpp

@ -25,7 +25,7 @@
#include "kcmutils_version.h" #include "kcmutils_version.h"
#include "config.h" #include "config.h"
K_PLUGIN_FACTORY(PassConfigFactory, registerPlugin<PassConfig>("kcm_krunner_pass");) K_PLUGIN_FACTORY_WITH_JSON(PassConfigFactory, "pass.json", registerPlugin<PassConfig>();)
PassConfigForm::PassConfigForm(QWidget *parent) PassConfigForm::PassConfigForm(QWidget *parent)
: QWidget(parent) : QWidget(parent)

@ -45,7 +45,6 @@ Pass::Pass(QObject *parent, const KPluginMetaData &metaData, const QVariantList
{ {
// General runner configuration // General runner configuration
setObjectName(QStringLiteral("Pass")); setObjectName(QStringLiteral("Pass"));
setSpeed(AbstractRunner::NormalSpeed);
setPriority(HighestPriority); setPriority(HighestPriority);
} }
@ -53,7 +52,7 @@ Pass::~Pass() = default;
void Pass::reloadConfiguration() void Pass::reloadConfiguration()
{ {
clearActions(); //clearActions(); deprecated, needed?
orderedActions.clear(); orderedActions.clear();
KConfigGroup cfg = config(); KConfigGroup cfg = config();
@ -62,15 +61,15 @@ void Pass::reloadConfiguration()
if (showActions) { if (showActions) {
const auto configActions = cfg.group(Config::Group::Actions); const auto configActions = cfg.group(Config::Group::Actions);
// Create actions for every additional field
const auto configActionsList = configActions.groupList(); const auto configActionsList = configActions.groupList();
for (const auto &name: configActionsList) { for (const auto &name: configActionsList) {
auto group = configActions.group(name); auto group = configActions.group(name);
// FIXME how to fallback?
auto passAction = PassAction::fromConfig(group); auto passAction = PassAction::fromConfig(group);
auto icon = QIcon::fromTheme(passAction.icon, QIcon::fromTheme("object-unlocked")); auto icon = QIcon::fromTheme(passAction.icon, QIcon::fromTheme("object-unlocked"));
QAction *act = addAction(passAction.name, icon, passAction.name); //KRunner::Action(actionId, QStringLiteral("process-stop"), i18n("Send SIGKILL")),
auto *act = new QAction(icon, passAction.name, this);
act->setData(passAction.regex); act->setData(passAction.regex);
this->orderedActions << act; this->orderedActions << act;
} }
@ -80,8 +79,8 @@ void Pass::reloadConfiguration()
} }
if (cfg.readEntry(Config::showFileContentAction, false)) { if (cfg.readEntry(Config::showFileContentAction, false)) {
QAction *act = addAction(Config::showFileContentAction, QIcon::fromTheme("document-new"), auto *act = new QAction(QIcon::fromTheme("document-new"),
i18n("Show password file contents")); i18n("Show password file contents"), this);
act->setData(Config::showFileContentAction); act->setData(Config::showFileContentAction);
this->orderedActions << act; this->orderedActions << act;
} }
@ -174,8 +173,8 @@ void Pass::match(Plasma::RunnerContext &context)
for (const auto &password: qAsConst(passwords)) { for (const auto &password: qAsConst(passwords)) {
if (password.contains(input, Qt::CaseInsensitive)) { if (password.contains(input, Qt::CaseInsensitive)) {
Plasma::QueryMatch match(this); Plasma::QueryMatch match(this);
match.setType(input.length() == password.length() ? match.setCategoryRelevance(input.length() == password.length() ? Plasma::QueryMatch::CategoryRelevance::Highest :
Plasma::QueryMatch::ExactMatch : Plasma::QueryMatch::CompletionMatch); Plasma::QueryMatch::CategoryRelevance::Moderate);
match.setIcon(QIcon::fromTheme("object-locked")); match.setIcon(QIcon::fromTheme("object-locked"));
match.setText(password); match.setText(password);
matches.append(match); matches.append(match);

Loading…
Cancel
Save