GenericProposalModel: Rename PrefixMatch to ProposalMatch

Change-Id: I70e583d489f27b2dad1b9ab874091e638bbaff1f
Reviewed-by: David Schulz <david.schulz@qt.io>

3 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
index 6e535fb04a..9f682ff6eb 100644
--- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
@@ -52,9 +52,9 @@ void ClangAssistProposalModel::sort(const QString &/*prefix*/)
 
     auto currentItemsCompare = [](AssistProposalItemInterface *first,
                                   AssistProposalItemInterface *second) {
-        if (first->prefixMatch() != second->prefixMatch()) {
-            return static_cast<int>(first->prefixMatch())
-                    < static_cast<int>(second->prefixMatch());
+        if (first->proposalMatch() != second->proposalMatch()) {
+            return static_cast<int>(first->proposalMatch())
+                    < static_cast<int>(second->proposalMatch());
         }
         return false;
     };
diff --git a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
index 3124b46197..d4b7f3268e 100644
--- a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
+++ b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
@@ -42,7 +42,7 @@ class TEXTEDITOR_EXPORT AssistProposalItemInterface
 {
 public:
     // We compare proposals by enum values, be careful changing their values
-    enum class PrefixMatch
+    enum class ProposalMatch
     {
         Full = 0,
         Exact = 1,
@@ -71,12 +71,12 @@ public:
 
     inline int order() const { return m_order; }
     inline void setOrder(int order) { m_order = order; }
-    inline PrefixMatch prefixMatch() { return m_prefixMatch; }
-    inline void setPrefixMatch(PrefixMatch match) { m_prefixMatch = match; }
+    inline ProposalMatch proposalMatch() { return m_proposalMatch; }
+    inline void setProposalMatch(ProposalMatch match) { m_proposalMatch = match; }
 
 private:
     int m_order = 0;
-    PrefixMatch m_prefixMatch = PrefixMatch::None;
+    ProposalMatch m_proposalMatch = ProposalMatch::None;
 };
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
index 88b7681ae0..75dcf2d540 100644
--- a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
@@ -307,16 +307,16 @@ void GenericProposalModel::filter(const QString &prefix)
             m_currentItems.append(item);
             if (text.startsWith(prefix)) {
                 // Direct match
-                item->setPrefixMatch(text.length() == prefix.length()
-                                     ? AssistProposalItemInterface::PrefixMatch::Full
-                                     : AssistProposalItemInterface::PrefixMatch::Exact);
+                item->setProposalMatch(text.length() == prefix.length()
+                                       ? AssistProposalItemInterface::ProposalMatch::Full
+                                       : AssistProposalItemInterface::ProposalMatch::Exact);
                 continue;
             }
 
             if (text.startsWith(lowerPrefix, Qt::CaseInsensitive))
-                item->setPrefixMatch(AssistProposalItemInterface::PrefixMatch::Prefix);
+                item->setProposalMatch(AssistProposalItemInterface::ProposalMatch::Prefix);
             else if (text.contains(lowerPrefix, Qt::CaseInsensitive))
-                item->setPrefixMatch(AssistProposalItemInterface::PrefixMatch::Infix);
+                item->setProposalMatch(AssistProposalItemInterface::ProposalMatch::Infix);
         }
     }
 }