Commit a0f2b0f
qt: Suppress error messages "QList index out of range"
In three places gnuplot_qt was appending an element to an existing
list by insertiong using an index greater than the current list size.
This works but starting with Qt 5.15 an error message is given.
Replace with append() or insert(list_size, ...)
Bug #22801 parent 166dfef commit a0f2b0f
1 file changed
Lines changed: 3 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -167,9 +167,7 @@ void QtGnuplotScene::flushCurrentPointsItem() | |||
| 167 | 167 | void QtGnuplotScene::update_key_box(const QRectF rect) | |
| 168 | 168 | { | |
| 169 | 169 | if (m_currentPlotNumber > m_key_boxes.count()) { | |
| 170 | - // DEBUG Feb 2018 should no longer trigger | ||
| 171 | - // because m_key_box insertion is done in layer code for GEAfterPlot | ||
| 172 | - m_key_boxes.insert(m_currentPlotNumber, QtGnuplotKeybox(rect)); | ||
| 170 | + m_key_boxes.insert(m_currentPlotNumber-1, QtGnuplotKeybox(rect)); | ||
| 173 | 171 | } else if (m_key_boxes[m_currentPlotNumber-1].isEmpty()) { | |
| 174 | 172 | // Retain the visible/hidden flag when re-initializing the Keybox | |
| 175 | 173 | bool tmp = m_key_boxes[m_currentPlotNumber-1].ishidden(); | |
@@ -515,12 +513,12 @@ void QtGnuplotScene::processEvent(QtGnuplotEventType type, QDataStream& in) | |||
| 515 | 513 | if (0 < m_currentPlotNumber && m_currentPlotNumber <= m_key_boxes.count()) | |
| 516 | 514 | newgroup->setVisible( !(m_key_boxes[m_currentPlotNumber-1].ishidden()) ); | |
| 517 | 515 | // Store it in an ordered list so we can toggle it by index | |
| 518 | - m_plot_group.insert(m_currentPlotNumber, newgroup); | ||
| 516 | + m_plot_group.insert(m_currentPlotNumber-1, newgroup); | ||
| 519 | 517 | } | |
| 520 | 518 | ||
| 521 | 519 | if (m_currentPlotNumber >= m_key_boxes.count()) { | |
| 522 | 520 | QRectF empty( QPointF(0,0), QPointF(0,0)); | |
| 523 | - m_key_boxes.insert(m_currentPlotNumber, empty); | ||
| 521 | + m_key_boxes.append(empty); | ||
| 524 | 522 | m_key_boxes[m_currentPlotNumber-1].resetStatus(); | |
| 525 | 523 | } | |
| 526 | 524 | ||
0 commit comments