diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-12-23 20:15:13 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2024-01-10 22:20:03 +0000 |
| commit | 7efd3c2718a3d0dd656038ee7cd4eb992a6f2f80 (patch) | |
| tree | 9e5925c1698ac210dee4d2ff499fe379674c4d7c /src/widgets/widgets/qlabel_p.h | |
| parent | 7dd4a7b2133b9a6aa4f67a3ff5760303af68ac54 (diff) | |
QLabel: Use pmf-style connects
Port all string-based signal/slots connections to pmf-style connects.
Pick-to: 6.7
Change-Id: I888fe3d0022fddbe7ba391dc6841c3ea6b9d1d4b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/widgets/qlabel_p.h')
| -rw-r--r-- | src/widgets/widgets/qlabel_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index 2a3dcdaa2f..fb6ccb04eb 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -35,6 +35,7 @@ #include <QtCore/qpointer.h> +#include <array> #include <optional> QT_BEGIN_NAMESPACE @@ -52,12 +53,12 @@ public: QSize sizeForWidth(int w) const; #if QT_CONFIG(movie) - void _q_movieUpdated(const QRect&); - void _q_movieResized(const QSize&); + void movieUpdated(const QRect &rect); + void movieResized(const QSize &size); #endif #ifndef QT_NO_SHORTCUT void updateShortcut(); - void _q_buddyDeleted(); + void buddyDeleted(); #endif inline bool needTextControl() const { Q_Q(const QLabel); @@ -72,7 +73,7 @@ public: void ensureTextControl() const; void sendControlEvent(QEvent *e); - void _q_linkHovered(const QString &link); + void linkHovered(const QString &link); QRectF layoutRect() const; QRect documentRect() const; @@ -93,6 +94,7 @@ public: #endif #if QT_CONFIG(movie) QPointer<QMovie> movie; + std::array<QMetaObject::Connection, 2> movieConnections; #endif mutable QWidgetTextControl *control; mutable QTextCursor shortcutCursor; |