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 <richard.gustavsen@qt.io> (cherry picked from commit 8de746a96c4f83093d1bd50dc1bc3c68148097ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
7dda27c95e
commit
49ce591e69
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user