whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reapply: Remove const/ref debug operator for QDockWidget 

QObjects are usually passed by pointer, so we leave the override
taking a pointer.

This amends bbeff2a335, and reverts
the previous revert in b148a362c3.
Now that we have removed the incorrectly added operators from the
6.6 branches entirely, we can remove the unnecessary const/ref
operator from 6.7.

Task-number: QTBUG-119952
Pick-to: 6.7
Change-Id: Id196367ddf3ffb443db44194002f850dcfec5d79
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
bb10
Volker Hilsheimer 2024-02-02 13:31:31 +01:00
parent 1aa16094c0
commit 4b64df5650
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1826,17 +1826,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<const void *>(&dockWidget);
dbg << "->(ObjectName=" << dockWidget.objectName();
dbg << "; floating=" << dockWidget.isFloating();
dbg << "; features=" << dockWidget.features();
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();
dbg << ";))";
return dbg;
}

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

@ -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