summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-11-27 18:21:46 +0100
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-11-30 11:03:51 +0000
commit5f98b8ec24051280dbdbc1fed52300ee15f01701 (patch)
tree161199a67bf62156fee922d2d639976ea5ee0363 /src/plugins/clangcodemodel/clangcodemodelplugin.cpp
parentdaf936967986ed05e7a0fdcc261d88ee181b2422 (diff)
downloadqt-creator-5f98b8ec24051280dbdbc1fed52300ee15f01701.tar.gz
Clang: Remove PchManager
...which is the last dependency to libclang from the plugin. Change-Id: I173ee7e9621912ec88706b4cf62db2b1dbcf7610 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcodemodelplugin.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.cpp33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 35229a68dc..069923ff5f 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -32,7 +32,6 @@
#include "clangprojectsettingspropertiespage.h"
#include "constants.h"
-#include "pchmanager.h"
#ifdef WITH_TESTS
# include "test/clangcodecompletion_test.h"
@@ -46,8 +45,6 @@
#include <texteditor/textmark.h>
-#include <clang-c/Index.h>
-
namespace ClangCodeModel {
namespace Internal {
@@ -61,23 +58,6 @@ void initializeTextMarks()
Utils::Theme::ClangCodeModel_Error_TextMarkColor);
}
-static bool clangInitialised = false;
-static QMutex initialisationMutex;
-
-void initializeClang()
-{
- if (clangInitialised)
- return;
-
- QMutexLocker locker(&initialisationMutex);
- if (clangInitialised)
- return;
-
- clang_toggleCrashRecovery(1);
- clang_enableStackTraces();
- clangInitialised = true;
-}
-
} // anonymous namespace
bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -92,19 +72,8 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
panelFactory->setSimpleCreateWidgetFunction<ClangProjectSettingsWidget>(QIcon());
ProjectExplorer::ProjectPanelFactory::registerFactory(panelFactory);
- // Initialize Clang
- ClangCodeModel::Internal::initializeClang();
-
- // Set up PchManager
- PchManager *pchManager = new PchManager(this);
- ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::SessionManager::instance();
- connect(sessionManager, &ProjectExplorer::SessionManager::aboutToRemoveProject,
- pchManager, &PchManager::onAboutToRemoveProject);
- auto cppModelManager = CppTools::CppModelManager::instance();
- connect(cppModelManager, &CppTools::CppModelManager::projectPartsUpdated,
- pchManager, &PchManager::onProjectPartsUpdated);
-
// Register ModelManagerSupportProvider
+ auto cppModelManager = CppTools::CppModelManager::instance();
cppModelManager->setClangModelManagerSupportProvider(&m_modelManagerSupportProvider);
initializeTextMarks();