From 2db0f875cb238925596adce7a5cda8fd3c178b36 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 25 Aug 2014 20:01:46 +0200 Subject: [PATCH] QmlJSEditor: Rename QmlJSTextEditorWidget to QmlJSEditorWidget Matches the general pattern and is shorter. Change-Id: Ib29ff5203a707f2152a9dfab42bcfd5697d0a7dc Reviewed-by: Fawzi Mohamed --- src/plugins/qmljseditor/qmljseditor.cpp | 72 +++++++++---------- src/plugins/qmljseditor/qmljseditor.h | 6 +- src/plugins/qmljseditor/qmljseditorplugin.cpp | 6 +- src/plugins/qmljseditor/qmljshoverhandler.cpp | 4 +- src/plugins/qmljseditor/qmljshoverhandler.h | 4 +- src/plugins/qmljseditor/qmljsoutline.cpp | 4 +- src/plugins/qmljseditor/qmljsoutline.h | 4 +- .../qmljseditor/qmljsquickfixassist.cpp | 2 +- src/plugins/qmljseditor/qmljsquickfixassist.h | 2 +- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 3feb81dd2ed..ca7a76fab61 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -106,7 +106,7 @@ namespace Internal { // QmlJSEditorWidget // -QmlJSTextEditorWidget::QmlJSTextEditorWidget(BaseTextDocumentPtr doc) +QmlJSEditorWidget::QmlJSEditorWidget(BaseTextDocumentPtr doc) { setTextDocument(doc); setAutoCompleter(new AutoCompleter); @@ -160,11 +160,11 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(BaseTextDocumentPtr doc) createToolBar(); } -QmlJSTextEditorWidget::~QmlJSTextEditorWidget() +QmlJSEditorWidget::~QmlJSEditorWidget() { } -QModelIndex QmlJSTextEditorWidget::outlineModelIndex() +QModelIndex QmlJSEditorWidget::outlineModelIndex() { if (!m_outlineModelIndex.isValid()) { m_outlineModelIndex = indexForPosition(position()); @@ -176,7 +176,7 @@ QModelIndex QmlJSTextEditorWidget::outlineModelIndex() IEditor *QmlJSEditor::duplicate() { auto editor = new QmlJSEditor; - auto widget = new QmlJSTextEditorWidget(editorWidget()->textDocumentPtr()); + auto widget = new QmlJSEditorWidget(editorWidget()->textDocumentPtr()); editor->setEditorWidget(widget); editor->configureCodeAssistant(); return editor; @@ -225,7 +225,7 @@ static void appendExtraSelectionsForMessages( } } -void QmlJSTextEditorWidget::updateCodeWarnings(QmlJS::Document::Ptr doc) +void QmlJSEditorWidget::updateCodeWarnings(QmlJS::Document::Ptr doc) { if (doc->ast()) { setExtraSelections(CodeWarningsSelection, QList()); @@ -239,13 +239,13 @@ void QmlJSTextEditorWidget::updateCodeWarnings(QmlJS::Document::Ptr doc) } } -void QmlJSTextEditorWidget::modificationChanged(bool changed) +void QmlJSEditorWidget::modificationChanged(bool changed) { if (!changed && m_modelManager) m_modelManager->fileChangedOnDisk(textDocument()->filePath()); } -void QmlJSTextEditorWidget::jumpToOutlineElement(int /*index*/) +void QmlJSEditorWidget::jumpToOutlineElement(int /*index*/) { QModelIndex index = m_outlineCombo->view()->currentIndex(); AST::SourceLocation location = m_qmlJsEditorDocument->outlineModel()->sourceLocation(index); @@ -263,7 +263,7 @@ void QmlJSTextEditorWidget::jumpToOutlineElement(int /*index*/) setFocus(); } -void QmlJSTextEditorWidget::updateOutlineIndexNow() +void QmlJSEditorWidget::updateOutlineIndexNow() { if (!m_qmlJsEditorDocument->outlineModel()->document()) return; @@ -307,7 +307,7 @@ static QList removeMarkersOfType(const QList &ma return result; } -void QmlJSTextEditorWidget::updateContextPane() +void QmlJSEditorWidget::updateContextPane() { const SemanticInfo info = m_qmlJsEditorDocument->semanticInfo(); if (m_contextPane && document() && info.isValid() @@ -348,13 +348,13 @@ void QmlJSTextEditorWidget::updateContextPane() } } -void QmlJSTextEditorWidget::showTextMarker() +void QmlJSEditorWidget::showTextMarker() { m_oldCursorPosition = -1; updateContextPane(); } -void QmlJSTextEditorWidget::updateUses() +void QmlJSEditorWidget::updateUses() { if (m_qmlJsEditorDocument->isSemanticInfoOutdated()) // will be updated when info is updated return; @@ -465,7 +465,7 @@ protected: } }; -void QmlJSTextEditorWidget::setSelectedElements() +void QmlJSEditorWidget::setSelectedElements() { if (!receivers(SIGNAL(selectedElementsChanged(QList,QString)))) return; @@ -503,7 +503,7 @@ void QmlJSTextEditorWidget::setSelectedElements() emit selectedElementsChanged(offsets, wordAtCursor); } -void QmlJSTextEditorWidget::applyFontSettings() +void QmlJSEditorWidget::applyFontSettings() { BaseTextEditorWidget::applyFontSettings(); if (!m_qmlJsEditorDocument->isSemanticInfoOutdated()) @@ -511,7 +511,7 @@ void QmlJSTextEditorWidget::applyFontSettings() } -QString QmlJSTextEditorWidget::wordUnderCursor() const +QString QmlJSEditorWidget::wordUnderCursor() const { QTextCursor tc = textCursor(); const QChar ch = document()->characterAt(tc.position() - 1); @@ -524,7 +524,7 @@ QString QmlJSTextEditorWidget::wordUnderCursor() const return word; } -bool QmlJSTextEditorWidget::isClosingBrace(const QList &tokens) const +bool QmlJSEditorWidget::isClosingBrace(const QList &tokens) const { if (tokens.size() == 1) { @@ -536,12 +536,12 @@ bool QmlJSTextEditorWidget::isClosingBrace(const QList &tokens) const return false; } -BaseTextEditor *QmlJSTextEditorWidget::createEditor() +BaseTextEditor *QmlJSEditorWidget::createEditor() { QTC_ASSERT("should not happen anymore" && false, return 0); } -void QmlJSTextEditorWidget::createToolBar() +void QmlJSEditorWidget::createToolBar() { m_outlineCombo = new QComboBox; m_outlineCombo->setMinimumContentsLength(22); @@ -578,7 +578,7 @@ void QmlJSTextEditorWidget::createToolBar() insertExtraToolBarWidget(BaseTextEditorWidget::Left, m_outlineCombo); } -BaseTextEditorWidget::Link QmlJSTextEditorWidget::findLinkAt(const QTextCursor &cursor, +BaseTextEditorWidget::Link QmlJSEditorWidget::findLinkAt(const QTextCursor &cursor, bool /*resolveTarget*/, bool /*inNextSplit*/) { @@ -661,17 +661,17 @@ BaseTextEditorWidget::Link QmlJSTextEditorWidget::findLinkAt(const QTextCursor & return Link(); } -void QmlJSTextEditorWidget::findUsages() +void QmlJSEditorWidget::findUsages() { m_findReferences->findUsages(textDocument()->filePath(), textCursor().position()); } -void QmlJSTextEditorWidget::renameUsages() +void QmlJSEditorWidget::renameUsages() { m_findReferences->renameUsages(textDocument()->filePath(), textCursor().position()); } -void QmlJSTextEditorWidget::showContextPane() +void QmlJSEditorWidget::showContextPane() { const SemanticInfo info = m_qmlJsEditorDocument->semanticInfo(); if (m_contextPane && info.isValid()) { @@ -685,13 +685,13 @@ void QmlJSTextEditorWidget::showContextPane() } } -void QmlJSTextEditorWidget::performQuickFix(int index) +void QmlJSEditorWidget::performQuickFix(int index) { QuickFixOperation::Ptr op = m_quickFixes.at(index); op->perform(); } -void QmlJSTextEditorWidget::contextMenuEvent(QContextMenuEvent *e) +void QmlJSEditorWidget::contextMenuEvent(QContextMenuEvent *e) { QPointer menu(new QMenu(this)); @@ -746,7 +746,7 @@ void QmlJSTextEditorWidget::contextMenuEvent(QContextMenuEvent *e) delete menu; } -bool QmlJSTextEditorWidget::event(QEvent *e) +bool QmlJSEditorWidget::event(QEvent *e) { switch (e->type()) { case QEvent::ShortcutOverride: @@ -765,7 +765,7 @@ bool QmlJSTextEditorWidget::event(QEvent *e) } -void QmlJSTextEditorWidget::wheelEvent(QWheelEvent *event) +void QmlJSEditorWidget::wheelEvent(QWheelEvent *event) { bool visible = false; if (m_contextPane && m_contextPane->widget()->isVisible()) @@ -779,24 +779,24 @@ void QmlJSTextEditorWidget::wheelEvent(QWheelEvent *event) false, true); } -void QmlJSTextEditorWidget::resizeEvent(QResizeEvent *event) +void QmlJSEditorWidget::resizeEvent(QResizeEvent *event) { BaseTextEditorWidget::resizeEvent(event); hideContextPane(); } - void QmlJSTextEditorWidget::scrollContentsBy(int dx, int dy) + void QmlJSEditorWidget::scrollContentsBy(int dx, int dy) { BaseTextEditorWidget::scrollContentsBy(dx, dy); hideContextPane(); } -QmlJSEditorDocument *QmlJSTextEditorWidget::qmlJsEditorDocument() const +QmlJSEditorDocument *QmlJSEditorWidget::qmlJsEditorDocument() const { return m_qmlJsEditorDocument; } -void QmlJSTextEditorWidget::semanticInfoUpdated(const SemanticInfo &semanticInfo) +void QmlJSEditorWidget::semanticInfoUpdated(const SemanticInfo &semanticInfo) { if (isVisible()) { // trigger semantic highlighting and model update if necessary @@ -814,13 +814,13 @@ void QmlJSTextEditorWidget::semanticInfoUpdated(const SemanticInfo &semanticInfo updateUses(); } -void QmlJSTextEditorWidget::onRefactorMarkerClicked(const RefactorMarker &marker) +void QmlJSEditorWidget::onRefactorMarkerClicked(const RefactorMarker &marker) { if (marker.data.canConvert()) showContextPane(); } -QModelIndex QmlJSTextEditorWidget::indexForPosition(unsigned cursorPosition, const QModelIndex &rootIndex) const +QModelIndex QmlJSEditorWidget::indexForPosition(unsigned cursorPosition, const QModelIndex &rootIndex) const { QModelIndex lastIndex = rootIndex; @@ -844,7 +844,7 @@ QModelIndex QmlJSTextEditorWidget::indexForPosition(unsigned cursorPosition, con return lastIndex; } -bool QmlJSTextEditorWidget::hideContextPane() +bool QmlJSEditorWidget::hideContextPane() { bool b = (m_contextPane) && m_contextPane->widget()->isVisible(); if (b) @@ -852,7 +852,7 @@ bool QmlJSTextEditorWidget::hideContextPane() return b; } -IAssistInterface *QmlJSTextEditorWidget::createAssistInterface( +IAssistInterface *QmlJSEditorWidget::createAssistInterface( TextEditor::AssistKind assistKind, TextEditor::AssistReason reason) const { @@ -863,12 +863,12 @@ IAssistInterface *QmlJSTextEditorWidget::createAssistInterface( reason, m_qmlJsEditorDocument->semanticInfo()); } else if (assistKind == TextEditor::QuickFix) { - return new QmlJSQuickFixAssistInterface(const_cast(this), reason); + return new QmlJSQuickFixAssistInterface(const_cast(this), reason); } return 0; } -QString QmlJSTextEditorWidget::foldReplacementText(const QTextBlock &block) const +QString QmlJSEditorWidget::foldReplacementText(const QTextBlock &block) const { const int curlyIndex = block.text().indexOf(QLatin1Char('{')); @@ -932,7 +932,7 @@ QmlJSEditorFactory::QmlJSEditorFactory() IEditor *QmlJSEditorFactory::createEditor() { auto editor = new QmlJSEditor; - editor->setEditorWidget(new QmlJSTextEditorWidget(BaseTextDocumentPtr(new QmlJSEditorDocument))); + editor->setEditorWidget(new QmlJSEditorWidget(BaseTextDocumentPtr(new QmlJSEditorDocument))); editor->configureCodeAssistant(); return editor; } diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index a42846d1dee..bbcebd1c26c 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -60,13 +60,13 @@ class FindReferences; namespace Internal { -class QmlJSTextEditorWidget : public TextEditor::BaseTextEditorWidget +class QmlJSEditorWidget : public TextEditor::BaseTextEditorWidget { Q_OBJECT public: - QmlJSTextEditorWidget(TextEditor::BaseTextDocumentPtr doc); - ~QmlJSTextEditorWidget(); + QmlJSEditorWidget(TextEditor::BaseTextDocumentPtr doc); + ~QmlJSEditorWidget(); QmlJSEditorDocument *qmlJsEditorDocument() const; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 5fe464a8048..f5c35180e05 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -265,13 +265,13 @@ Utils::JsonSchemaManager *QmlJSEditorPlugin::jsonManager() const void QmlJSEditorPlugin::findUsages() { - if (QmlJSTextEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) + if (QmlJSEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) editor->findUsages(); } void QmlJSEditorPlugin::renameUsages() { - if (QmlJSTextEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) + if (QmlJSEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) editor->renameUsages(); } @@ -290,7 +290,7 @@ void QmlJSEditorPlugin::reformatFile() void QmlJSEditorPlugin::showContextPane() { - if (QmlJSTextEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) + if (QmlJSEditorWidget *editor = qobject_cast(Core::EditorManager::currentEditor()->widget())) editor->showContextPane(); } diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 602007a24b9..cad9824e862 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -189,7 +189,7 @@ void HoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos) if (!m_modelManager) return; - QmlJSTextEditorWidget *qmlEditor = qobject_cast(editor->widget()); + QmlJSEditorWidget *qmlEditor = qobject_cast(editor->widget()); if (!qmlEditor) return; @@ -256,7 +256,7 @@ void HoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos) setQmlHelpItem(scopeChain, qmlDocument, node); } -bool HoverHandler::matchDiagnosticMessage(QmlJSTextEditorWidget *qmlEditor, int pos) +bool HoverHandler::matchDiagnosticMessage(QmlJSEditorWidget *qmlEditor, int pos) { foreach (const QTextEdit::ExtraSelection &sel, qmlEditor->extraSelections(TextEditor::BaseTextEditorWidget::CodeWarningsSelection)) { diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h index bbc3cc2d595..6a45f4a87e5 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.h +++ b/src/plugins/qmljseditor/qmljshoverhandler.h @@ -55,7 +55,7 @@ namespace QmlJSEditor { namespace Internal { -class QmlJSTextEditorWidget; +class QmlJSEditorWidget; class HoverHandler : public TextEditor::BaseHoverHandler { @@ -70,7 +70,7 @@ private: virtual void identifyMatch(TextEditor::BaseTextEditor *editor, int pos); virtual void operateTooltip(TextEditor::BaseTextEditor *editor, const QPoint &point); - bool matchDiagnosticMessage(QmlJSTextEditorWidget *qmlEditor, int pos); + bool matchDiagnosticMessage(QmlJSEditorWidget *qmlEditor, int pos); bool matchColorItem(const QmlJS::ScopeChain &lookupContext, const QmlJS::Document::Ptr &qmlDocument, const QList &astPath, diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp index d736d6698a4..d2996fc073d 100644 --- a/src/plugins/qmljseditor/qmljsoutline.cpp +++ b/src/plugins/qmljseditor/qmljsoutline.cpp @@ -121,7 +121,7 @@ QmlJSOutlineWidget::QmlJSOutlineWidget(QWidget *parent) : setLayout(layout); } -void QmlJSOutlineWidget::setEditor(QmlJSTextEditorWidget *editor) +void QmlJSOutlineWidget::setEditor(QmlJSEditorWidget *editor) { m_editor = editor; @@ -259,7 +259,7 @@ TextEditor::IOutlineWidget *QmlJSOutlineWidgetFactory::createWidget(Core::IEdito QmlJSOutlineWidget *widget = new QmlJSOutlineWidget; QmlJSEditor *qmlJSEditable = qobject_cast(editor); - QmlJSTextEditorWidget *qmlJSEditor = qobject_cast(qmlJSEditable->widget()); + QmlJSEditorWidget *qmlJSEditor = qobject_cast(qmlJSEditable->widget()); Q_ASSERT(qmlJSEditor); widget->setEditor(qmlJSEditor); diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h index 39cf78be984..f9be1d07167 100644 --- a/src/plugins/qmljseditor/qmljsoutline.h +++ b/src/plugins/qmljseditor/qmljsoutline.h @@ -67,7 +67,7 @@ class QmlJSOutlineWidget : public TextEditor::IOutlineWidget public: QmlJSOutlineWidget(QWidget *parent = 0); - void setEditor(QmlJSTextEditorWidget *editor); + void setEditor(QmlJSEditorWidget *editor); // IOutlineWidget virtual QList filterMenuActions() const; @@ -89,7 +89,7 @@ private: private: QmlJSOutlineTreeView *m_treeView; QmlJSOutlineFilterModel *m_filterModel; - QmlJSTextEditorWidget *m_editor; + QmlJSEditorWidget *m_editor; QAction *m_showBindingsAction; diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp index 475aff7515b..7615ccde381 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp @@ -46,7 +46,7 @@ using namespace Internal; // ----------------------- // QuickFixAssistInterface // ----------------------- -QmlJSQuickFixAssistInterface::QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor, +QmlJSQuickFixAssistInterface::QmlJSQuickFixAssistInterface(QmlJSEditorWidget *editor, TextEditor::AssistReason reason) : DefaultAssistInterface(editor->document(), editor->position(), editor->textDocument()->filePath(), reason) diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h index 901883c8f39..672dd314749 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.h +++ b/src/plugins/qmljseditor/qmljsquickfixassist.h @@ -46,7 +46,7 @@ namespace Internal { class QmlJSQuickFixAssistInterface : public TextEditor::DefaultAssistInterface { public: - QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor, TextEditor::AssistReason reason); + QmlJSQuickFixAssistInterface(QmlJSEditorWidget *editor, TextEditor::AssistReason reason); ~QmlJSQuickFixAssistInterface(); const QmlJSTools::SemanticInfo &semanticInfo() const;