From a0f1473dc17ea53faf18249f586be582e360c6f6 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 25 Oct 2016 19:15:07 +0200 Subject: [PATCH] QmlDesigner: remove unnecessary code Change-Id: Ib10fa0513f326b3047b93f8cbedc1a11f2bd1f90 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designmodewidget.cpp | 22 ++------------------ src/plugins/qmldesigner/designmodewidget.h | 3 --- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 64c5bbc26bf..2f2a9b67d58 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -248,21 +248,6 @@ void DesignModeWidget::updateErrorStatus(const QList &errors) } } -TextEditor::BaseTextEditor *DesignModeWidget::textEditor() const -{ - return currentDesignDocument()->textEditor(); -} - -void DesignModeWidget::setCurrentDesignDocument(DesignDocument *newDesignDocument) -{ - if (debug) - qDebug() << Q_FUNC_INFO << newDesignDocument; - - //viewManager().setDesignDocument(newDesignDocument); - - -} - static void hideToolButtons(QList &buttons) { foreach (QToolButton *button, buttons) @@ -319,13 +304,10 @@ void DesignModeWidget::setup() m_warningWidget->setVisible(false); connect(m_warningWidget.data(), &DocumentWarningWidget::gotoCodeClicked, [=] (const QString &filePath, int codeLine, int codeColumn) { - Q_UNUSED(filePath); - QTC_ASSERT(textEditor(), return;); - QTC_ASSERT(textEditor()->textDocument()->filePath().toString() == filePath, - qDebug() << Q_FUNC_INFO << textEditor()->textDocument()->filePath().toString() << filePath; ); - textEditor()->gotoLine(codeLine, codeColumn); + if (currentDesignDocument() && currentDesignDocument()->textEditor()) + currentDesignDocument()->textEditor()->gotoLine(codeLine, codeColumn); Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); }); diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h index a865bf6105f..f743432d515 100644 --- a/src/plugins/qmldesigner/designmodewidget.h +++ b/src/plugins/qmldesigner/designmodewidget.h @@ -68,8 +68,6 @@ public: void readSettings(); void saveSettings(); - TextEditor::BaseTextEditor *textEditor() const; - DesignDocument *currentDesignDocument() const; ViewManager &viewManager(); @@ -97,7 +95,6 @@ private slots: private: // functions enum InitializeStatus { NotInitialized, Initializing, Initialized }; - void setCurrentDesignDocument(DesignDocument *newDesignDocument); void setup(); bool isInNodeDefinition(int nodeOffset, int nodeLength, int cursorPos) const; QmlDesigner::ModelNode nodeForPosition(int cursorPos) const;