From 49ce591e69f9a54dc6d7e200f55bd4d82fea60b5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 4 Aug 2023 23:51:48 +0200 Subject: [PATCH] tst_QMainWindow: for UB (use of reserved names) Identifiers matching _[A-Z_].* are reserved for use by the C++ implementation. Replace the __ prefix of variable names with _v_, making them non-reserved. Change-Id: I35127d7473678e2efd93a4b21847db562c53abd2 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 8de746a96c4f83093d1bd50dc1bc3c68148097ac) Reviewed-by: Qt Cherry-pick Bot --- .../widgets/qmainwindow/tst_qmainwindow.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 91aa651bab1..93fae106794 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1679,17 +1679,17 @@ QMap dockWidgetGeometries(QMainWindow *mw) #define COMPARE_DOCK_WIDGET_GEOS(_oldGeos, _newGeos) \ { \ - QMap __oldGeos = _oldGeos; \ - QMap __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 _v_oldGeos = _oldGeos; \ + QMap _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