diff options
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r-- | src/plugins/vcsbase/basevcseditorfactory.cpp | 2 | ||||
-rw-r--r-- | src/plugins/vcsbase/basevcseditorfactory.h | 2 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.cpp | 16 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index 73a33b9c40..60929b3d2c 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -72,7 +72,7 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters, return document; }); - setEditorWidgetCreator([=]() -> BaseTextEditorWidget* { + setEditorWidgetCreator([=]() -> TextEditorWidget* { auto widget = qobject_cast<VcsBaseEditorWidget *>(editorWidgetCreator()); widget->setDescribeSlot(describeReceiver, describeSlot); widget->setParameters(parameters); diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 86d3e8ed55..b4cd8069c1 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -37,7 +37,7 @@ namespace VcsBase { -class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::BaseTextEditorFactory +class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::TextEditorFactory { Q_OBJECT diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index ed961c514e..77b9844fe1 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -553,7 +553,7 @@ public: // Can be used for diff and log. Combo created on first call. QComboBox *entriesComboBox(); - BaseTextEditorWidget *q; + TextEditorWidget *q; const VcsBaseEditorParameters *m_parameters; QString m_workingDirectory; @@ -615,7 +615,7 @@ QComboBox *VcsBaseEditorWidgetPrivate::entriesComboBox() policy.setHorizontalPolicy(QSizePolicy::Expanding); m_entriesComboBox->setSizePolicy(policy); - q->insertExtraToolBarWidget(BaseTextEditorWidget::Left, m_entriesComboBox); + q->insertExtraToolBarWidget(TextEditorWidget::Left, m_entriesComboBox); return m_entriesComboBox; } @@ -978,7 +978,7 @@ void VcsBaseEditorWidget::mouseMoveEvent(QMouseEvent *e) { if (e->buttons()) { d->m_mouseDragging = true; - BaseTextEditorWidget::mouseMoveEvent(e); + TextEditorWidget::mouseMoveEvent(e); return; } @@ -999,7 +999,7 @@ void VcsBaseEditorWidget::mouseMoveEvent(QMouseEvent *e) cursorShape = Qt::IBeamCursor; } } - BaseTextEditorWidget::mouseMoveEvent(e); + TextEditorWidget::mouseMoveEvent(e); if (overrideCursor) viewport()->setCursor(cursorShape); @@ -1020,7 +1020,7 @@ void VcsBaseEditorWidget::mouseReleaseEvent(QMouseEvent *e) } } } - BaseTextEditorWidget::mouseReleaseEvent(e); + TextEditorWidget::mouseReleaseEvent(e); } void VcsBaseEditorWidget::mouseDoubleClickEvent(QMouseEvent *e) @@ -1029,7 +1029,7 @@ void VcsBaseEditorWidget::mouseDoubleClickEvent(QMouseEvent *e) QTextCursor cursor = cursorForPosition(e->pos()); jumpToChangeFromDiff(cursor); } - BaseTextEditorWidget::mouseDoubleClickEvent(e); + TextEditorWidget::mouseDoubleClickEvent(e); } void VcsBaseEditorWidget::keyPressEvent(QKeyEvent *e) @@ -1039,7 +1039,7 @@ void VcsBaseEditorWidget::keyPressEvent(QKeyEvent *e) jumpToChangeFromDiff(textCursor()); return; } - BaseTextEditorWidget::keyPressEvent(e); + TextEditorWidget::keyPressEvent(e); } void VcsBaseEditorWidget::slotActivateAnnotation() @@ -1339,7 +1339,7 @@ bool VcsBaseEditorWidget::setConfigurationWidget(VcsBaseEditorParameterWidget *w return false; d->m_configurationWidget = w; - insertExtraToolBarWidget(BaseTextEditorWidget::Right, w); + insertExtraToolBarWidget(TextEditorWidget::Right, w); return true; } diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index 96e7f53cdf..e6b328767c 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -138,7 +138,7 @@ signals: const QString &change, int line); }; -class VCSBASE_EXPORT VcsBaseEditorWidget : public TextEditor::BaseTextEditorWidget +class VCSBASE_EXPORT VcsBaseEditorWidget : public TextEditor::TextEditorWidget { Q_PROPERTY(QString source READ source WRITE setSource) Q_PROPERTY(QString workingDirectory READ workingDirectory WRITE setWorkingDirectory) |