diff options
| author | hjk <hjk@qt.io> | 2020-08-12 09:40:51 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-08-13 12:11:36 +0000 |
| commit | 89296a98a01a1fcdd84624ead9a9454e653b9e08 (patch) | |
| tree | f7dd8eb381bd53f284e1ba12418df340aa76ddc9 /src/plugins/diffeditor | |
| parent | 0c4135e38097d482ce586b65867ec61185f703f1 (diff) | |
Qt6: Adapt to removed QMap functionality
QMap::iterator::operator+() was removed in 14090760a8, necessitating
extra code using std::next/prev to workaround.
QMap::unite is gone, the replacement QMap::insert was only introduced
in 5.15.
QMap key values need to have an operator==() available.
Task-number: QTCREATORBUG-24098
Change-Id: Ic4cf429ab18cad58b1218180de40eb65586afd77
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/diffeditor')
| -rw-r--r-- | src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index d9b593befa..bf411463c0 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -328,7 +328,7 @@ int SideDiffEditorWidget::blockNumberForFileIndex(int fileIndex) const if (fileIndex < 0 || fileIndex >= m_fileInfo.count()) return -1; - return (m_fileInfo.constBegin() + fileIndex).key(); + return std::next(m_fileInfo.constBegin(), fileIndex).key(); } int SideDiffEditorWidget::fileIndexForBlockNumber(int blockNumber) const diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index c924b668eb..adc8c108a4 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -587,7 +587,7 @@ int UnifiedDiffEditorWidget::blockNumberForFileIndex(int fileIndex) const if (fileIndex < 0 || fileIndex >= m_fileInfo.count()) return -1; - return (m_fileInfo.constBegin() + fileIndex).key(); + return std::next(m_fileInfo.constBegin(), fileIndex).key(); } int UnifiedDiffEditorWidget::fileIndexForBlockNumber(int blockNumber) const |