diff --git a/src/kstandardaction.h b/src/kstandardaction.h --- a/src/kstandardaction.h +++ b/src/kstandardaction.h @@ -185,7 +185,7 @@ ShowMenubar, ///< Show/Hide the menubar. ShowToolbar, ///< Show/Hide the toolbar. ShowStatusbar, ///< Show/Hide the statusbar. - SaveOptions, + SaveOptions, ///< @deprecated since 5.38 KeyBindings, ///< Display the configure key bindings dialog. Preferences, ///< Display the preferences/options dialog. ConfigureToolbars, ///< Display the toolbar configuration 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 @@ -978,14 +978,26 @@ /** * Display the save options dialog. + * @deprecated since 5.38 */ -KCONFIGWIDGETS_EXPORT QAction *saveOptions(const QObject *recvr, const char *slot, QObject *parent); +#ifndef KDE_NO_DEPRECATED +KCONFIGWIDGETS_DEPRECATED_EXPORT QAction *saveOptions(const QObject *recvr, const char *slot, QObject *parent); +#endif /** * Display the save options dialog. * @since 5.23 + * @deprecated since 5.38 */ -KSTANDARDACTION_WITH_NEW_STYLE_CONNECT(saveOptions, SaveOptions) +#ifndef KDE_NO_DEPRECATED +#ifdef DOXYGEN_SHOULD_SKIP_THIS + inline QAction *saveOptions(const QObject *recvr, Func slot, QObject *parent); +#else +template +KCONFIGWIDGETS_DEPRECATED_EXPORT inline typename std::enable_if::value, QAction>::type *saveOptions(const Receiver *recvr, Func slot, QObject *parent) +{ return create(SaveOptions, recvr, slot, parent); } +#endif // DOXYGEN_SHOULD_SKIP_THIS +#endif // KDE_NO_DEPRECATED /** * Display the configure key bindings dialog. diff --git a/src/kstandardaction.cpp b/src/kstandardaction.cpp --- a/src/kstandardaction.cpp +++ b/src/kstandardaction.cpp @@ -634,10 +634,12 @@ return ret; } +#ifndef KDE_NO_DEPRECATED QAction *saveOptions(const QObject *recvr, const char *slot, QObject *parent) { return KStandardAction::create(SaveOptions, recvr, slot, parent); } +#endif QAction *keyBindings(const QObject *recvr, const char *slot, QObject *parent) {