From 65b3830b798a18881b01a5c7a99560b0189bb115 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 8 Dec 2009 13:58:51 +0100 Subject: [PATCH] Renamed the QmlEditor::ScriptEditor class to QmlEditor::QmlTextEditor. --- src/plugins/qmleditor/qmlcodecompletion.cpp | 4 +- src/plugins/qmleditor/qmleditor.cpp | 50 ++++++++++----------- src/plugins/qmleditor/qmleditor.h | 10 ++--- src/plugins/qmleditor/qmleditorfactory.cpp | 2 +- src/plugins/qmleditor/qmleditorplugin.cpp | 2 +- src/plugins/qmleditor/qmleditorplugin.h | 4 +- src/plugins/qmleditor/qmlhoverhandler.cpp | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/plugins/qmleditor/qmlcodecompletion.cpp b/src/plugins/qmleditor/qmlcodecompletion.cpp index 325467c16d2..81f64a1d663 100644 --- a/src/plugins/qmleditor/qmlcodecompletion.cpp +++ b/src/plugins/qmleditor/qmlcodecompletion.cpp @@ -65,7 +65,7 @@ void QmlCodeCompletion::setCaseSensitivity(Qt::CaseSensitivity caseSensitivity) bool QmlCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor) { - if (qobject_cast(editor->widget())) + if (qobject_cast(editor->widget())) return true; return false; @@ -78,7 +78,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor) { m_editor = editor; - ScriptEditor *edit = qobject_cast(m_editor->widget()); + QmlTextEditor *edit = qobject_cast(m_editor->widget()); if (! edit) return -1; diff --git a/src/plugins/qmleditor/qmleditor.cpp b/src/plugins/qmleditor/qmleditor.cpp index 406420c6463..e7fdc830509 100644 --- a/src/plugins/qmleditor/qmleditor.cpp +++ b/src/plugins/qmleditor/qmleditor.cpp @@ -273,7 +273,7 @@ protected: #endif }; -ScriptEditorEditable::ScriptEditorEditable(ScriptEditor *editor) +ScriptEditorEditable::ScriptEditorEditable(QmlTextEditor *editor) : BaseTextEditorEditable(editor) { @@ -282,7 +282,7 @@ ScriptEditorEditable::ScriptEditorEditable(ScriptEditor *editor) m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); } -ScriptEditor::ScriptEditor(QWidget *parent) : +QmlTextEditor::QmlTextEditor(QWidget *parent) : TextEditor::BaseTextEditor(parent), m_methodCombo(0), m_modelManager(0), @@ -313,16 +313,16 @@ ScriptEditor::ScriptEditor(QWidget *parent) : } } -ScriptEditor::~ScriptEditor() +QmlTextEditor::~QmlTextEditor() { } -QList ScriptEditor::declarations() const +QList QmlTextEditor::declarations() const { return m_declarations; } Core::IEditor *ScriptEditorEditable::duplicate(QWidget *parent) { - ScriptEditor *newEditor = new ScriptEditor(parent); + QmlTextEditor *newEditor = new QmlTextEditor(parent); newEditor->duplicateFrom(editor()); QmlEditorPlugin::instance()->initializeEditor(newEditor); return newEditor->editableInterface(); @@ -333,17 +333,17 @@ const char *ScriptEditorEditable::kind() const return QmlEditor::Constants::C_QMLEDITOR; } -ScriptEditor::Context ScriptEditorEditable::context() const +QmlTextEditor::Context ScriptEditorEditable::context() const { return m_context; } -void ScriptEditor::updateDocument() +void QmlTextEditor::updateDocument() { m_updateDocumentTimer->start(UPDATE_DOCUMENT_DEFAULT_INTERVAL); } -void ScriptEditor::updateDocumentNow() +void QmlTextEditor::updateDocumentNow() { // ### move in the parser thread. @@ -354,7 +354,7 @@ void ScriptEditor::updateDocumentNow() m_modelManager->updateSourceFiles(QStringList() << fileName); } -void ScriptEditor::onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc) +void QmlTextEditor::onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc) { if (file()->fileName() != doc->fileName()) return; @@ -413,7 +413,7 @@ void ScriptEditor::onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc) setExtraSelections(CodeWarningsSelection, selections); } -void ScriptEditor::jumpToMethod(int index) +void QmlTextEditor::jumpToMethod(int index) { if (index) { Declaration d = m_declarations.at(index - 1); @@ -422,7 +422,7 @@ void ScriptEditor::jumpToMethod(int index) } } -void ScriptEditor::updateMethodBoxIndex() +void QmlTextEditor::updateMethodBoxIndex() { int line = 0, column = 0; convertPosition(position(), &line, &column); @@ -457,15 +457,15 @@ void ScriptEditor::updateMethodBoxIndex() setExtraSelections(CodeSemanticsSelection, selections); } -void ScriptEditor::updateMethodBoxToolTip() +void QmlTextEditor::updateMethodBoxToolTip() { } -void ScriptEditor::updateFileName() +void QmlTextEditor::updateFileName() { } -void ScriptEditor::renameIdUnderCursor() +void QmlTextEditor::renameIdUnderCursor() { const QString id = wordUnderCursor(); bool ok = false; @@ -486,7 +486,7 @@ void ScriptEditor::renameIdUnderCursor() } } -QStringList ScriptEditor::keywords() const +QStringList QmlTextEditor::keywords() const { QStringList words; @@ -496,7 +496,7 @@ QStringList ScriptEditor::keywords() const return words; } -void ScriptEditor::setFontSettings(const TextEditor::FontSettings &fs) +void QmlTextEditor::setFontSettings(const TextEditor::FontSettings &fs) { TextEditor::BaseTextEditor::setFontSettings(fs); QmlHighlighter *highlighter = qobject_cast(baseTextDocument()->syntaxHighlighter()); @@ -519,7 +519,7 @@ void ScriptEditor::setFontSettings(const TextEditor::FontSettings &fs) highlighter->rehighlight(); } -QString ScriptEditor::wordUnderCursor() const +QString QmlTextEditor::wordUnderCursor() const { QTextCursor tc = textCursor(); tc.movePosition(QTextCursor::StartOfWord); @@ -528,7 +528,7 @@ QString ScriptEditor::wordUnderCursor() const return word; } -bool ScriptEditor::isElectricCharacter(const QChar &ch) const +bool QmlTextEditor::isElectricCharacter(const QChar &ch) const { if (ch == QLatin1Char('}') || ch == QLatin1Char(']')) @@ -536,7 +536,7 @@ bool ScriptEditor::isElectricCharacter(const QChar &ch) const return false; } -bool ScriptEditor::isClosingBrace(const QList &tokens) const +bool QmlTextEditor::isClosingBrace(const QList &tokens) const { if (tokens.size() == 1) { @@ -567,7 +567,7 @@ static int blockStartState(const QTextBlock &block) return state & 0xff; } -void ScriptEditor::indentBlock(QTextDocument *, QTextBlock block, QChar /*typedChar*/) +void QmlTextEditor::indentBlock(QTextDocument *, QTextBlock block, QChar /*typedChar*/) { TextEditor::TabSettings ts = tabSettings(); @@ -610,14 +610,14 @@ void ScriptEditor::indentBlock(QTextDocument *, QTextBlock block, QChar /*typedC ts.indentLine(block, indent); } -TextEditor::BaseTextEditorEditable *ScriptEditor::createEditableInterface() +TextEditor::BaseTextEditorEditable *QmlTextEditor::createEditableInterface() { ScriptEditorEditable *editable = new ScriptEditorEditable(this); createToolBar(editable); return editable; } -void ScriptEditor::createToolBar(ScriptEditorEditable *editable) +void QmlTextEditor::createToolBar(ScriptEditorEditable *editable) { m_methodCombo = new QComboBox; m_methodCombo->setMinimumContentsLength(22); @@ -640,7 +640,7 @@ void ScriptEditor::createToolBar(ScriptEditorEditable *editable) toolBar->insertWidget(actions.first(), m_methodCombo); } -TextEditor::BaseTextEditor::Link ScriptEditor::findLinkAt(const QTextCursor &cursor, bool /*resolveTarget*/) +TextEditor::BaseTextEditor::Link QmlTextEditor::findLinkAt(const QTextCursor &cursor, bool /*resolveTarget*/) { Link link; @@ -691,7 +691,7 @@ TextEditor::BaseTextEditor::Link ScriptEditor::findLinkAt(const QTextCursor &cur return link; } -void ScriptEditor::contextMenuEvent(QContextMenuEvent *e) +void QmlTextEditor::contextMenuEvent(QContextMenuEvent *e) { QMenu *menu = new QMenu(); @@ -715,7 +715,7 @@ void ScriptEditor::contextMenuEvent(QContextMenuEvent *e) menu->deleteLater(); } -void ScriptEditor::unCommentSelection() +void QmlTextEditor::unCommentSelection() { Utils::unCommentSelection(this); } diff --git a/src/plugins/qmleditor/qmleditor.h b/src/plugins/qmleditor/qmleditor.h index 7746ddf82d9..ed30fc582ce 100644 --- a/src/plugins/qmleditor/qmleditor.h +++ b/src/plugins/qmleditor/qmleditor.h @@ -54,14 +54,14 @@ class QmlModelManagerInterface; namespace Internal { class QmlHighlighter; -class ScriptEditor; +class QmlTextEditor; class ScriptEditorEditable : public TextEditor::BaseTextEditorEditable { Q_OBJECT public: - ScriptEditorEditable(ScriptEditor *); + ScriptEditorEditable(QmlTextEditor *); QList context() const; bool duplicateSupported() const { return true; } @@ -90,15 +90,15 @@ struct Declaration { } }; -class ScriptEditor : public TextEditor::BaseTextEditor +class QmlTextEditor : public TextEditor::BaseTextEditor { Q_OBJECT public: typedef QList Context; - ScriptEditor(QWidget *parent = 0); - ~ScriptEditor(); + QmlTextEditor(QWidget *parent = 0); + ~QmlTextEditor(); QList declarations() const; QStringList keywords() const; diff --git a/src/plugins/qmleditor/qmleditorfactory.cpp b/src/plugins/qmleditor/qmleditorfactory.cpp index f89c93e2f67..aa541cd4d5c 100644 --- a/src/plugins/qmleditor/qmleditorfactory.cpp +++ b/src/plugins/qmleditor/qmleditorfactory.cpp @@ -69,7 +69,7 @@ Core::IFile *QmlEditorFactory::open(const QString &fileName) Core::IEditor *QmlEditorFactory::createEditor(QWidget *parent) { - ScriptEditor *rc = new ScriptEditor(parent); + QmlTextEditor *rc = new QmlTextEditor(parent); QmlEditorPlugin::instance()->initializeEditor(rc); return rc->editableInterface(); } diff --git a/src/plugins/qmleditor/qmleditorplugin.cpp b/src/plugins/qmleditor/qmleditorplugin.cpp index ae38bbc18f1..b06543ece72 100644 --- a/src/plugins/qmleditor/qmleditorplugin.cpp +++ b/src/plugins/qmleditor/qmleditorplugin.cpp @@ -166,7 +166,7 @@ void QmlEditorPlugin::extensionsInitialized() helpManager->registerDocumentation(QStringList(qmlHelpFile)); } -void QmlEditorPlugin::initializeEditor(QmlEditor::Internal::ScriptEditor *editor) +void QmlEditorPlugin::initializeEditor(QmlEditor::Internal::QmlTextEditor *editor) { QTC_ASSERT(m_instance, /**/); diff --git a/src/plugins/qmleditor/qmleditorplugin.h b/src/plugins/qmleditor/qmleditorplugin.h index b28818c2e2a..66a749973d1 100644 --- a/src/plugins/qmleditor/qmleditorplugin.h +++ b/src/plugins/qmleditor/qmleditorplugin.h @@ -45,7 +45,7 @@ namespace Internal { class QmlEditorFactory; class QmlCodeCompletion; -class ScriptEditor; +class QmlTextEditor; class QmlEditorPlugin : public ExtensionSystem::IPlugin { @@ -62,7 +62,7 @@ public: static QmlEditorPlugin *instance() { return m_instance; } - void initializeEditor(ScriptEditor *editor); + void initializeEditor(QmlTextEditor *editor); private: static QmlEditorPlugin *m_instance; diff --git a/src/plugins/qmleditor/qmlhoverhandler.cpp b/src/plugins/qmleditor/qmlhoverhandler.cpp index 1bbe5c09aa9..e84e4a3800f 100644 --- a/src/plugins/qmleditor/qmlhoverhandler.cpp +++ b/src/plugins/qmleditor/qmlhoverhandler.cpp @@ -146,7 +146,7 @@ void QmlHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in if (!m_modelManager) return; - ScriptEditor *scriptEditor = qobject_cast(editor->widget()); + QmlTextEditor *scriptEditor = qobject_cast(editor->widget()); if (!scriptEditor) return;