From ec9b42fe984647deaa78810f91df0aba233d42cd Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 12 Apr 2015 23:00:36 +0300 Subject: [PATCH] Git: Fix filtering of date/time in blame MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was broken in 07d6757ca88f6879bfbd30f027b0b548bb479298. Change-Id: I2372d3856d52c01949554aed6ed133de8eabd814 Reviewed-by: André Hartmann --- src/plugins/git/giteditor.cpp | 2 +- src/plugins/git/giteditor.h | 3 +-- src/plugins/vcsbase/vcsbaseeditor.cpp | 5 +++++ src/plugins/vcsbase/vcsbaseeditor.h | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index b75c8ccfe6b..bfff94ac057 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -176,7 +176,7 @@ static QString removeAnnotationDate(const QString &b) return result; } -void GitEditorWidget::setPlainTextFiltered(const QString &text) +void GitEditorWidget::setPlainText(const QString &text) { QString modText = text; GitPlugin *plugin = GitPlugin::instance(); diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index 2f5eb0e8d02..3540c5e4aa1 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -49,8 +49,7 @@ class GitEditorWidget : public VcsBase::VcsBaseEditorWidget public: GitEditorWidget(); -public slots: - void setPlainTextFiltered(const QString &text); + void setPlainText(const QString &text) override; private slots: void checkoutChange(); diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index f023a18599c..98ae5972148 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1386,6 +1386,11 @@ void VcsBaseEditorWidget::setCommand(VcsCommand *command) } } +void VcsBaseEditorWidget::setPlainText(const QString &text) +{ + TextEditorWidget::setPlainText(text); +} + // Find the complete file from a diff relative specification. QString VcsBaseEditorWidget::findDiffFile(const QString &f) const { diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index 1f17da7c139..8aaf906fb76 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -213,6 +213,9 @@ public: VcsBaseEditorParameterWidget *configurationWidget() const; void setCommand(VcsCommand *command); + + virtual void setPlainText(const QString &text); + signals: // These signals also exist in the opaque editable (IEditor) that is // handled by the editor manager for convenience. They are emitted