diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp index 96d2da62c2877baf3134299320df2f7ac4fc690e..88c35533713200c26858fdd66bc552ef5d7b4ca5 100644 --- a/src/plugins/clangcodemodel/clangcompletion.cpp +++ b/src/plugins/clangcodemodel/clangcompletion.cpp @@ -203,10 +203,9 @@ IAssistProcessor *ClangCompletionAssistProvider::createProcessor() const } IAssistInterface *ClangCompletionAssistProvider::createAssistInterface( - ProjectExplorer::Project *project, const QString &filePath, + const QString &filePath, QTextDocument *document, bool isObjCEnabled, int position, AssistReason reason) const { - Q_UNUSED(project); Q_UNUSED(isObjCEnabled); CppModelManagerInterface *modelManager = CppModelManagerInterface::instance(); diff --git a/src/plugins/clangcodemodel/clangcompletion.h b/src/plugins/clangcodemodel/clangcompletion.h index 152439c54aea7a6706414fb18ebe908e8fdf03b4..7a6946bd57c96d19976ebdecc96e44dcd71a87b3 100644 --- a/src/plugins/clangcodemodel/clangcompletion.h +++ b/src/plugins/clangcodemodel/clangcompletion.h @@ -44,7 +44,6 @@ #include <QStringList> #include <QTextCursor> -#include <QCoreApplication> namespace ClangCodeModel { @@ -58,7 +57,7 @@ public: virtual TextEditor::IAssistProcessor *createProcessor() const; virtual TextEditor::IAssistInterface *createAssistInterface( - ProjectExplorer::Project *project, const QString &filePath, + const QString &filePath, QTextDocument *document, bool isObjCEnabled, int position, TextEditor::AssistReason reason) const; diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index abb8286c002ab4ef7f4c23bcc024490859fe5cbb..9eecd71476880fedcfa3dca7272a668478bf6779 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -613,7 +613,6 @@ IAssistInterface *CppEditorWidget::createAssistInterface(AssistKind kind, Assist if (kind == Completion) { if (CppCompletionAssistProvider *cap = cppEditorDocument()->completionAssistProvider()) { return cap->createAssistInterface( - ProjectExplorer::ProjectExplorerPlugin::currentProject(), textDocument()->filePath(), document(), cppEditorDocument()->isObjCEnabled(), diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index a0a2e2b055644ec1f3e34cb5d24919c552d8b88f..251881a4c9981397f82beda66d148b3637af9c37 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -418,10 +418,9 @@ IAssistProcessor *InternalCompletionAssistProvider::createProcessor() const } IAssistInterface *InternalCompletionAssistProvider::createAssistInterface( - ProjectExplorer::Project *project, const QString &filePath, QTextDocument *document, + const QString &filePath, QTextDocument *document, bool isObjCEnabled, int position, AssistReason reason) const { - Q_UNUSED(project); QTC_ASSERT(document, return 0); CppModelManagerInterface *modelManager = CppModelManagerInterface::instance(); diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index c385646f6f80b25805fcf4729675bce75a667955..44d5bc8d779ee1931c4a7d3ba187ec38e0f0d814 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -92,7 +92,7 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider public: TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE; - TextEditor::IAssistInterface *createAssistInterface(ProjectExplorer::Project *project, + TextEditor::IAssistInterface *createAssistInterface( const QString &filePath, QTextDocument *document, bool isObjCEnabled, diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index f60c5bb102068ed42f926b06cc9156afd6f30c64..7fc8e3d39b07cadc5f90d88db9dcbb6e7eaefb8c 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -41,8 +41,6 @@ QT_BEGIN_NAMESPACE class QTextDocument; QT_END_NAMESPACE -namespace ProjectExplorer { class Project; } - namespace TextEditor { class BaseTextEditor; class IAssistInterface; @@ -61,7 +59,7 @@ public: bool isContinuationChar(const QChar &c) const QTC_OVERRIDE; virtual TextEditor::IAssistInterface *createAssistInterface( - ProjectExplorer::Project *project, const QString &filePath, + const QString &filePath, QTextDocument *document, bool isObjCEnabled, int position, TextEditor::AssistReason reason) const = 0;