diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 5fa076027fd..5762fc3902e 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -89,7 +89,6 @@ add_qtc_library(Utils launcherpackets.cpp launcherpackets.h launchersocket.cpp launchersocket.h layoutbuilder.cpp layoutbuilder.h - linecolumn.h link.cpp link.h listmodel.h listutils.h diff --git a/src/libs/utils/linecolumn.h b/src/libs/utils/linecolumn.h deleted file mode 100644 index 4cd982b8e7e..00000000000 --- a/src/libs/utils/linecolumn.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include "utils_global.h" - -#include - -#include - -namespace Utils { - -class QTCREATOR_UTILS_EXPORT LineColumn -{ -public: - bool isValid() const - { - return line > 0 && column >= 0; - } - - friend bool operator==(LineColumn first, LineColumn second) - { - return first.isValid() && first.line == second.line && first.column == second.column; - } - - friend bool operator!=(LineColumn first, LineColumn second) - { - return !(first == second); - } - -public: - int line = 0; - int column = -1; -}; - -} // namespace Utils - -Q_DECLARE_METATYPE(Utils::LineColumn) diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index d3c826ef26f..f316a8b75b5 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -185,7 +185,6 @@ Project { "launchersocket.h", "layoutbuilder.cpp", "layoutbuilder.h", - "linecolumn.h", "link.cpp", "link.h", "listmodel.h", diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp index 64d7d4a4905..65a1fe3c9db 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.cpp +++ b/src/plugins/clangformat/clangformatbaseindenter.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/src/plugins/cppeditor/cppeditoroutline.cpp b/src/plugins/cppeditor/cppeditoroutline.cpp index a3c9c363f99..701eea0a76d 100644 --- a/src/plugins/cppeditor/cppeditoroutline.cpp +++ b/src/plugins/cppeditor/cppeditoroutline.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 2efa3709269..d492ad4fa7e 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -184,8 +183,8 @@ void CppOutlineWidget::updateIndexNow() void CppOutlineWidget::updateTextCursor(const QModelIndex &proxyIndex) { QModelIndex index = m_proxyModel->mapToSource(proxyIndex); - Utils::LineColumn lineColumn - = m_editor->cppEditorDocument()->outlineModel().lineColumnFromIndex(index); + Utils::Text::Position lineColumn + = m_editor->cppEditorDocument()->outlineModel().positionFromIndex(index); if (!lineColumn.isValid()) return; diff --git a/src/plugins/cppeditor/cppoutlinemodel.cpp b/src/plugins/cppeditor/cppoutlinemodel.cpp index 660492b81cd..068dc310b1e 100644 --- a/src/plugins/cppeditor/cppoutlinemodel.cpp +++ b/src/plugins/cppeditor/cppoutlinemodel.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include @@ -239,9 +238,9 @@ Utils::Link OutlineModel::linkFromIndex(const QModelIndex &sourceIndex) const return symbol->toLink(); } -Utils::LineColumn OutlineModel::lineColumnFromIndex(const QModelIndex &sourceIndex) const +Utils::Text::Position OutlineModel::positionFromIndex(const QModelIndex &sourceIndex) const { - Utils::LineColumn lineColumn; + Utils::Text::Position lineColumn; CPlusPlus::Symbol *symbol = symbolFromIndex(sourceIndex); if (!symbol) return lineColumn; @@ -252,7 +251,7 @@ Utils::LineColumn OutlineModel::lineColumnFromIndex(const QModelIndex &sourceInd OutlineModel::Range OutlineModel::rangeFromIndex(const QModelIndex &sourceIndex) const { - Utils::LineColumn lineColumn = lineColumnFromIndex(sourceIndex); + Utils::Text::Position lineColumn = positionFromIndex(sourceIndex); return {lineColumn, lineColumn}; } diff --git a/src/plugins/cppeditor/cppoutlinemodel.h b/src/plugins/cppeditor/cppoutlinemodel.h index 3afed56486b..ce499c91a0a 100644 --- a/src/plugins/cppeditor/cppoutlinemodel.h +++ b/src/plugins/cppeditor/cppoutlinemodel.h @@ -4,6 +4,7 @@ #pragma once #include +#include #include #include @@ -44,8 +45,8 @@ public: bool isGenerated(const QModelIndex &sourceIndex) const; Utils::Link linkFromIndex(const QModelIndex &sourceIndex) const; - Utils::LineColumn lineColumnFromIndex(const QModelIndex &sourceIndex) const; - using Range = std::pair; + Utils::Text::Position positionFromIndex(const QModelIndex &sourceIndex) const; + using Range = std::pair; Range rangeFromIndex(const QModelIndex &sourceIndex) const; // line is 1-based and column is 0-based diff --git a/tests/unit/unittest/gtest-creator-printing.cpp b/tests/unit/unittest/gtest-creator-printing.cpp index 4da2cee485b..602e973af1b 100644 --- a/tests/unit/unittest/gtest-creator-printing.cpp +++ b/tests/unit/unittest/gtest-creator-printing.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -42,11 +41,6 @@ std::ostream &operator<<(std::ostream &out, const monostate &) } // namespace std namespace Utils { - -std::ostream &operator<<(std::ostream &out, const LineColumn &lineColumn) -{ - return out << "(" << lineColumn.line << ", " << lineColumn.column << ")"; -} namespace { const char * toText(Utils::Language language) { diff --git a/tests/unit/unittest/gtest-creator-printing.h b/tests/unit/unittest/gtest-creator-printing.h index d9d3cba5592..4fb8b7d316b 100644 --- a/tests/unit/unittest/gtest-creator-printing.h +++ b/tests/unit/unittest/gtest-creator-printing.h @@ -72,7 +72,6 @@ class LineColumn; class SmallStringView; class FilePath; -std::ostream &operator<<(std::ostream &out, const LineColumn &lineColumn); std::ostream &operator<<(std::ostream &out, const Utils::Language &language); std::ostream &operator<<(std::ostream &out, const Utils::LanguageVersion &languageVersion); std::ostream &operator<<(std::ostream &out, const Utils::LanguageExtension &languageExtension);