From e7d3842f7914ac2bc4e45d9dd26910f85c0fc1d5 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 27 Jun 2024 11:05:13 +0200
Subject: [PATCH] ClangCodeModel: Fix build

At least on Apple Clang there is no default constructor
For Text::Position taking two numbers.

Amends 39a448c62e96871e0928db802fdf68b4d9d507ec

Change-Id: Ife3630f53d66be38a52ffeb8693bf7574038d083
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../clangcodemodel/test/clangdtests.cpp        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index 0a41ff925ff..e20b4fb717c 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -1656,7 +1656,7 @@ void ClangdTestCompletion::testCompleteGlobals()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(7), "   globalFunction() /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(7, 19));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({7, 19}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1676,7 +1676,7 @@ void ClangdTestCompletion::testCompleteMembers()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(7), "    s.member /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(7, 12));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({7, 12}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1694,7 +1694,7 @@ void ClangdTestCompletion::testCompleteMembersFromInside()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(4), "        privateFunc() /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(4, 21));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({4, 21}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1712,7 +1712,7 @@ void ClangdTestCompletion::testCompleteMembersFromOutside()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(13), "    c.publicFunc() /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(13, 18));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({13, 18}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1730,7 +1730,7 @@ void ClangdTestCompletion::testCompleteMembersFromFriend()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(14), "    C().privateFunc() /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(14, 21));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({14, 21}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1747,7 +1747,7 @@ void ClangdTestCompletion::testFunctionAddress()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(7), "    const auto p = &S::memberFunc /* COMPLETE HERE */;");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(7, 33));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({7, 33}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1811,7 +1811,7 @@ void ClangdTestCompletion::testCompleteClassAndConstructor()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(7), "    Foo( /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(7, 8));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({7, 8}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1838,7 +1838,7 @@ void ClangdTestCompletion::testCompleteWithDotToArrowCorrection()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(4), "    bar->member /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(4, 15));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({4, 15}));
     QCOMPARE(manipulator.skipPos(), -1);
 }
 
@@ -1869,7 +1869,7 @@ void ClangdTestCompletion::testCompleteCodeInGeneratedUiFile()
     TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
     item->apply(manipulator, cursorPos);
     QCOMPARE(manipulator.getLine(34), "    ui->setupUi( /* COMPLETE HERE */");
-    QCOMPARE(manipulator.cursorPos(), Text::Position(34, 16));
+    QCOMPARE(manipulator.cursorPos(), Text::Position({34, 16}));
     QCOMPARE(manipulator.skipPos(), -1);
 }