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

QmlDesigner: remove unnecessary code

Browse Source 
Change-Id: Ib10fa0513f326b3047b93f8cbedc1a11f2bd1f90
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-10-25 19:15:07 +02:00
parent e25ac57f38
commit a0f1473dc1
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -248,21 +248,6 @@ void DesignModeWidget::updateErrorStatus(const QList<RewriterError> &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<QToolButton*> &buttons) static void hideToolButtons(QList<QToolButton*> &buttons)
{ {
foreach (QToolButton *button, buttons) foreach (QToolButton *button, buttons)
@@ -319,13 +304,10 @@ void DesignModeWidget::setup()
m_warningWidget->setVisible(false); m_warningWidget->setVisible(false);
connect(m_warningWidget.data(), &DocumentWarningWidget::gotoCodeClicked, [=] connect(m_warningWidget.data(), &DocumentWarningWidget::gotoCodeClicked, [=]
(const QString &filePath, int codeLine, int codeColumn) { (const QString &filePath, int codeLine, int codeColumn) {
Q_UNUSED(filePath); Q_UNUSED(filePath);
QTC_ASSERT(textEditor(), return;); if (currentDesignDocument() && currentDesignDocument()->textEditor())
QTC_ASSERT(textEditor()->textDocument()->filePath().toString() == filePath, currentDesignDocument()->textEditor()->gotoLine(codeLine, codeColumn);
qDebug() << Q_FUNC_INFO << textEditor()->textDocument()->filePath().toString() << filePath; );
textEditor()->gotoLine(codeLine, codeColumn);
Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
}); });

3
src/plugins/qmldesigner/designmodewidget.h
View File

@@ -68,8 +68,6 @@ public:
void readSettings(); void readSettings();
void saveSettings(); void saveSettings();
TextEditor::BaseTextEditor *textEditor() const;
DesignDocument *currentDesignDocument() const; DesignDocument *currentDesignDocument() const;
ViewManager &viewManager(); ViewManager &viewManager();
@@ -97,7 +95,6 @@ private slots:
private: // functions private: // functions
enum InitializeStatus { NotInitialized, Initializing, Initialized }; enum InitializeStatus { NotInitialized, Initializing, Initialized };
void setCurrentDesignDocument(DesignDocument *newDesignDocument);
void setup(); void setup();
bool isInNodeDefinition(int nodeOffset, int nodeLength, int cursorPos) const; bool isInNodeDefinition(int nodeOffset, int nodeLength, int cursorPos) const;
QmlDesigner::ModelNode nodeForPosition(int cursorPos) const; QmlDesigner::ModelNode nodeForPosition(int cursorPos) const;