From e4f1d7cdf3bebc07df754e232e019bb9dd39e2b4 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Tue, 9 Jan 2024 14:40:11 +0100 Subject: [PATCH] API Review / QDockWidget: Remove const/ref debug operator Remove the debug operator taking a const QDockWidget & argument. Leaving the override taking a pointer. This amends bbeff2a3350dd3396400865525d509b784c2d93e. Change-Id: I0fbca6ea7dbffe6269c70e5e9eb29af9f84c3600 Found-by: Giuseppe D'Angelo Task-number: QTBUG-119952 Reviewed-by: Santhosh Kumar Reviewed-by: Friedemann Kleint (cherry picked from commit ca2f46c04c26ed4649cb6c2c62d3b2e52cd8d5ad) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit f83ba9d3cf80512fa11dff12ba932c457952c9cf) --- src/widgets/widgets/qdockwidget.cpp | 19 +++++++++---------- src/widgets/widgets/qdockwidget.h | 1 - 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 447198444c1..ce4505eab45 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1843,17 +1843,16 @@ QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget) { QDebugStateSaver saver(dbg); dbg.nospace(); - return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)"; -} -QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget) -{ - QDebugStateSaver saver(dbg); - dbg.nospace(); - dbg << "QDockWidget(" << static_cast(&dockWidget); - dbg << "->(ObjectName=" << dockWidget.objectName(); - dbg << "; floating=" << dockWidget.isFloating(); - dbg << "; features=" << dockWidget.features(); + if (!dockWidget) { + dbg << "QDockWidget(0x0)"; + return dbg; + } + + dbg << "QDockWidget(" << static_cast(dockWidget); + dbg << "->(ObjectName=" << dockWidget->objectName(); + dbg << "; floating=" << dockWidget->isFloating(); + dbg << "; features=" << dockWidget->features(); dbg << ";))"; return dbg; } diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index 211b703e034..d561b72c107 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -65,7 +65,6 @@ public: { return (allowedAreas() & area) == area; } #ifndef QT_NO_DEBUG_STREAM - friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget); friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget); #endif