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

Don't add singleton model manager to object pool.

Browse Source 
Change-Id: Iffca99867b25500fc77bbcf1e17a50a7cc4cf832
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Eike Ziller
2012-05-04 10:56:54 +02:00
parent 5539ed41ac
commit 2ae6d86e07
12 changed files with 15 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -507,7 +507,7 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) :
baseTextDocument()->setSyntaxHighlighter(new Highlighter(document()));
baseTextDocument()->setCodec(QTextCodec::codecForName("UTF-8")); // qml files are defined to be utf-8
m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
m_modelManager = QmlJS::ModelManagerInterface::instance();
m_contextPane = ExtensionSystem::PluginManager::instance()->getObject<QmlJS::IContextPane>();

3
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -93,8 +93,7 @@ namespace {
HoverHandler::HoverHandler(QObject *parent) : BaseHoverHandler(parent), m_modelManager(0)
{
m_modelManager =
ExtensionSystem::PluginManager::instance()->getObject<QmlJS::ModelManagerInterface>();
m_modelManager = QmlJS::ModelManagerInterface::instance();
}
bool HoverHandler::acceptEditor(IEditor *editor)

2
src/plugins/qmljseditor/qmljsquickfix.cpp
View File

@@ -65,7 +65,7 @@ QmlJSQuickFixOperation::~QmlJSQuickFixOperation()
void QmlJSQuickFixOperation::perform()
{
QmlJSRefactoringChanges refactoring(ExtensionSystem::PluginManager::instance()->getObject<QmlJS::ModelManagerInterface>(),
QmlJSRefactoringChanges refactoring(QmlJS::ModelManagerInterface::instance(),
m_interface->semanticInfo().snapshot);
QmlJSRefactoringFilePtr current = refactoring.file(fileName());