diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.28 + DEPRECATION_VERSIONS 5.28 5.71 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/abstractrunner.h b/src/abstractrunner.h --- a/src/abstractrunner.h +++ b/src/abstractrunner.h @@ -146,21 +146,29 @@ */ void performMatch(Plasma::RunnerContext &context); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * If the runner has options that the user can interact with to modify * what happens when run or one of the actions created in match * is called, the runner should return true + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") bool hasRunOptions(); +#endif +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * If hasRunOptions() returns true, this method may be called to get * a widget displaying the options the user can interact with to modify * the behaviour of what happens when a given match is selected. * * @param widget the parent of the options widgets. + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") virtual void createRunOptions(QWidget *widget); +#endif /** * Called whenever an exact or possible match associated with this @@ -330,10 +338,14 @@ */ KConfigGroup config() const; +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * Sets whether or not the runner has options for matches + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") void setHasRunOptions(bool hasRunOptions); +#endif /** * Sets the nominal speed of the runner. Only slow runners need diff --git a/src/abstractrunner.cpp b/src/abstractrunner.cpp --- a/src/abstractrunner.cpp +++ b/src/abstractrunner.cpp @@ -208,20 +208,26 @@ return result; } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) bool AbstractRunner::hasRunOptions() { return d->hasRunOptions; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void AbstractRunner::setHasRunOptions(bool hasRunOptions) { d->hasRunOptions = hasRunOptions; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void AbstractRunner::createRunOptions(QWidget *parent) { - Q_UNUSED(parent); + Q_UNUSED(parent) } +#endif AbstractRunner::Speed AbstractRunner::speed() const { diff --git a/src/querymatch.h b/src/querymatch.h --- a/src/querymatch.h +++ b/src/querymatch.h @@ -287,21 +287,29 @@ */ void setSelectedAction(QAction *action); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * @return true if this match can be configured before being run * @since 4.3 + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") bool hasConfigurationInterface() const; +#endif +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * If hasConfigurationInterface() returns true, this method may be called to get * a widget displaying the options the user can interact with to modify * the behaviour of what happens when the match is run. * * @param widget the parent of the options widgets. * @since 4.3 + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") void createConfigurationInterface(QWidget *parent); +#endif private: QSharedDataPointer d; diff --git a/src/querymatch.cpp b/src/querymatch.cpp --- a/src/querymatch.cpp +++ b/src/querymatch.cpp @@ -333,17 +333,19 @@ } } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) bool QueryMatch::hasConfigurationInterface() const { - return d->runner && d->runner.data()->hasRunOptions(); + return false; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void QueryMatch::createConfigurationInterface(QWidget *parent) { - if (hasConfigurationInterface()) { - d->runner.data()->createRunOptions(parent); - } + Q_UNUSED(parent) } +#endif } // Plasma namespace