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

tst_qmenubar: Cast char-type array subscripts to int.

Browse Source 
Fix CLANG warnings:

tst_qmenubar.cpp:719:35: warning: array subscript is of type 'char' [-Wchar-subscripts]
    QCOMPARE(m_complexTriggerCount['c'], 1);
(repeated)

Change-Id: I3628ccdd91af4d31863b3514163bb78c862b78f1
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-07-28 10:26:38 +02:00
parent faa3e095b7
commit 3b04cc6a4a
1 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
View File

@ -146,7 +146,7 @@ private:
QAction* m_lastSimpleAcceleratorId;
int m_simpleActivatedCount;
int m_complexTriggerCount['k'];
int m_complexTriggerCount[int('k')];
};
// Testing get/set functions
@ -534,60 +534,60 @@ void tst_QMenuBar::check_accelKeys()
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_A, Qt::ControlModifier);
QCOMPARE(m_complexTriggerCount[1], 0);
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 1);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 1);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_C, Qt::ControlModifier);
QCOMPARE(m_complexTriggerCount[1], 0);
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 1);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['c'], 1);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 1);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('c')], 1);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_B, Qt::ControlModifier);
QCOMPARE(m_complexTriggerCount[1], 0);
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 1);
QCOMPARE(m_complexTriggerCount['b'], 1);
QCOMPARE(m_complexTriggerCount['c'], 1);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 1);
QCOMPARE(m_complexTriggerCount[int('b')], 1);
QCOMPARE(m_complexTriggerCount[int('c')], 1);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_D, Qt::ControlModifier);
QCOMPARE(m_complexTriggerCount[1], 0);
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 1);
QCOMPARE(m_complexTriggerCount['b'], 1);
QCOMPARE(m_complexTriggerCount['c'], 1);
QCOMPARE(m_complexTriggerCount['d'], 1);
QCOMPARE(m_complexTriggerCount[int('a')], 1);
QCOMPARE(m_complexTriggerCount[int('b')], 1);
QCOMPARE(m_complexTriggerCount[int('c')], 1);
QCOMPARE(m_complexTriggerCount[int('d')], 1);
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_J, Qt::AltModifier);
QCOMPARE(m_complexTriggerCount[1], 0);
QCOMPARE(m_complexTriggerCount[2], 0);
QCOMPARE(m_complexTriggerCount[3], 1);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 1);
QCOMPARE(m_complexTriggerCount['b'], 1);
QCOMPARE(m_complexTriggerCount['c'], 1);
QCOMPARE(m_complexTriggerCount['d'], 1);
QCOMPARE(m_complexTriggerCount[int('a')], 1);
QCOMPARE(m_complexTriggerCount[int('b')], 1);
QCOMPARE(m_complexTriggerCount[int('c')], 1);
QCOMPARE(m_complexTriggerCount[int('d')], 1);
}
#endif
@ -606,10 +606,10 @@ void tst_QMenuBar::check_cursorKeys1()
// the Popupmenu should be visible now
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
// Simulate a cursor key down click
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Down );
@ -618,10 +618,10 @@ void tst_QMenuBar::check_cursorKeys1()
// Let's see if the correct slot is called...
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0); // this shouldn't have been called
QCOMPARE(m_complexTriggerCount['b'], 1); // and this should have been called by a signal now
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0); // this shouldn't have been called
QCOMPARE(m_complexTriggerCount[int('b')], 1); // and this should have been called by a signal now
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
}
#endif
@ -648,10 +648,10 @@ void tst_QMenuBar::check_cursorKeys2()
// Let's see if the correct slot is called...
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0); // this shouldn't have been caled
QCOMPARE(m_complexTriggerCount['b'], 0); // and this should have been called by a signal ow
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 1);
QCOMPARE(m_complexTriggerCount[int('a')], 0); // this shouldn't have been caled
QCOMPARE(m_complexTriggerCount[int('b')], 0); // and this should have been called by a signal ow
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 1);
}
#endif
@ -679,10 +679,10 @@ void tst_QMenuBar::check_cursorKeys3()
// Let's see if the correct slot is called...
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0); // this shouldn't have been called
QCOMPARE(m_complexTriggerCount['b'], 1); // and this should have been called by a signal now
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0); // this shouldn't have been called
QCOMPARE(m_complexTriggerCount[int('b')], 1); // and this should have been called by a signal now
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
}
#endif
@ -715,17 +715,17 @@ void tst_QMenuBar::check_homeKey()
// and press ENTER
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Enter );
// Let's see if the correct slot is called...
// QVERIFY2( m_complexActionTriggerCount['c'] == 1, "Popupmenu should respond to a Home key" );
QCOMPARE(m_complexTriggerCount['c'], 1);
// QVERIFY2( m_complexActionTriggerCount[int('c')] == 1, "Popupmenu should respond to a Home key" );
QCOMPARE(m_complexTriggerCount[int('c')], 1);
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount['e'], 0);
QCOMPARE(m_complexTriggerCount['f'], 0);
QCOMPARE(m_complexTriggerCount['g'], 0);
QCOMPARE(m_complexTriggerCount['h'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QCOMPARE(m_complexTriggerCount[int('e')], 0);
QCOMPARE(m_complexTriggerCount[int('f')], 0);
QCOMPARE(m_complexTriggerCount[int('g')], 0);
QCOMPARE(m_complexTriggerCount[int('h')], 0);
}
/*!
@ -754,17 +754,17 @@ void tst_QMenuBar::check_endKey()
// and press ENTER
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Enter );
// Let's see if the correct slot is called...
// QVERIFY2( m_complexActionTriggerCount['h'] == 1, "Popupmenu should respond to an End key" );
QCOMPARE(m_complexTriggerCount['h'], 1);//, "Popupmenu should respond to an End key");
// QVERIFY2( m_complexActionTriggerCount[int('h')] == 1, "Popupmenu should respond to an End key" );
QCOMPARE(m_complexTriggerCount[int('h')], 1);//, "Popupmenu should respond to an End key");
QCOMPARE(m_complexTriggerCount[3], 0);
QCOMPARE(m_complexTriggerCount[4], 0);
QCOMPARE(m_complexTriggerCount['a'], 0);
QCOMPARE(m_complexTriggerCount['b'], 0);
QCOMPARE(m_complexTriggerCount['c'], 0);
QCOMPARE(m_complexTriggerCount['d'], 0);
QCOMPARE(m_complexTriggerCount['e'], 0);
QCOMPARE(m_complexTriggerCount['f'], 0);
QCOMPARE(m_complexTriggerCount['g'], 0);
QCOMPARE(m_complexTriggerCount[int('a')], 0);
QCOMPARE(m_complexTriggerCount[int('b')], 0);
QCOMPARE(m_complexTriggerCount[int('c')], 0);
QCOMPARE(m_complexTriggerCount[int('d')], 0);
QCOMPARE(m_complexTriggerCount[int('e')], 0);
QCOMPARE(m_complexTriggerCount[int('f')], 0);
QCOMPARE(m_complexTriggerCount[int('g')], 0);
}
/*!
@ -808,7 +808,7 @@ void tst_QMenuBar::check_escKey()
// and press ENTER
QTest::keyClick( menu.menus.at(1), Qt::Key_Enter );
// Let's see if the correct slot is called...
QVERIFY2( m_complexTriggerCount['c'] == 1, "Expected item 2C to be selected" );
QVERIFY2(m_complexTriggerCount[int('c')] == 1, "Expected item 2C to be selected");
}
#endif