diff --git a/src/kstandardaction.h b/src/kstandardaction.h --- a/src/kstandardaction.h +++ b/src/kstandardaction.h @@ -190,7 +190,7 @@ Preferences, ///< Display the preferences/options dialog. ConfigureToolbars, ///< Display the toolbar configuration dialog. // Help Menu - Help, + Help, ///< @deprecated since 5.38. Use HelpContents instead. HelpContents, ///< Display the handbook of the application. WhatsThis, ///< Trigger the What's This cursor. ReportBug, ///< Open up the Report Bug dialog. @@ -201,7 +201,7 @@ ConfigureNotifications, ///< Display the notifications configuration dialog. FullScreen, ///< Switch to/from full screen mode. Clear, ///< Clear the content of the focus widget. - PasteText, ///< Paste the contents of clipboard and adds a Klipper button on the toolbar. + PasteText, ///< Paste the contents of clipboard at the current mouse or cursor. SwitchApplicationLanguage, ///< Display the Switch Application Language dialog. DeleteFile, ///< Permanently deletes files or folders. @since 5.25 RenameFile, ///< Renames files or folders. @since 5.25 @@ -1036,15 +1036,25 @@ KSTANDARDACTION_WITH_NEW_STYLE_CONNECT(configureNotifications, ConfigureNotifications) /** - * Display the help. + * @deprecated since 5.38 Use helpContents() instead. */ -KCONFIGWIDGETS_EXPORT QAction *help(const QObject *recvr, const char *slot, QObject *parent); +#ifndef KDE_NO_DEPRECATED +KCONFIGWIDGETS_DEPRECATED_EXPORT QAction *help(const QObject *recvr, const char *slot, QObject *parent); +#endif /** - * Display the help. * @since 5.23 + * @deprecated since 5.38 Use helpContents() instead. */ -KSTANDARDACTION_WITH_NEW_STYLE_CONNECT(help, Help) +#ifndef KDE_NO_DEPRECATED +#ifdef DOXYGEN_SHOULD_SKIP_THIS + inline QAction *help(const QObject *recvr, Func slot, QObject *parent); +#else +template +KCONFIGWIDGETS_DEPRECATED_EXPORT inline typename std::enable_if::value, QAction>::type *help(const Receiver *recvr, Func slot, QObject *parent) +{ return create(Help, recvr, slot, parent); } +#endif // DOXYGEN_SHOULD_SKIP_THIS +#endif // KDE_NO_DEPRECATED /** * Display the handbook of the application. diff --git a/src/kstandardaction.cpp b/src/kstandardaction.cpp --- a/src/kstandardaction.cpp +++ b/src/kstandardaction.cpp @@ -659,10 +659,12 @@ return KStandardAction::create(ConfigureNotifications, recvr, slot, parent); } +#ifndef KDE_NO_DEPRECATED QAction *help(const QObject *recvr, const char *slot, QObject *parent) { return KStandardAction::create(Help, recvr, slot, parent); } +#endif QAction *helpContents(const QObject *recvr, const char *slot, QObject *parent) {