diff options
author | Benjamin Zeller <benjamin.zeller@canonical.com> | 2015-02-04 17:54:46 +0100 |
---|---|---|
committer | Benjamin Zeller <benjamin.zeller@canonical.com> | 2015-02-24 09:54:43 +0000 |
commit | 99e9643dea3871f26c5a09e4a1715ba84c9103e9 (patch) | |
tree | bc9045a5081cb8d6b4886fae2f4fa353a771d8e7 /src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp | |
parent | f4a3b4ca5fa312df82f0067e9139fc18bc4fd57f (diff) |
Make it possible to register multiple cmake instances
This patch add the CMakeToolManager, a central repository for cmake instances.
One instance is always the currently used "default". By that its possible to
switch between different cmake installations. The next step will be adding
it to the Kits.
Change-Id: I310fdd805e0ed239077a5632303e891dbd1d9ea1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp index f5bdc88cf3..76e1d4bb26 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp @@ -32,6 +32,7 @@ #include "cmakeprojectconstants.h" #include "cmakeprojectmanager.h" #include "cmakesettingspage.h" +#include "cmaketoolmanager.h" #include <texteditor/codeassist/keywordscompletionassist.h> @@ -41,8 +42,7 @@ using namespace TextEditor; // ------------------------------- // CMakeFileCompletionAssistProvider // ------------------------------- -CMakeFileCompletionAssistProvider::CMakeFileCompletionAssistProvider(CMakeSettingsPage *settingsPage) - : m_settingsPage(settingsPage) +CMakeFileCompletionAssistProvider::CMakeFileCompletionAssistProvider() {} CMakeFileCompletionAssistProvider::~CMakeFileCompletionAssistProvider() @@ -55,5 +55,10 @@ bool CMakeFileCompletionAssistProvider::supportsEditor(Core::Id editorId) const IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor() const { - return new KeywordsCompletionAssistProcessor(m_settingsPage->keywords()); + TextEditor::Keywords keywords = TextEditor::Keywords(QStringList(), QStringList(), QMap<QString, QStringList>()); + CMakeTool *cmake = CMakeToolManager::defaultCMakeTool(); + if (cmake && cmake->isValid()) + keywords = cmake->keywords(); + + return new KeywordsCompletionAssistProcessor(keywords); } |