QmlDesigner: modernize code style

- no behavior changes
 - using nullptr
 - renaming data -> d
 - transform single used small slot function to lambdas

Change-Id: Ifae389b8a865b0b6a501b6f3d60597a66d9febe8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>

src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

@@ -1928,19 +1928,19 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<RewriterError> *e
 
     check.enableQmlDesignerChecks();
 
+    QUrl fileNameUrl = QUrl::fromLocalFile(m_document->fileName());
     foreach (const StaticAnalysis::Message &message, check()) {
         if (message.severity == Severity::Error) {
             if (message.type == StaticAnalysis::ErrUnknownComponent)
-                warnings->append(RewriterError(message.toDiagnosticMessage(), QUrl::fromLocalFile(m_document->fileName())));
+                warnings->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl));
             else
-                errors->append(RewriterError(message.toDiagnosticMessage(), QUrl::fromLocalFile(m_document->fileName())));
+                errors->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl));
         }
         if (message.severity == Severity::Warning) {
-            if (message.type == StaticAnalysis::WarnAboutQtQuick1InsteadQtQuick2) {
-                errors->append(RewriterError(message.toDiagnosticMessage(), QUrl::fromLocalFile(m_document->fileName())));
-            } else {
-                warnings->append(RewriterError(message.toDiagnosticMessage(), QUrl::fromLocalFile(m_document->fileName())));
-            }
+            if (message.type == StaticAnalysis::WarnAboutQtQuick1InsteadQtQuick2)
+                errors->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl));
+            else
+                warnings->append(RewriterError(message.toDiagnosticMessage(), fileNameUrl));
         }
     }
 }

src/plugins/qmldesigner/designmodewidget.cpp

@@ -179,7 +179,8 @@ DesignModeWidget::DesignModeWidget(QWidget *parent) :
     m_navigatorHistoryCounter(-1),
     m_keepNavigatorHistory(false)
 {
-    QObject::connect(viewManager().nodeInstanceView(), SIGNAL(qmlPuppetCrashed()), this, SLOT(showQmlPuppetCrashedError()));
+    connect(viewManager().nodeInstanceView(), &NodeInstanceView::qmlPuppetCrashed,
+        this, &DesignModeWidget::showQmlPuppetCrashedError);
 }
 
 DesignModeWidget::~DesignModeWidget()
@@ -288,7 +289,7 @@ void DesignModeWidget::updateErrorStatus(const QList<RewriterError> &errors)
         enableWidgets();
      } else if (!errors.isEmpty()) {
         disableWidgets();
-        showErrorMessage(errors);
+        showMessageBox(errors);
     }
 }
 
@@ -350,12 +351,8 @@ void DesignModeWidget::setup()
         }
     }
 
-
-
     QToolBar *toolBar = new QToolBar;
-
     toolBar->addAction(viewManager().componentViewAction());
-
     toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     m_toolBar->addCenterToolBar(toolBar);
 
@@ -404,11 +401,20 @@ void DesignModeWidget::setup()
     m_leftSideBar.reset(new Core::SideBar(sideBarItems, leftSideBarItems));
     m_rightSideBar.reset(new Core::SideBar(sideBarItems, rightSideBarItems));
 
-    connect(m_leftSideBar.data(), SIGNAL(availableItemsChanged()), SLOT(updateAvailableSidebarItemsRight()));
-    connect(m_rightSideBar.data(), SIGNAL(availableItemsChanged()), SLOT(updateAvailableSidebarItemsLeft()));
+    connect(m_leftSideBar.data(), &Core::SideBar::availableItemsChanged, [=](){
+        // event comes from m_leftSidebar, so update right side.
+        m_rightSideBar->setUnavailableItemIds(m_leftSideBar->unavailableItemIds());
+    });
 
-    connect(Core::ICore::instance(), SIGNAL(coreAboutToClose()),
-            this, SLOT(deleteSidebarWidgets()));
+    connect(m_rightSideBar.data(), &Core::SideBar::availableItemsChanged, [=](){
+        // event comes from m_rightSidebar, so update left side.
+        m_leftSideBar->setUnavailableItemIds(m_rightSideBar->unavailableItemIds());
+    });
+
+    connect(Core::ICore::instance(), &Core::ICore::coreAboutToClose, [=](){
+        m_leftSideBar.reset();
+        m_rightSideBar.reset();
+    });
 
     m_toolBar->setToolbarCreationFlags(Core::EditorToolBar::FlagsStandalone);
     m_toolBar->setNavigationVisible(true);
@@ -445,24 +451,6 @@ void DesignModeWidget::setup()
     show();
 }
 
-void DesignModeWidget::updateAvailableSidebarItemsRight()
-{
-    // event comes from m_leftSidebar, so update right side.
-    m_rightSideBar->setUnavailableItemIds(m_leftSideBar->unavailableItemIds());
-}
-
-void DesignModeWidget::updateAvailableSidebarItemsLeft()
-{
-    // event comes from m_rightSidebar, so update left side.
-    m_leftSideBar->setUnavailableItemIds(m_rightSideBar->unavailableItemIds());
-}
-
-void DesignModeWidget::deleteSidebarWidgets()
-{
-    m_leftSideBar.reset();
-    m_rightSideBar.reset();
-}
-
 void DesignModeWidget::showQmlPuppetCrashedError()
 {
     QList<RewriterError> errorList;
@@ -470,7 +458,7 @@ void DesignModeWidget::showQmlPuppetCrashedError()
     errorList.append(error);
 
     disableWidgets();
-    showErrorMessage(errorList);
+    showMessageBox(errorList);
 }
 
 void DesignModeWidget::toolBarOnGoBackClicked()
@@ -622,7 +610,7 @@ QWidget *DesignModeWidget::createCrumbleBarFrame()
     return frame;
 }
 
-void DesignModeWidget::showErrorMessage(const QList<RewriterError> &errors)
+void DesignModeWidget::showMessageBox(const QList<RewriterError> &errors)
 {
     Q_ASSERT(!errors.isEmpty());
     m_warningWidget->setError(errors.first());

src/plugins/qmldesigner/designmodewidget.h

@@ -100,7 +100,7 @@ public:
 
     void enableWidgets();
     void disableWidgets();
-    void showErrorMessage(const QList<RewriterError> &errors);
+    void showMessageBox(const QList<RewriterError> &errors);
 
     CrumbleBar* crumbleBar() const;
 
@@ -112,10 +112,6 @@ public slots:
     void toggleRightSidebar();
 
 private slots:
-    void updateAvailableSidebarItemsLeft();
-    void updateAvailableSidebarItemsRight();
-
-    void deleteSidebarWidgets();
     void showQmlPuppetCrashedError();
 
     void toolBarOnGoBackClicked();
@@ -136,7 +132,9 @@ private: // functions
     QWidget *createCrumbleBarFrame();
 
 private: // variables
-    QSplitter *m_mainSplitter;
+    QSplitter *m_mainSplitter = nullptr;
+    DocumentWarningWidget *m_warningWidget = nullptr;
+
     QScopedPointer<Core::SideBar> m_leftSideBar;
     QScopedPointer<Core::SideBar> m_rightSideBar;
     QPointer<QWidget> m_topSideBar;
@@ -147,7 +145,6 @@ private: // variables
 
     InitializeStatus m_initStatus;
 
-    DocumentWarningWidget *m_warningWidget;
     QStringList m_navigatorHistory;
     int m_navigatorHistoryCounter;
     bool m_keepNavigatorHistory;

src/plugins/qmldesigner/documentmanager.cpp

@@ -278,7 +278,7 @@ void DocumentManager::setCurrentDesignDocument(Core::IEditor *editor)
 {
     if (editor) {
         m_currentDesignDocument = m_designDocumentHash.value(editor);
-        if (m_currentDesignDocument == 0) {
+        if (m_currentDesignDocument == nullptr) {
             m_currentDesignDocument = new DesignDocument;
             m_designDocumentHash.insert(editor, m_currentDesignDocument);
             m_currentDesignDocument->setEditor(editor);
@@ -405,7 +405,7 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists,
     Utils::FileName qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName();
     ProjectExplorer::Project *project = ProjectExplorer::SessionManager::projectForFile(qmlFileName);
     ProjectExplorer::Node *node = ProjectExplorer::SessionManager::nodeForFile(qmlFileName)->parentFolderNode();
-    ProjectExplorer::Node *iconQrcFileNode = 0;
+    ProjectExplorer::Node *iconQrcFileNode = nullptr;
 
     while (node && !iconQrcFileNode) {
         qCDebug(documentManagerLog) << "Checking" << node->displayName() << "(" << node << node->nodeType() << ")";

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -64,12 +64,14 @@
 
 namespace QmlDesigner {
 
-class QmlDesignerPluginData {
+class QmlDesignerPluginPrivate {
 public:
     ViewManager viewManager;
     DocumentManager documentManager;
     ShortCutManager shortCutManager;
 
+    QMetaObject::Connection rewriterErrorConnection;
+
     Internal::DesignModeWidget *mainWidget;
 
     QmlDesigner::PluginManager pluginManager;
@@ -77,21 +79,59 @@ public:
     Internal::DesignModeContext *context;
 };
 
-QmlDesignerPlugin *QmlDesignerPlugin::m_instance = 0;
+QmlDesignerPlugin *QmlDesignerPlugin::m_instance = nullptr;
 
 static bool isInDesignerMode()
 {
     return Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN;
 }
 
-bool shouldAssertInException()
+static bool checkIfEditorIsQtQuick(Core::IEditor *editor)
+{
+    if (editor)
+    if (editor && editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
+        QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
+        QmlJS::Document::Ptr document = modelManager->ensuredGetDocumentForPath(editor->document()->filePath().toString());
+        if (!document.isNull())
+            return document->language() == QmlJS::Dialect::QmlQtQuick1
+                    || document->language() == QmlJS::Dialect::QmlQtQuick2
+                    || document->language() == QmlJS::Dialect::QmlQtQuick2Ui
+                    || document->language() == QmlJS::Dialect::Qml;
+    }
+
+    return false;
+}
+
+static bool isDesignerMode(Core::Id mode)
+{
+    return mode == Core::DesignMode::instance()->id();
+}
+
+static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::Id newMode)
+{
+    return designDocument
+            && editor == designDocument->editor()
+            && isDesignerMode(newMode);
+}
+
+static bool shouldAssertInException()
 {
     QProcessEnvironment processEnvironment = QProcessEnvironment::systemEnvironment();
     return !processEnvironment.value("QMLDESIGNER_ASSERT_ON_EXCEPTION").isEmpty();
 }
 
+static void switchTextDesign()
+{
+    if (Core::ModeManager::currentMode() == Core::Constants::MODE_EDIT) {
+        Core::IEditor *editor = Core::EditorManager::currentEditor();
+        if (checkIfEditorIsQtQuick(editor))
+            Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN);
+    } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) {
+        Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
+    }
+}
+
 QmlDesignerPlugin::QmlDesignerPlugin()
-    : data(0)
 {
     m_instance = this;
     // Exceptions should never ever assert: they are handled in a number of
@@ -110,13 +150,14 @@ QmlDesignerPlugin::QmlDesignerPlugin()
 
 QmlDesignerPlugin::~QmlDesignerPlugin()
 {
-    if (data) {
-        Core::DesignMode::instance()->unregisterDesignWidget(data->mainWidget);
-        Core::ICore::removeContextObject(data->context);
-        data->context = 0;
+    if (d) {
+        Core::DesignMode::instance()->unregisterDesignWidget(d->mainWidget);
+        Core::ICore::removeContextObject(d->context);
+        d->context = nullptr;
     }
-    delete data;
-    m_instance = 0;
+    delete d;
+    d = nullptr;
+    m_instance = nullptr;
 }
 
 ////////////////////////////////////////////////////
@@ -129,34 +170,32 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
     if (!Utils::HostOsInfo::canCreateOpenGLContext(errorMessage))
         return false;
 
-    data = new QmlDesignerPluginData;
+    d = new QmlDesignerPluginPrivate;
 
-    data->settings.fromSettings(Core::ICore::settings());
+    d->settings.fromSettings(Core::ICore::settings());
 
-    data->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView());
-    data->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool);
-    data->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool);
-    data->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool);
-    data->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::PathTool);
+    d->viewManager.registerViewTakingOwnership(new QmlDesigner::Internal::ConnectionView());
+    d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::SourceTool);
+    d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::ColorTool);
+    d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::TextTool);
+    d->viewManager.registerFormEditorToolTakingOwnership(new QmlDesigner::PathTool);
 
     const Core::Context switchContext(QmlDesigner::Constants::C_QMLDESIGNER,
         QmlJSEditor::Constants::C_QMLJSEDITOR_ID);
 
-    QAction *switchAction = new QAction(tr("Switch Text/Design"), this);
+    QAction *switchTextDesignAction = new QAction(tr("Switch Text/Design"), this);
     Core::Command *command = Core::ActionManager::registerAction(
-                switchAction, QmlDesigner::Constants::SWITCH_TEXT_DESIGN, switchContext);
+                switchTextDesignAction, QmlDesigner::Constants::SWITCH_TEXT_DESIGN, switchContext);
     command->setDefaultKeySequence(QKeySequence(Qt::Key_F4));
 
-
-
     const QString pluginPath = Utils::HostOsInfo::isMacHost()
             ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner")
             : QString(QCoreApplication::applicationDirPath() + "/../"
                       + QLatin1String(IDE_LIBRARY_BASENAME) + "/qtcreator/plugins/qmldesigner");
-    data->pluginManager.setPluginPaths(QStringList() << pluginPath);
+    d->pluginManager.setPluginPaths(QStringList() << pluginPath);
 
     createDesignModeWidget();
-    connect(switchAction, SIGNAL(triggered()), this, SLOT(switchTextDesign()));
+    connect(switchTextDesignAction, &QAction::triggered, this, &switchTextDesign);
 
     addAutoReleasedObject(new Internal::SettingsPage);
 
@@ -169,64 +208,77 @@ void QmlDesignerPlugin::extensionsInitialized()
     mimeTypes.append(QmlJSTools::Constants::QML_MIMETYPE);
     mimeTypes.append(QmlJSTools::Constants::QMLUI_MIMETYPE);
 
-    Core::DesignMode::instance()->registerDesignWidget(data->mainWidget, mimeTypes, data->context->context());
-    connect(Core::DesignMode::instance(),
-            SIGNAL(actionsUpdated(Core::IEditor*)),
-            &data->shortCutManager,
-            SLOT(updateActions(Core::IEditor*)));
+    Core::DesignMode::instance()->registerDesignWidget(d->mainWidget, mimeTypes, d->context->context());
+    connect(Core::DesignMode::instance(), &Core::DesignMode::actionsUpdated,
+        &d->shortCutManager, &ShortCutManager::updateActions);
 }
 
 void QmlDesignerPlugin::createDesignModeWidget()
 {
-    data->mainWidget = new Internal::DesignModeWidget;
+    d->mainWidget = new Internal::DesignModeWidget;
 
-    data->context = new Internal::DesignModeContext(data->mainWidget);
-    Core::ICore::addContextObject(data->context);
+    d->context = new Internal::DesignModeContext(d->mainWidget);
+    Core::ICore::addContextObject(d->context);
     Core::Context qmlDesignerMainContext(Constants::C_QMLDESIGNER);
     Core::Context qmlDesignerFormEditorContext(Constants::C_QMLFORMEDITOR);
     Core::Context qmlDesignerNavigatorContext(Constants::C_QMLNAVIGATOR);
 
-    data->context->context().add(qmlDesignerMainContext);
-    data->context->context().add(qmlDesignerFormEditorContext);
-    data->context->context().add(qmlDesignerNavigatorContext);
-    data->context->context().add(ProjectExplorer::Constants::LANG_QMLJS);
+    d->context->context().add(qmlDesignerMainContext);
+    d->context->context().add(qmlDesignerFormEditorContext);
+    d->context->context().add(qmlDesignerNavigatorContext);
+    d->context->context().add(ProjectExplorer::Constants::LANG_QMLJS);
 
-    data->shortCutManager.registerActions(qmlDesignerMainContext, qmlDesignerFormEditorContext, qmlDesignerNavigatorContext);
+    d->shortCutManager.registerActions(qmlDesignerMainContext, qmlDesignerFormEditorContext, qmlDesignerNavigatorContext);
 
-    connect(Core::EditorManager::instance(),
-            SIGNAL(currentEditorChanged(Core::IEditor*)),
-            this,
-            SLOT(onCurrentEditorChanged(Core::IEditor*)));
+    connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, [=] (Core::IEditor *editor) {
+        if (d && checkIfEditorIsQtQuick(editor) && isInDesignerMode()) {
+            d->shortCutManager.updateActions(editor);
+            changeEditor();
+        }
+    });
 
-    connect(Core::EditorManager::instance(),
-            SIGNAL(editorsClosed(QList<Core::IEditor*>)),
-            this,
-            SLOT(onTextEditorsClosed(QList<Core::IEditor*>)));
+    connect(Core::EditorManager::instance(), &Core::EditorManager::editorsClosed, [=] (QList<Core::IEditor*> editors) {
+        if (d) {
+            if (d->documentManager.hasCurrentDesignDocument()
+                    && editors.contains(d->documentManager.currentDesignDocument()->textEditor()))
+                hideDesigner();
+
+            d->documentManager.removeEditors(editors);
+        }
+    });
 
     connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
-            this, &QmlDesignerPlugin::onCurrentModeChanged);
+        [=] (Core::Id newMode, Core::Id oldMode) {
+        if (d && Core::EditorManager::currentEditor() && checkIfEditorIsQtQuick
+                (Core::EditorManager::currentEditor()) && !documentIsAlreadyOpen(
+                currentDesignDocument(), Core::EditorManager::currentEditor(), newMode)) {
 
+            if (!isDesignerMode(newMode) && isDesignerMode(oldMode))
+                hideDesigner();
+            else if (Core::EditorManager::currentEditor() && isDesignerMode(newMode))
+                showDesigner();
+            else if (currentDesignDocument())
+                hideDesigner();
+        }
+    });
 }
 
 void QmlDesignerPlugin::showDesigner()
 {
-    QTC_ASSERT(!data->documentManager.hasCurrentDesignDocument(), return);
+    QTC_ASSERT(!d->documentManager.hasCurrentDesignDocument(), return);
 
-    data->shortCutManager.disconnectUndoActions(currentDesignDocument());
+    d->shortCutManager.disconnectUndoActions(currentDesignDocument());
+    d->documentManager.setCurrentDesignDocument(Core::EditorManager::currentEditor());
+    d->shortCutManager.connectUndoActions(currentDesignDocument());
+    d->mainWidget->initialize();
 
-    data->documentManager.setCurrentDesignDocument(Core::EditorManager::currentEditor());
-
-    data->shortCutManager.connectUndoActions(currentDesignDocument());
-
-    data->mainWidget->initialize();
-
-    if (data->documentManager.hasCurrentDesignDocument()) {
+    if (d->documentManager.hasCurrentDesignDocument()) {
         activateAutoSynchronization();
-        data->shortCutManager.updateActions(currentDesignDocument()->textEditor());
-        data->viewManager.pushFileOnCrumbleBar(data->documentManager.currentDesignDocument()->fileName().fileName());
+        d->shortCutManager.updateActions(currentDesignDocument()->textEditor());
+        d->viewManager.pushFileOnCrumbleBar(d->documentManager.currentDesignDocument()->fileName().fileName());
     }
 
-    data->shortCutManager.updateUndoActions(currentDesignDocument());
+    d->shortCutManager.updateUndoActions(currentDesignDocument());
 }
 
 void QmlDesignerPlugin::hideDesigner()
@@ -236,41 +288,35 @@ void QmlDesignerPlugin::hideDesigner()
             && !currentDesignDocument()->hasQmlParseErrors())
         jumpTextCursorToSelectedModelNode();
 
-
-    if (data->documentManager.hasCurrentDesignDocument()) {
+    if (d->documentManager.hasCurrentDesignDocument()) {
         deactivateAutoSynchronization();
-        data->mainWidget->saveSettings();
+        d->mainWidget->saveSettings();
     }
 
-    data->shortCutManager.disconnectUndoActions(currentDesignDocument());
-
-    data->documentManager.setCurrentDesignDocument(0);
-
-    data->shortCutManager.updateUndoActions(0);
+    d->shortCutManager.disconnectUndoActions(currentDesignDocument());
+    d->documentManager.setCurrentDesignDocument(nullptr);
+    d->shortCutManager.updateUndoActions(nullptr);
 }
 
 void QmlDesignerPlugin::changeEditor()
 {
-    if (data->documentManager.hasCurrentDesignDocument()) {
+    if (d->documentManager.hasCurrentDesignDocument()) {
         deactivateAutoSynchronization();
-        data->mainWidget->saveSettings();
+        d->mainWidget->saveSettings();
     }
 
-    data->shortCutManager.disconnectUndoActions(currentDesignDocument());
+    d->shortCutManager.disconnectUndoActions(currentDesignDocument());
+    d->documentManager.setCurrentDesignDocument(Core::EditorManager::currentEditor());
+    d->mainWidget->initialize();
+    d->shortCutManager.connectUndoActions(currentDesignDocument());
 
-    data->documentManager.setCurrentDesignDocument(Core::EditorManager::currentEditor());
-
-    data->mainWidget->initialize();
-
-    data->shortCutManager.connectUndoActions(currentDesignDocument());
-
-    if (data->documentManager.hasCurrentDesignDocument()) {
+    if (d->documentManager.hasCurrentDesignDocument()) {
         activateAutoSynchronization();
-        data->viewManager.pushFileOnCrumbleBar(data->documentManager.currentDesignDocument()->fileName().fileName());
-        data->viewManager.setComponentViewToMaster();
+        d->viewManager.pushFileOnCrumbleBar(d->documentManager.currentDesignDocument()->fileName().fileName());
+        d->viewManager.setComponentViewToMaster();
     }
 
-    data->shortCutManager.updateUndoActions(currentDesignDocument());
+    d->shortCutManager.updateUndoActions(currentDesignDocument());
 }
 
 void QmlDesignerPlugin::jumpTextCursorToSelectedModelNode()
@@ -283,8 +329,8 @@ void QmlDesignerPlugin::jumpTextCursorToSelectedModelNode()
     if (selectedNode.isValid()) {
         const int nodeOffset = rewriterView()->nodeOffset(selectedNode);
         if (nodeOffset > 0) {
-            const ModelNode currentSelectedNode
-                    = rewriterView()->nodeAtTextCursorPosition(currentDesignDocument()->plainTextEdit()->textCursor().position());
+            const ModelNode currentSelectedNode = rewriterView()->
+                nodeAtTextCursorPosition(currentDesignDocument()->plainTextEdit()->textCursor().position());
             if (currentSelectedNode != selectedNode) {
                 int line, column;
                 currentDesignDocument()->textEditor()->convertPosition(nodeOffset, &line, &column);
@@ -319,19 +365,17 @@ void QmlDesignerPlugin::activateAutoSynchronization()
     QList<RewriterError> errors = currentDesignDocument()->qmlParseErrors();
     if (errors.isEmpty()) {
         selectModelNodeUnderTextCursor();
-        data->mainWidget->enableWidgets();
-        data->mainWidget->setupNavigatorHistory(currentDesignDocument()->textEditor());
+        d->mainWidget->enableWidgets();
+        d->mainWidget->setupNavigatorHistory(currentDesignDocument()->textEditor());
     } else {
-        data->mainWidget->disableWidgets();
-        data->mainWidget->showErrorMessage(errors);
+        d->mainWidget->disableWidgets();
+        d->mainWidget->showMessageBox(errors + currentDesignDocument()->qmlParseWarnings());
     }
 
     currentDesignDocument()->updateSubcomponentManager();
 
-    connect(rewriterView(),
-            SIGNAL(errorsChanged(QList<RewriterError>)),
-            data->mainWidget,
-            SLOT(updateErrorStatus(QList<RewriterError>)));
+    d->rewriterErrorConnection = connect(rewriterView(), &RewriterView::errorsChanged,
+        d->mainWidget, &Internal::DesignModeWidget::updateErrorStatus);
 }
 
 void QmlDesignerPlugin::deactivateAutoSynchronization()
@@ -341,11 +385,7 @@ void QmlDesignerPlugin::deactivateAutoSynchronization()
     viewManager().detachRewriterView();
     documentManager().currentDesignDocument()->resetToDocumentModel();
 
-    disconnect(rewriterView(),
-               SIGNAL(errorsChanged(QList<RewriterError>)),
-               data->mainWidget,
-               SLOT(updateErrorStatus(QList<RewriterError>)));
-
+    disconnect(d->rewriterErrorConnection);
 }
 
 void QmlDesignerPlugin::resetModelSelection()
@@ -364,94 +404,27 @@ Model *QmlDesignerPlugin::currentModel() const
     return currentDesignDocument()->currentModel();
 }
 
-static bool checkIfEditorIsQtQuick(Core::IEditor *editor)
-{
-    if (editor)
-    if (editor && editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
-        QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
-        QmlJS::Document::Ptr document = modelManager->ensuredGetDocumentForPath(editor->document()->filePath().toString());
-        if (!document.isNull())
-            return document->language() == QmlJS::Dialect::QmlQtQuick1
-                    || document->language() == QmlJS::Dialect::QmlQtQuick2
-                    || document->language() == QmlJS::Dialect::QmlQtQuick2Ui
-                    || document->language() == QmlJS::Dialect::Qml;
-    }
-
-    return false;
-}
-
-void QmlDesignerPlugin::onCurrentEditorChanged(Core::IEditor *editor)
-{
-    if (data
-            && checkIfEditorIsQtQuick(editor)
-            && isInDesignerMode())
-    {
-        data->shortCutManager.updateActions(editor);
-        changeEditor();
-    }
-}
-
-static bool isDesignerMode(Core::Id mode)
-{
-    return mode == Core::DesignMode::instance()->id();
-}
-
-
-
-static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::Id newMode)
-{
-    return designDocument
-            && editor == designDocument->editor()
-            && isDesignerMode(newMode);
-}
-
-void QmlDesignerPlugin::onCurrentModeChanged(Core::Id newMode, Core::Id oldMode)
-{
-    if (data
-            && Core::EditorManager::currentEditor()
-            && checkIfEditorIsQtQuick(Core::EditorManager::currentEditor())
-            && !documentIsAlreadyOpen(currentDesignDocument(), Core::EditorManager::currentEditor(), newMode)) {
-
-        if (!isDesignerMode(newMode) && isDesignerMode(oldMode))
-            hideDesigner();
-        else  if (Core::EditorManager::currentEditor()
-                  && isDesignerMode(newMode))
-            showDesigner();
-        else if (currentDesignDocument())
-            hideDesigner();
-    }
-}
-
 DesignDocument *QmlDesignerPlugin::currentDesignDocument() const
 {
-    if (data)
-        return data->documentManager.currentDesignDocument();
+    if (d)
+        return d->documentManager.currentDesignDocument();
 
-    return 0;
+    return nullptr;
 }
 
 Internal::DesignModeWidget *QmlDesignerPlugin::mainWidget() const
 {
-    if (data)
-        return data->mainWidget;
+    if (d)
+        return d->mainWidget;
 
-    return 0;
+    return nullptr;
 }
 
 void QmlDesignerPlugin::switchToTextModeDeferred()
 {
-    QTimer::singleShot(0, this, SLOT(switschToTextMode()));
-}
-
-void QmlDesignerPlugin::onTextEditorsClosed(QList<Core::IEditor*> editors)
-{
-    if (data) {
-        if (data->documentManager.hasCurrentDesignDocument()
-                && editors.contains(data->documentManager.currentDesignDocument()->textEditor()))
-            hideDesigner();
-
-        data->documentManager.removeEditors(editors);
-    }
+    QTimer::singleShot(0, this, [] () {
+        Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
+    });
 }
 
 QmlDesignerPlugin *QmlDesignerPlugin::instance()
@@ -461,61 +434,45 @@ QmlDesignerPlugin *QmlDesignerPlugin::instance()
 
 DocumentManager &QmlDesignerPlugin::documentManager()
 {
-    return data->documentManager;
+    return d->documentManager;
 }
 
 const DocumentManager &QmlDesignerPlugin::documentManager() const
 {
-    return data->documentManager;
+    return d->documentManager;
 }
 
 ViewManager &QmlDesignerPlugin::viewManager()
 {
-    return data->viewManager;
+    return d->viewManager;
 }
 
 const ViewManager &QmlDesignerPlugin::viewManager() const
 {
-    return data->viewManager;
+    return d->viewManager;
 }
 
 DesignerActionManager &QmlDesignerPlugin::designerActionManager()
 {
-    return data->viewManager.designerActionManager();
+    return d->viewManager.designerActionManager();
 }
 
 const DesignerActionManager &QmlDesignerPlugin::designerActionManager() const
 {
-    return data->viewManager.designerActionManager();
-}
-
-void QmlDesignerPlugin::switchTextDesign()
-{
-    if (Core::ModeManager::currentMode() == Core::Constants::MODE_EDIT) {
-        Core::IEditor *editor = Core::EditorManager::currentEditor();
-        if (checkIfEditorIsQtQuick(editor))
-            Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN);
-    } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) {
-        Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
-    }
-}
-
-void QmlDesignerPlugin::switschToTextMode()
-{
-    Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
+    return d->viewManager.designerActionManager();
 }
 
 DesignerSettings QmlDesignerPlugin::settings()
 {
-    data->settings.fromSettings(Core::ICore::settings());
-    return data->settings;
+    d->settings.fromSettings(Core::ICore::settings());
+    return d->settings;
 }
 
 void QmlDesignerPlugin::setSettings(const DesignerSettings &s)
 {
-    if (s != data->settings) {
-        data->settings = s;
-        data->settings.toSettings(Core::ICore::settings());
+    if (s != d->settings) {
+        d->settings = s;
+        d->settings.toSettings(Core::ICore::settings());
     }
 }
 

src/plugins/qmldesigner/qmldesignerplugin.h

@@ -48,7 +48,7 @@ namespace Core {
 
 namespace QmlDesigner {
 
-class QmlDesignerPluginData;
+class QmlDesignerPluginPrivate;
 
 namespace Internal { class DesignModeWidget; }
 
@@ -84,13 +84,6 @@ public:
 
     void switchToTextModeDeferred();
 
-private slots:
-    void switchTextDesign();
-    void switschToTextMode();
-    void onTextEditorsClosed(QList<Core::IEditor *> editors);
-    void onCurrentEditorChanged(Core::IEditor *editor);
-    void onCurrentModeChanged(Core::Id mode, Core::Id oldMode);
-
 private: // functions
     void createDesignModeWidget();
     void showDesigner();
@@ -105,7 +98,7 @@ private: // functions
     Model *currentModel() const;
 
 private: // variables
-    QmlDesignerPluginData *data;
+    QmlDesignerPluginPrivate *d = nullptr;
     static QmlDesignerPlugin *m_instance;
 
 };