feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Rename originalItem in codeCompletion

Browse Source 
Actually it is quite slow anyway to cast the variant to the value.

Change-Id: Ied18208455adf9d7d5eb500e139170ced597dc1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-07-06 14:44:25 +02:00
parent 031ec4d824
commit 90500b0225
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangcodemodel/clangassistproposalitem.cpp
View File

@@ -53,7 +53,7 @@ bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const
applies = (typedChar == QLatin1Char('/')) && text().endsWith(QLatin1Char('/')); applies = (typedChar == QLatin1Char('/')) && text().endsWith(QLatin1Char('/'));
else if (!isCodeCompletion()) else if (!isCodeCompletion())
applies = (typedChar == QLatin1Char('(')); /* && data().canConvert<CompleteFunctionDeclaration>()*/ //### applies = (typedChar == QLatin1Char('(')); /* && data().canConvert<CompleteFunctionDeclaration>()*/ //###
else if (originalItem().completionKind() == CodeCompletion::ObjCMessageCompletionKind) else if (codeCompletion().completionKind() == CodeCompletion::ObjCMessageCompletionKind)
applies = QString::fromLatin1(";.,").contains(typedChar); applies = QString::fromLatin1(";.,").contains(typedChar);
else else
applies = QString::fromLatin1(";.,:(").contains(typedChar); applies = QString::fromLatin1(";.,:(").contains(typedChar);
@@ -67,7 +67,7 @@ bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const
void ClangAssistProposalItem::applyContextualContent(TextEditor::TextEditorWidget *editorWidget, void ClangAssistProposalItem::applyContextualContent(TextEditor::TextEditorWidget *editorWidget,
int basePosition) const int basePosition) const
{ {
const CodeCompletion ccr = originalItem(); const CodeCompletion ccr = codeCompletion();
QString toInsert = text(); QString toInsert = text();
QString extraChars; QString extraChars;
@@ -206,7 +206,7 @@ void ClangAssistProposalItem::addOverload(const CodeCompletion &ccr)
m_overloads.append(ccr); m_overloads.append(ccr);
} }
CodeCompletion ClangAssistProposalItem::originalItem() const CodeCompletion ClangAssistProposalItem::codeCompletion() const
{ {
const QVariant &value = data(); const QVariant &value = data();
if (value.canConvert<CodeCompletion>()) if (value.canConvert<CodeCompletion>())

2
src/plugins/clangcodemodel/clangassistproposalitem.h
View File

@@ -52,7 +52,7 @@ public:
bool isOverloaded() const; bool isOverloaded() const;
void addOverload(const ClangBackEnd::CodeCompletion &ccr); void addOverload(const ClangBackEnd::CodeCompletion &ccr);
ClangBackEnd::CodeCompletion originalItem() const; ClangBackEnd::CodeCompletion codeCompletion() const;
bool isCodeCompletion() const; bool isCodeCompletion() const;
private: private: