AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QMainWindow: for UB (use of reserved names)

Browse Source 
Identifiers matching _[A-Z_].* are reserved for use by the C++
implementation. Replace the __ prefix of variable names with _v_,
making them non-reserved.

Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I35127d7473678e2efd93a4b21847db562c53abd2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Marc Mutz 2023-08-04 23:51:48 +02:00
parent ba2d109c5f
commit 8de746a96c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
View File

@ -1679,17 +1679,17 @@ QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
#define COMPARE_DOCK_WIDGET_GEOS(_oldGeos, _newGeos) \
{ \
QMap<QString, QRect> __oldGeos = _oldGeos; \
QMap<QString, QRect> __newGeos = _newGeos; \
QCOMPARE(__newGeos.keys(), __oldGeos.keys()); \
QStringList __keys = __newGeos.keys(); \
foreach (const QString &key, __keys) { \
QRect __r1 = __oldGeos[key]; \
QRect __r2 = __newGeos[key]; \
if (__r1 != __r2) \
qWarning() << key << __r1 << __r2; \
QMap<QString, QRect> _v_oldGeos = _oldGeos; \
QMap<QString, QRect> _v_newGeos = _newGeos; \
QCOMPARE(_v_newGeos.keys(), _v_oldGeos.keys()); \
QStringList _v_keys = _v_newGeos.keys(); \
foreach (const QString &key, _v_keys) { \
QRect _v_r1 = _v_oldGeos[key]; \
QRect _v_r2 = _v_newGeos[key]; \
if (_v_r1 != _v_r2) \
qWarning() << key << _v_r1 << _v_r2; \
} \
QCOMPARE(__newGeos, __oldGeos); \
QCOMPARE(_v_newGeos, _v_oldGeos); \
}
#ifdef QT_BUILD_INTERNAL