forked from qt-creator/qt-creator
Git: Fix filtering of date/time in blame
Was broken in 07d6757ca8
.
Change-Id: I2372d3856d52c01949554aed6ed133de8eabd814
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
4eb2224f47
commit
ec9b42fe98
@@ -176,7 +176,7 @@ static QString removeAnnotationDate(const QString &b)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GitEditorWidget::setPlainTextFiltered(const QString &text)
|
void GitEditorWidget::setPlainText(const QString &text)
|
||||||
{
|
{
|
||||||
QString modText = text;
|
QString modText = text;
|
||||||
GitPlugin *plugin = GitPlugin::instance();
|
GitPlugin *plugin = GitPlugin::instance();
|
||||||
|
@@ -49,8 +49,7 @@ class GitEditorWidget : public VcsBase::VcsBaseEditorWidget
|
|||||||
public:
|
public:
|
||||||
GitEditorWidget();
|
GitEditorWidget();
|
||||||
|
|
||||||
public slots:
|
void setPlainText(const QString &text) override;
|
||||||
void setPlainTextFiltered(const QString &text);
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void checkoutChange();
|
void checkoutChange();
|
||||||
|
@@ -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.
|
// Find the complete file from a diff relative specification.
|
||||||
QString VcsBaseEditorWidget::findDiffFile(const QString &f) const
|
QString VcsBaseEditorWidget::findDiffFile(const QString &f) const
|
||||||
{
|
{
|
||||||
|
@@ -213,6 +213,9 @@ public:
|
|||||||
VcsBaseEditorParameterWidget *configurationWidget() const;
|
VcsBaseEditorParameterWidget *configurationWidget() const;
|
||||||
|
|
||||||
void setCommand(VcsCommand *command);
|
void setCommand(VcsCommand *command);
|
||||||
|
|
||||||
|
virtual void setPlainText(const QString &text);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
// These signals also exist in the opaque editable (IEditor) that is
|
// These signals also exist in the opaque editable (IEditor) that is
|
||||||
// handled by the editor manager for convenience. They are emitted
|
// handled by the editor manager for convenience. They are emitted
|
||||||
|
Reference in New Issue
Block a user