diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2024-01-18 10:05:23 +0000 |
|---|---|---|
| committer | Axel Spoerl <axel.spoerl@qt.io> | 2024-01-18 20:17:17 +0000 |
| commit | b148a362c36a9b34b0c21c60530353d6bf6b92cb (patch) | |
| tree | 049f07827f0d59e17b21e2078902762d4242d73d /src/widgets/widgets | |
| parent | ecafbc4d5d9a4c12f44de856dec544404c633a6e (diff) | |
Revert "API Review / QDockWidget: Remove const/ref debug operator"
This reverts commit ca2f46c04c26ed4649cb6c2c62d3b2e52cd8d5ad.
Reason for revert: <BIC in 6.6 found by Marc Mutz>
Pick-to: 6.7 6.6
Change-Id: Ia5b8849e55ebccb514bc753ce1d31855d91e2406
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 19 | ||||
| -rw-r--r-- | src/widgets/widgets/qdockwidget.h | 1 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index bf33ab2a4a..18a56e5a68 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1826,16 +1826,17 @@ QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget) { QDebugStateSaver saver(dbg); dbg.nospace(); + return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)"; +} - if (!dockWidget) { - dbg << "QDockWidget(0x0)"; - return dbg; - } - - dbg << "QDockWidget(" << static_cast<const void *>(dockWidget); - dbg << "->(ObjectName=" << dockWidget->objectName(); - dbg << "; floating=" << dockWidget->isFloating(); - dbg << "; features=" << dockWidget->features(); +QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget) +{ + QDebugStateSaver saver(dbg); + dbg.nospace(); + dbg << "QDockWidget(" << static_cast<const void *>(&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 82538ff1b6..5dfa41a4fc 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -65,6 +65,7 @@ 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 |