diff options
12 files changed, 15 insertions, 56 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp index 3f7a705352..de0d02ea79 100644 --- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp @@ -87,17 +87,9 @@ bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId) } } -namespace { -static inline QmlJS::ModelManagerInterface *getModelManager() -{ - ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance(); - return pluginManager->getObject<QmlJS::ModelManagerInterface>(); -} -} - QmlJS::Snapshot BaseTextEditModifier::getSnapshot() const { - QmlJS::ModelManagerInterface *modelManager = getModelManager(); + QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); if (modelManager) return modelManager->snapshot(); else @@ -106,7 +98,7 @@ QmlJS::Snapshot BaseTextEditModifier::getSnapshot() const QStringList BaseTextEditModifier::importPaths() const { - QmlJS::ModelManagerInterface *modelManager = getModelManager(); + QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); if (modelManager) return modelManager->importPaths(); else diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp index 568f8a4a61..2485b4c295 100644 --- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp @@ -203,17 +203,9 @@ void PlainTextEditModifier::reactivateChangeSignals() } } -namespace { -static inline QmlJS::ModelManagerInterface *getModelManager() -{ - ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance(); - return pluginManager->getObject<QmlJS::ModelManagerInterface>(); -} -} - QmlJS::Snapshot NotIndentingTextEditModifier::getSnapshot() const { - QmlJS::ModelManagerInterface *modelManager = getModelManager(); + QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); if (modelManager) return modelManager->snapshot(); else @@ -223,7 +215,7 @@ QmlJS::Snapshot NotIndentingTextEditModifier::getSnapshot() const QStringList NotIndentingTextEditModifier::importPaths() const { - QmlJS::ModelManagerInterface *modelManager = getModelManager(); + QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); if (modelManager) return modelManager->importPaths(); else diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index f58c57935e..8ca6136ab8 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -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>(); diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 1e4698a10a..bea7613fd6 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -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) diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp index aa3dd8c020..65366bbe37 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.cpp +++ b/src/plugins/qmljseditor/qmljsquickfix.cpp @@ -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()); diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index 98822c3280..2b0a19b8cf 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -121,13 +121,6 @@ enum { InspectorUi *InspectorUi::m_instance = 0; -QmlJS::ModelManagerInterface *modelManager() -{ - ExtensionSystem::PluginManager *pm - = ExtensionSystem::PluginManager::instance(); - return pm->getObject<QmlJS::ModelManagerInterface>(); -} - InspectorUi::InspectorUi(QObject *parent) : QObject(parent) , m_listeningToEditorManager(false) @@ -365,7 +358,7 @@ void InspectorUi::connected(ClientProxy *clientProxy) } else { m_toolBar->setZoomToolEnabled(true); } - QmlJS::Snapshot snapshot = modelManager()->snapshot(); + QmlJS::Snapshot snapshot = QmlJS::ModelManagerInterface::instance()->snapshot(); for (QHash<QString, QmlJSLiveTextPreview *>::const_iterator it = m_textPreviews.constBegin(); it != m_textPreviews.constEnd(); ++it) { @@ -481,11 +474,11 @@ void InspectorUi::changeSelectedItems( void InspectorUi::initializeDocuments() { - if (!modelManager() || !m_clientProxy) + if (!QmlJS::ModelManagerInterface::instance() || !m_clientProxy) return; Core::EditorManager *em = Core::EditorManager::instance(); - m_loadedSnapshot = modelManager()->snapshot(); + m_loadedSnapshot = QmlJS::ModelManagerInterface::instance()->snapshot(); if (!m_listeningToEditorManager) { m_listeningToEditorManager = true; @@ -493,7 +486,7 @@ void InspectorUi::initializeDocuments() this, SLOT(removePreviewForEditor(Core::IEditor*))); connect(em, SIGNAL(editorOpened(Core::IEditor*)), this, SLOT(createPreviewForEditor(Core::IEditor*))); - connect(modelManager(), + connect(QmlJS::ModelManagerInterface::instance(), SIGNAL(documentChangedOnDisk(QmlJS::Document::Ptr)), this, SLOT(updatePendingPreviewDocuments(QmlJS::Document::Ptr))); } @@ -508,7 +501,7 @@ void InspectorUi::initializeDocuments() void InspectorUi::serverReloaded() { - QmlJS::Snapshot snapshot = modelManager()->snapshot(); + QmlJS::Snapshot snapshot = QmlJS::ModelManagerInterface::instance()->snapshot(); m_loadedSnapshot = snapshot; for (QHash<QString, QmlJSLiveTextPreview *>::const_iterator it = m_textPreviews.constBegin(); @@ -540,7 +533,7 @@ QmlJSLiveTextPreview *InspectorUi::createPreviewForEditor( ) { QString filename = newEditor->document()->fileName(); - QmlJS::Document::Ptr doc = modelManager()->snapshot().document(filename); + QmlJS::Document::Ptr doc = QmlJS::ModelManagerInterface::instance()->snapshot().document(filename); if (!doc) { if (filename.endsWith(".qml")) { // add to list of docs that we have to update when diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp index 73d2f4e418..5ffa439440 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp @@ -70,13 +70,6 @@ InspectorPlugin::~InspectorPlugin() { } -QmlJS::ModelManagerInterface *InspectorPlugin::modelManager() const -{ - ExtensionSystem::PluginManager *pluginManager - = ExtensionSystem::PluginManager::instance(); - return pluginManager->getObject<QmlJS::ModelManagerInterface>(); -} - InspectorUi *InspectorPlugin::inspector() const { return m_inspectorUi; diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.h b/src/plugins/qmljsinspector/qmljsinspectorplugin.h index 70bc2c2c12..5ac4c6267f 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.h +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.h @@ -61,7 +61,6 @@ public: //static InspectorPlugin *instance(); - QmlJS::ModelManagerInterface *modelManager() const; InspectorUi *inspector() const; // ExtensionSystem::IPlugin interface diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index 8a103228da..e3bb0ce62d 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -137,13 +137,6 @@ void MapObjectWithDebugReference::process(UiObjectBinding *ast) } } -QmlJS::ModelManagerInterface *QmlJSLiveTextPreview::modelManager() -{ - ExtensionSystem::PluginManager *pm - = ExtensionSystem::PluginManager::instance(); - return pm->getObject<QmlJS::ModelManagerInterface>(); -} - void QmlJSLiveTextPreview::associateEditor(Core::IEditor *editor) { using namespace TextEditor; @@ -197,7 +190,7 @@ QmlJSLiveTextPreview::QmlJSLiveTextPreview(const QmlJS::Document::Ptr &doc, Q_ASSERT(doc->fileName() == initDoc->fileName()); m_filename = doc->fileName(); - connect(modelManager(), SIGNAL(documentChangedOnDisk(QmlJS::Document::Ptr)), + connect(QmlJS::ModelManagerInterface::instance(), SIGNAL(documentChangedOnDisk(QmlJS::Document::Ptr)), SLOT(documentChanged(QmlJS::Document::Ptr))); if (m_clientProxy.data()) { diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.h b/src/plugins/qmljsinspector/qmljslivetextpreview.h index e1ba4ed5ab..59f922d33b 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.h +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.h @@ -100,7 +100,6 @@ private slots: void reloadQmlViewer(); private: - static QmlJS::ModelManagerInterface *modelManager(); QList<int> objectReferencesForOffset(quint32 offset); QVariant castToLiteral(const QString &expression, QmlJS::AST::UiScriptBinding *scriptBinding); diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 0b139f031a..e2cfdc828a 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -89,7 +89,6 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) // m_modelManager, SLOT(updateModifiedSourceFiles())); // connect(fileManager, SIGNAL(filesChangedInternally(QStringList)), // m_modelManager, SLOT(updateSourceFiles(QStringList))); - addAutoReleasedObject(m_modelManager); LocatorData *locatorData = new LocatorData; addAutoReleasedObject(locatorData); diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 0e91df1d7e..285950a058 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -61,7 +61,7 @@ namespace QmlProjectManager { QmlProject::QmlProject(Internal::Manager *manager, const QString &fileName) : m_manager(manager), m_fileName(fileName), - m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJS::ModelManagerInterface>()) + m_modelManager(QmlJS::ModelManagerInterface::instance()) { setProjectContext(Core::Context(QmlProjectManager::Constants::PROJECTCONTEXT)); setProjectLanguage(Core::Context(QmlProjectManager::Constants::LANG_QML)); |