feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

All: Fix some more Qt 6.7 induced deprecation warnings

Browse Source 
Change-Id: I4f3fc9c34ff664ab153d4a9a641ec84a11e555a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-06-08 08:26:57 +02:00
parent b6c452d59d
commit 362772442a
19 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -226,7 +226,7 @@ QString UnifiedDiffEditorWidget::lineNumber(int blockNumber) const
const QString line = lineExists
? QString::number(m_data.m_lineNumbers[side].value(blockNumber).first)
: QString();
lineNumberString += QString(m_data.m_lineNumberDigits[side] - line.count(), ' ') + line;
lineNumberString += QString(m_data.m_lineNumberDigits[side] - line.size(), ' ') + line;
};
addSideNumber(LeftSide, leftLineExists);
lineNumberString += '|';
@@ -263,7 +263,7 @@ void UnifiedDiffData::setLineNumber(DiffSide side, int blockNumber, int lineNumb
QTC_ASSERT(side < SideCount, return);
const QString lineNumberString = QString::number(lineNumber);
m_lineNumbers[side].insert(blockNumber, {lineNumber, rowNumberInChunk});
m_lineNumberDigits[side] = qMax(m_lineNumberDigits[side], lineNumberString.count());
m_lineNumberDigits[side] = qMax(m_lineNumberDigits[side], lineNumberString.size());
}
QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData &chunkData,