diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,7 @@ endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) add_definitions(-DQT_NO_FOREACH) # Subdirectories diff --git a/src/abstractrunner.h b/src/abstractrunner.h --- a/src/abstractrunner.h +++ b/src/abstractrunner.h @@ -33,6 +33,7 @@ #include "runnercontext.h" #include "runnersyntax.h" #include +#include // for PLASMA_ENABLE_DEPRECATED_SINCE class QAction; class QMimeData; @@ -242,15 +243,18 @@ */ QIcon icon() const; +#if PLASMA_ENABLE_DEPRECATED_SINCE(5, 28) // Plasma::Package is defined with this condition /** * Accessor for the associated Package object if any. * * Note that the returned pointer is only valid for the lifetime of * the runner. * * @return the Package object, which may be invalid + * @deprecated since 5.28, use KPackage::Package instead, no accessor in this class **/ Package package() const; +#endif /** * Signal runner to reload its configuration. diff --git a/src/abstractrunner.cpp b/src/abstractrunner.cpp --- a/src/abstractrunner.cpp +++ b/src/abstractrunner.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "querymatch.h" #include "runnercontext.h" @@ -323,11 +324,12 @@ return d->runnerDescription; } +#if PLASMA_ENABLE_DEPRECATED_SINCE(5, 28) // Plasma::Package is defined with this condition Package AbstractRunner::package() const { - return d->package ? *d->package : Package(); + return Package(); } - +#endif void AbstractRunner::init() { @@ -360,17 +362,14 @@ blackListed(RunnerContext::None), runner(r), fastRuns(0), - package(nullptr), defaultSyntax(nullptr), hasRunOptions(false), suspendMatching(false) { } AbstractRunnerPrivate::~AbstractRunnerPrivate() { - delete package; - package = nullptr; } void AbstractRunnerPrivate::init(const KService::Ptr service) diff --git a/src/abstractrunner_p.h b/src/abstractrunner_p.h --- a/src/abstractrunner_p.h +++ b/src/abstractrunner_p.h @@ -44,7 +44,6 @@ AbstractRunner *runner; int fastRuns; QReadWriteLock speedLock; - Package *package; QHash actions; QList syntaxes; RunnerSyntax *defaultSyntax;