From 2047e64656f02b36e992af7aa15cae2a1f2c383d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 12 Jan 2024 07:43:23 +0100
Subject: [PATCH] GlslEditor: Hide GlslCompletionAssistProvider implementation

Change-Id: I02a27e338cbbb149ed5d7883c87864de183f8b94
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .../glsleditor/glslcompletionassist.cpp       | 46 +++++++++++++------
 src/plugins/glsleditor/glslcompletionassist.h | 15 +-----
 src/plugins/glsleditor/glsleditor.cpp         |  2 +-
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp
index d38b105f997..5014f1610b4 100644
--- a/src/plugins/glsleditor/glslcompletionassist.cpp
+++ b/src/plugins/glsleditor/glslcompletionassist.cpp
@@ -162,21 +162,6 @@ static QIcon glslIcon(IconTypes iconType)
 // ----------------------------
 // GlslCompletionAssistProvider
 // ----------------------------
-IAssistProcessor *GlslCompletionAssistProvider::createProcessor(const AssistInterface *) const
-{
-    return new GlslCompletionAssistProcessor;
-}
-
-int GlslCompletionAssistProvider::activationCharSequenceLength() const
-{
-    return 1;
-}
-
-bool GlslCompletionAssistProvider::isActivationCharSequence(const QString &sequence) const
-{
-    return isActivationChar(sequence.at(0));
-}
-
 struct FunctionItem
 {
     FunctionItem() = default;
@@ -531,5 +516,36 @@ GlslCompletionAssistInterface::GlslCompletionAssistInterface(const QTextCursor &
 {
 }
 
+// GlslCompletionAssistProvider
+
+class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
+{
+public:
+    TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override;
+
+    int activationCharSequenceLength() const override;
+    bool isActivationCharSequence(const QString &sequence) const override;
+};
+
+IAssistProcessor *GlslCompletionAssistProvider::createProcessor(const AssistInterface *) const
+{
+    return new GlslCompletionAssistProcessor;
+}
+
+int GlslCompletionAssistProvider::activationCharSequenceLength() const
+{
+    return 1;
+}
+
+bool GlslCompletionAssistProvider::isActivationCharSequence(const QString &sequence) const
+{
+    return isActivationChar(sequence.at(0));
+}
+
+CompletionAssistProvider *createGlslCompletionAssistProvider()
+{
+    return new GlslCompletionAssistProvider;
+}
+
 } // namespace Internal
 } // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h
index 4bef1971cac..5958277c754 100644
--- a/src/plugins/glsleditor/glslcompletionassist.h
+++ b/src/plugins/glsleditor/glslcompletionassist.h
@@ -54,19 +54,6 @@ private:
     friend class GlslEditorWidget;
 };
 
-class GlslCompletionAssistInterface;
-
-class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
-{
-    Q_OBJECT
-
-public:
-    TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override;
-
-    int activationCharSequenceLength() const override;
-    bool isActivationCharSequence(const QString &sequence) const override;
-};
-
 class GlslCompletionAssistProcessor : public TextEditor::AsyncProcessor
 {
 public:
@@ -98,5 +85,7 @@ private:
     Document::Ptr m_glslDoc;
 };
 
+TextEditor::CompletionAssistProvider *createGlslCompletionAssistProvider();
+
 } // namespace Internal
 } // namespace GlslEditor
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 1b789863497..36bba041372 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -462,7 +462,7 @@ public:
         setIndenterCreator(&createGlslIndenter);
         setSyntaxHighlighterCreator(&createGlslHighlighter);
         setCommentDefinition(Utils::CommentDefinition::CppStyle);
-        setCompletionAssistProvider(new GlslCompletionAssistProvider);
+        setCompletionAssistProvider(createGlslCompletionAssistProvider());
         setParenthesesMatchingEnabled(true);
         setCodeFoldingSupported(true);