1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "API Review / QDockWidget: Remove const/ref debug operator"

Browse Source 
This reverts commit ca2f46c04c26ed4649cb6c2c62d3b2e52cd8d5ad.

Reason for revert: <BIC in 6.6 found by Marc Mutz>

Change-Id: Ia5b8849e55ebccb514bc753ce1d31855d91e2406
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit b148a362c36a9b34b0c21c60530353d6bf6b92cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit be4f933c0ae30389869d74277982bd14a99fe11a)
This commit is contained in:
Axel Spoerl 2024-01-18 10:05:23 +00:00 committed by Qt Cherry-pick Bot
parent be64808342
commit 7db3277cd7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/widgets/qdockwidget.cpp
View File

@ -1841,16 +1841,17 @@ QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget)
{ {
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
dbg.nospace(); dbg.nospace();
return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)";
if (!dockWidget) {
dbg << "QDockWidget(0x0)";
return dbg;
} }
dbg << "QDockWidget(" << static_cast<const void *>(dockWidget); QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget)
dbg << "->(ObjectName=" << dockWidget->objectName(); {
dbg << "; floating=" << dockWidget->isFloating(); QDebugStateSaver saver(dbg);
dbg << "; features=" << dockWidget->features(); dbg.nospace();
dbg << "QDockWidget(" << static_cast<const void *>(&dockWidget);
dbg << "->(ObjectName=" << dockWidget.objectName();
dbg << "; floating=" << dockWidget.isFloating();
dbg << "; features=" << dockWidget.features();
dbg << ";))"; dbg << ";))";
return dbg; return dbg;
} }

1
src/widgets/widgets/qdockwidget.h
View File

@ -65,6 +65,7 @@ public:
{ return (allowedAreas() & area) == area; } { return (allowedAreas() & area) == area; }
#ifndef QT_NO_DEBUG_STREAM #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); friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget);
#endif #endif