From dbb70c4f8311b389dac6b3bff4ea4476719d3af4 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 6 Jul 2020 16:21:07 +0200 Subject: [PATCH] ClangCodeModel: Remove some unneeded static_cast of ints Continues 7ab6783e24c6a. Change-Id: I1f80ae5d20163d1d5da79dc26ea3129bd3599066 Reviewed-by: Christian Kandeler --- .../clangcodemodel/clangassistproposalitem.cpp | 8 ++++---- src/plugins/clangcodemodel/clangoverviewmodel.cpp | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp index 372d4b37194..f0be15288dc 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp @@ -377,12 +377,12 @@ std::pair fixItPositionsRange(const FixItContainer &fixIt, const QText const int fixItStartPos = Text::positionInText( cursor.document(), - static_cast(fixIt.range.start.line), - cppEditorColumn(startLine, static_cast(fixIt.range.start.column))); + fixIt.range.start.line, + cppEditorColumn(startLine, fixIt.range.start.column)); const int fixItEndPos = Text::positionInText( cursor.document(), - static_cast(fixIt.range.end.line), - cppEditorColumn(endLine, static_cast(fixIt.range.end.column))); + fixIt.range.end.line, + cppEditorColumn(endLine, fixIt.range.end.column)); return std::make_pair(fixItStartPos, fixItEndPos); } diff --git a/src/plugins/clangcodemodel/clangoverviewmodel.cpp b/src/plugins/clangcodemodel/clangoverviewmodel.cpp index baa125f17f9..88c5aa9d9fb 100644 --- a/src/plugins/clangcodemodel/clangoverviewmodel.cpp +++ b/src/plugins/clangcodemodel/clangoverviewmodel.cpp @@ -226,8 +226,7 @@ Link OverviewModel::linkFromIndex(const QModelIndex &sourceIndex) const auto item = static_cast(itemForIndex(sourceIndex)); if (!item) return {}; - return Link(m_filePath, static_cast(item->token.line), - static_cast(item->token.column) - 1); + return Link(m_filePath, item->token.line, item->token.column - 1); } LineColumn OverviewModel::lineColumnFromIndex(const QModelIndex &sourceIndex) const @@ -235,8 +234,7 @@ LineColumn OverviewModel::lineColumnFromIndex(const QModelIndex &sourceIndex) co auto item = static_cast(itemForIndex(sourceIndex)); if (!item) return {}; - return {static_cast(item->token.line), - static_cast(item->token.column)}; + return {item->token.line, item->token.column}; } OverviewModel::Range OverviewModel::rangeFromIndex(const QModelIndex &sourceIndex) const @@ -245,10 +243,8 @@ OverviewModel::Range OverviewModel::rangeFromIndex(const QModelIndex &sourceInde if (!item) return {}; const ClangBackEnd::SourceRangeContainer &range = item->token.extraInfo.cursorRange; - return std::make_pair(LineColumn(static_cast(range.start.line), - static_cast(range.start.column)), - LineColumn(static_cast(range.end.line), - static_cast(range.end.column))); + return std::make_pair(LineColumn(range.start.line, range.start.column), + LineColumn(range.end.line, range.end.column)); } } // namespace Internal