diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 44c95d5d055..4862ae41491 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -111,9 +111,7 @@ void GitSubmitEditor::setCommitData(const CommitData &d) m_amendSHA1 = d.amendSHA1; GitSubmitEditorWidget *w = submitEditorWidget(); - w->initialize(m_commitType, m_workingDirectory); - w->setPanelData(d.panelData); - w->setPanelInfo(d.panelInfo); + w->initialize(m_commitType, m_workingDirectory, d.panelData, d.panelInfo); w->setHasUnmerged(false); setEmptyFileListEnabled(m_commitType == AmendCommit); // Allow for just correcting the message diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 9e94200674b..98dec3c9d3d 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -82,7 +82,10 @@ void GitSubmitEditorWidget::setHasUnmerged(bool e) m_hasUnmerged = e; } -void GitSubmitEditorWidget::initialize(CommitType commitType, const QString &repository) +void GitSubmitEditorWidget::initialize(CommitType commitType, + const QString &repository, + const GitSubmitEditorPanelData &data, + const GitSubmitEditorPanelInfo &info) { if (m_isInitialized) return; @@ -100,6 +103,8 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, const QString &rep hideDescription(); } insertTopWidget(m_gitSubmitPanel); + setPanelData(data); + setPanelInfo(info); } void GitSubmitEditorWidget::refreshLog(const QString &repository) diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index 36f80b52302..61c9886444f 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -66,11 +66,12 @@ public: explicit GitSubmitEditorWidget(QWidget *parent = 0); GitSubmitEditorPanelData panelData() const; - void setPanelData(const GitSubmitEditorPanelData &data); - void setPanelInfo(const GitSubmitEditorPanelInfo &info); QString amendSHA1() const; void setHasUnmerged(bool e); - void initialize(CommitType commitType, const QString &repository); + void initialize(CommitType commitType, + const QString &repository, + const GitSubmitEditorPanelData &data, + const GitSubmitEditorPanelInfo &info); void refreshLog(const QString &repository); protected: @@ -85,6 +86,8 @@ private slots: private: bool emailIsValid() const; + void setPanelData(const GitSubmitEditorPanelData &data); + void setPanelInfo(const GitSubmitEditorPanelInfo &info); QWidget *m_gitSubmitPanel; LogChangeWidget *m_logChangeWidget;