From 88c5b47e535d91f3db99882d5b50b263b46f223c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 6 Oct 2015 22:27:05 +0300 Subject: [PATCH] CppTools: Minor cleanup in completion tests * Remove superfluous dot from test file name * Reuse an existing member Change-Id: I735dee09ae7ceef4509a4bda87118baaf4d11b01 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cppcompletion_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index d57742ca31..02cc06848f 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -78,7 +78,7 @@ public: // Write source to file m_temporaryDir.reset(new Tests::TemporaryDir()); QVERIFY(m_temporaryDir->isValid()); - const QByteArray fileExt = isObjC ? ".mm" : ".h"; + const QByteArray fileExt = isObjC ? "mm" : "h"; const QString fileName = m_temporaryDir->createFile("file." + fileExt, m_source); QVERIFY(!fileName.isEmpty()); @@ -111,7 +111,7 @@ public: languageFeatures.objCEnabled = false; CppCompletionAssistInterface *ai = new CppCompletionAssistInterface(m_editorWidget->textDocument()->filePath().toString(), - m_editorWidget->document(), m_position, + m_textDocument, m_position, ExplicitlyInvoked, m_snapshot, ProjectPart::HeaderPaths(), languageFeatures); @@ -129,7 +129,7 @@ public: const int pos = proposal.d->basePosition(); const int length = m_position - pos; - const QString prefix = Convenience::textAt(QTextCursor(m_editorWidget->document()), pos, + const QString prefix = Convenience::textAt(QTextCursor(m_textDocument), pos, length); if (!prefix.isEmpty()) listmodel->filter(prefix); -- GitLab