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

Clang: Add ClangPreprocessorAssistProposalItem

Browse Source 
Change-Id: Ifb27b9a21b9a2fe9a04496bbb70fa3fa07d1f89c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2016-01-28 16:39:05 +01:00
parent bb3b7307ef
commit ecca269292
8 changed files with 286 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
View File

@@ -33,6 +33,7 @@
#include "clangeditordocumentprocessor.h"
#include "clangfunctionhintmodel.h"
#include "clangcompletionchunkstotextconverter.h"
#include "clangpreprocessorassistproposalitem.h"
#include <cpptools/cppdoxygen.h>
#include <cpptools/cppmodelmanager.h>
@@ -533,11 +534,11 @@ void ClangCompletionAssistProcessor::completeIncludePath(const QString &realPath
if (fileInfo.isDir())
text += QLatin1Char('/');
auto *item = new ClangAssistProposalItem; // TODO: Add IncludeAssistProposalItem
auto *item = new ClangPreprocessorAssistProposalItem;
item->setText(text);
//item->setDetail(hint);
//item->setIcon(m_icons.keywordIcon());
item->keepCompletionOperator(m_completionOperator);
item->setDetail(hint);
item->setIcon(m_icons.keywordIcon());
item->setCompletionOperator(m_completionOperator);
m_completions.append(item);
}
}
@@ -567,11 +568,11 @@ void ClangCompletionAssistProcessor::addCompletionItem(const QString &text,
const QIcon &icon,
int order)
{
ClangAssistProposalItem *item = new ClangAssistProposalItem;
auto *item = new ClangPreprocessorAssistProposalItem;
item->setText(text);
//item->setIcon(icon); TODO: Add item for macros and includes
item->setIcon(icon);
item->setOrder(order);
item->keepCompletionOperator(m_completionOperator);
item->setCompletionOperator(m_completionOperator);
m_completions.append(item);
}