diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-10-11 10:02:11 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-11 10:02:11 +0200 |
commit | ed94e8bda218d8cd043d09f11ef4806f0b150494 (patch) | |
tree | c63b6ed59ceb79eafdac9eb47a452c192b831930 /plugins/fossil/fossileditor.cpp | |
parent | f6cea871f1e6edeb3cb005adb82db19b3f25095e (diff) | |
parent | bf3f576c4a3c75a60cb2c6b575b41d58374db260 (diff) |
Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: Id67fed3d81082f1bb68d92083222bcb7dcd9e825
Diffstat (limited to 'plugins/fossil/fossileditor.cpp')
-rw-r--r-- | plugins/fossil/fossileditor.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/plugins/fossil/fossileditor.cpp b/plugins/fossil/fossileditor.cpp index 2c36f3b..e24912b 100644 --- a/plugins/fossil/fossileditor.cpp +++ b/plugins/fossil/fossileditor.cpp @@ -51,8 +51,7 @@ public: FossilEditorWidgetPrivate() : m_exactChangesetId(Constants::CHANGESET_ID_EXACT), m_firstChangesetId(QString("\n") + Constants::CHANGESET_ID + " "), - m_nextChangesetId(m_firstChangesetId), - m_configurationWidget(nullptr) + m_nextChangesetId(m_firstChangesetId) { QTC_ASSERT(m_exactChangesetId.isValid(), return); QTC_ASSERT(m_firstChangesetId.isValid(), return); @@ -63,8 +62,6 @@ public: const QRegularExpression m_exactChangesetId; const QRegularExpression m_firstChangesetId; const QRegularExpression m_nextChangesetId; - - VcsBase::VcsBaseEditorConfig *m_configurationWidget; }; FossilEditorWidget::FossilEditorWidget() : @@ -87,21 +84,6 @@ FossilEditorWidget::~FossilEditorWidget() delete d; } -bool FossilEditorWidget::setConfigurationWidget(VcsBase::VcsBaseEditorConfig *w) -{ - if (configurationAdded()) - return false; - - d->m_configurationWidget = w; - setConfigurationAdded(); - return true; -} - -VcsBase::VcsBaseEditorConfig *FossilEditorWidget::configurationWidget() const -{ - return d->m_configurationWidget; -} - QSet<QString> FossilEditorWidget::annotationChanges() const { |