From aa52cd83a63e0ecd659bf0ce4eefbdce4d0b6d48 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 3 Sep 2014 21:58:57 +0200
Subject: [PATCH] CppEditor: Remove unused Project parameter
Change-Id: I3bfa201352127b34d46fe5bb4b18fab12aeafa3a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
src/plugins/clangcodemodel/clangcompletion.cpp | 3 +--
src/plugins/clangcodemodel/clangcompletion.h | 3 +--
src/plugins/cppeditor/cppeditor.cpp | 1 -
src/plugins/cpptools/cppcompletionassist.cpp | 3 +--
src/plugins/cpptools/cppcompletionassist.h | 2 +-
src/plugins/cpptools/cppcompletionassistprovider.h | 4 +---
6 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 96d2da62c28..88c35533713 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 152439c54ae..7a6946bd57c 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 abb8286c002..9eecd714768 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 a0a2e2b0556..251881a4c99 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 c385646f6f8..44d5bc8d779 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 f60c5bb1020..7fc8e3d39b0 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;
--
GitLab