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

QmlDesigner: Refactor the rewriterView getters in the QmlDesignerPlugin

Browse Source 
Change-Id: I01017b9e8f6ea5a444a6927756b8fb5370020e90
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-06-26 11:25:04 +02:00
parent 1104f50dd5
commit 1cead58e90
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -270,14 +270,14 @@ void QmlDesignerPlugin::jumpTextCursorToSelectedModelNode()
{ {
// visual editor -> text editor // visual editor -> text editor
ModelNode selectedNode; ModelNode selectedNode;
if (!currentDesignDocument()->rewriterView()->selectedModelNodes().isEmpty()) if (!rewriterView()->selectedModelNodes().isEmpty())
selectedNode = currentDesignDocument()->rewriterView()->selectedModelNodes().first(); selectedNode = rewriterView()->selectedModelNodes().first();
if (selectedNode.isValid()) { if (selectedNode.isValid()) {
const int nodeOffset = currentDesignDocument()->rewriterView()->nodeOffset(selectedNode); const int nodeOffset = rewriterView()->nodeOffset(selectedNode);
if (nodeOffset > 0) { if (nodeOffset > 0) {
const ModelNode currentSelectedNode const ModelNode currentSelectedNode
= currentDesignDocument()->rewriterView()->nodeAtTextCursorPosition(currentDesignDocument()->plainTextEdit()->textCursor().position()); = rewriterView()->nodeAtTextCursorPosition(currentDesignDocument()->plainTextEdit()->textCursor().position());
if (currentSelectedNode != selectedNode) { if (currentSelectedNode != selectedNode) {
int line, column; int line, column;
currentDesignDocument()->textEditor()->convertPosition(nodeOffset, &line, &column); currentDesignDocument()->textEditor()->convertPosition(nodeOffset, &line, &column);
@@ -290,9 +290,9 @@ void QmlDesignerPlugin::jumpTextCursorToSelectedModelNode()
void QmlDesignerPlugin::selectModelNodeUnderTextCursor() void QmlDesignerPlugin::selectModelNodeUnderTextCursor()
{ {
const int cursorPosition = currentDesignDocument()->plainTextEdit()->textCursor().position(); const int cursorPosition = currentDesignDocument()->plainTextEdit()->textCursor().position();
ModelNode modelNode = currentDesignDocument()->rewriterView()->nodeAtTextCursorPosition(cursorPosition); ModelNode modelNode = rewriterView()->nodeAtTextCursorPosition(cursorPosition);
if (modelNode.isValid()) if (modelNode.isValid())
currentDesignDocument()->rewriterView()->setSelectedModelNode(modelNode); rewriterView()->setSelectedModelNode(modelNode);
} }
void QmlDesignerPlugin::activateAutoSynchronization() void QmlDesignerPlugin::activateAutoSynchronization()
@@ -321,7 +321,7 @@ void QmlDesignerPlugin::activateAutoSynchronization()
currentDesignDocument()->updateSubcomponentManager(); currentDesignDocument()->updateSubcomponentManager();
connect(currentDesignDocument()->rewriterView(), connect(rewriterView(),
SIGNAL(errorsChanged(QList<RewriterView::Error>)), SIGNAL(errorsChanged(QList<RewriterView::Error>)),
data->mainWidget, data->mainWidget,
SLOT(updateErrorStatus(QList<RewriterView::Error>))); SLOT(updateErrorStatus(QList<RewriterView::Error>)));
@@ -334,7 +334,7 @@ void QmlDesignerPlugin::deactivateAutoSynchronization()
viewManager().detachRewriterView(); viewManager().detachRewriterView();
documentManager().currentDesignDocument()->resetToDocumentModel(); documentManager().currentDesignDocument()->resetToDocumentModel();
disconnect(currentDesignDocument()->rewriterView(), disconnect(rewriterView(),
SIGNAL(errorsChanged(QList<RewriterView::Error>)), SIGNAL(errorsChanged(QList<RewriterView::Error>)),
data->mainWidget, data->mainWidget,
SLOT(updateErrorStatus(QList<RewriterView::Error>))); SLOT(updateErrorStatus(QList<RewriterView::Error>)));
@@ -343,8 +343,13 @@ void QmlDesignerPlugin::deactivateAutoSynchronization()
void QmlDesignerPlugin::resetModelSelection() void QmlDesignerPlugin::resetModelSelection()
{ {
if (currentDesignDocument()->rewriterView() && currentDesignDocument()->currentModel()) if (rewriterView() && currentDesignDocument()->currentModel())
currentDesignDocument()->rewriterView()->setSelectedModelNodes(QList<ModelNode>()); rewriterView()->setSelectedModelNodes(QList<ModelNode>());
}
RewriterView *QmlDesignerPlugin::rewriterView() const
{
return currentDesignDocument()->rewriterView();
} }
static bool checkIfEditorIsQtQuick(Core::IEditor *editor) static bool checkIfEditorIsQtQuick(Core::IEditor *editor)

1
src/plugins/qmldesigner/qmldesignerplugin.h
View File

@@ -113,6 +113,7 @@ private: // functions
void activateAutoSynchronization(); void activateAutoSynchronization();
void deactivateAutoSynchronization(); void deactivateAutoSynchronization();
void resetModelSelection(); void resetModelSelection();
RewriterView *rewriterView() const;
private: // variables private: // variables
QmlDesignerPluginData *data; QmlDesignerPluginData *data;