diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,7 +106,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.13 5.63 + DEPRECATION_VERSIONS 5.0 5.13 5.63 5.65 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/kurllabel.h b/src/kurllabel.h --- a/src/kurllabel.h +++ b/src/kurllabel.h @@ -269,61 +269,73 @@ Q_SIGNALS: +#if KWIDGETSADDONS_ENABLE_DEPRECATED_SINCE(5, 65) /** * Emitted when the mouse has passed over the label. * * @param url The URL for this label. + * @deprecated Since 5.65, use enteredUrl(); */ + KWIDGETSADDONS_DEPRECATED_VERSION(5, 65, "Use KUrlLabel::enteredUrl()") void enteredUrl(const QString &url); - +#endif /** * Emitted when the mouse has passed over the label. */ void enteredUrl(); - +#if KWIDGETSADDONS_ENABLE_DEPRECATED_SINCE(5, 65) /** * Emitted when the mouse is no longer over the label. * + * @deprecated Since 5.65, use leftUrl(); * @param url The URL for this label. */ + KWIDGETSADDONS_DEPRECATED_VERSION(5, 65, "Use KUrlLabel::leftUrl()") void leftUrl(const QString &url); +#endif /** * Emitted when the mouse is no longer over the label. */ void leftUrl(); - +#if KWIDGETSADDONS_ENABLE_DEPRECATED_SINCE(5, 65) /** * Emitted when the user clicked the left mouse button on this label. * * @param url The URL for this label. + * @deprecated Since 5.65, use leftClickedUrl(); */ + KWIDGETSADDONS_DEPRECATED_VERSION(5, 65, "Use KUrlLabel::leftClickedUrl()") void leftClickedUrl(const QString &url); - +#endif /** * Emitted when the user clicked the left mouse button on this label. */ void leftClickedUrl(); - +#if KWIDGETSADDONS_ENABLE_DEPRECATED_SINCE(5, 65) /** * Emitted when the user clicked the right mouse button on this label. * * @param url The URL for this label. + * @deprecated Since 5.65, use rightClickedUrl(); */ + KWIDGETSADDONS_DEPRECATED_VERSION(5, 65, "Use KUrlLabel::rightClickedUrl()") void rightClickedUrl(const QString &url); - +#endif /** * Emitted when the user clicked the right mouse button on this label. */ void rightClickedUrl(); - +#if KWIDGETSADDONS_ENABLE_DEPRECATED_SINCE(5, 65) /** * Emitted when the user clicked the middle mouse button on this label. * * @param url The URL for this label. + * @deprecated Since 5.65, use middleClickedUrl(const QString &url); */ + KWIDGETSADDONS_DEPRECATED_VERSION(5, 65, "Use KUrlLabel::middleClickedUrl()") void middleClickedUrl(const QString &url); - +#endif /** * Emitted when the user clicked the left mouse button on this label. */ diff --git a/src/kurllabel.cpp b/src/kurllabel.cpp --- a/src/kurllabel.cpp +++ b/src/kurllabel.cpp @@ -116,17 +116,23 @@ switch (event->button()) { case Qt::LeftButton: emit leftClickedUrl(); +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 65) emit leftClickedUrl(d->url); +#endif break; case Qt::MidButton: emit middleClickedUrl(); +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 65) emit middleClickedUrl(d->url); +#endif break; case Qt::RightButton: emit rightClickedUrl(); +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 65) emit rightClickedUrl(d->url); +#endif break; default: @@ -291,9 +297,10 @@ setUnderline(true); } } - emit enteredUrl(); +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 65) emit enteredUrl(d->url); +#endif } void KUrlLabel::leaveEvent(QEvent *event) @@ -309,9 +316,10 @@ } setUnderline(d->realUnderlined); - emit leftUrl(); +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 65) emit leftUrl(d->url); +#endif } bool KUrlLabel::event(QEvent *event)