From 4cf75c78acb0b781954dfc2fd9e61bd7b069731f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 18 Aug 2022 08:55:58 +0300 Subject: [PATCH] Git: Minor cleanup in GitSubmitEditorWidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Accept CommitData struct instead of passing most of its members separately. Change-Id: I04b3b7ea0c02d12cae87e42d44af3808722b6371 Reviewed-by: André Hartmann --- src/plugins/git/gitsubmiteditor.cpp | 2 +- src/plugins/git/gitsubmiteditorwidget.cpp | 16 ++++++---------- src/plugins/git/gitsubmiteditorwidget.h | 6 +----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index cd418bdecd5..8920fc070f4 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -130,7 +130,7 @@ void GitSubmitEditor::setCommitData(const CommitData &d) m_amendSHA1 = d.amendSHA1; GitSubmitEditorWidget *w = submitEditorWidget(); - w->initialize(m_commitType, m_workingDirectory, d.panelData, d.panelInfo, d.enablePush); + w->initialize(m_workingDirectory, d); 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 071c149ca1f..a9ff0435268 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -158,18 +158,14 @@ void GitSubmitEditorWidget::setHasUnmerged(bool e) m_hasUnmerged = e; } -void GitSubmitEditorWidget::initialize(CommitType commitType, - const FilePath &repository, - const GitSubmitEditorPanelData &data, - const GitSubmitEditorPanelInfo &info, - bool enablePush) +void GitSubmitEditorWidget::initialize(const FilePath &repository, const CommitData &data) { if (m_isInitialized) return; m_isInitialized = true; - if (commitType != AmendCommit) + if (data.commitType != AmendCommit) m_gitSubmitPanel->showHeadLabel->hide(); - if (commitType == FixupCommit) { + if (data.commitType == FixupCommit) { auto logChangeGroupBox = new QGroupBox(tr("Select Change")); auto logChangeLayout = new QVBoxLayout; logChangeGroupBox->setLayout(logChangeLayout); @@ -182,10 +178,10 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, hideDescription(); } insertTopWidget(m_gitSubmitPanel); - setPanelData(data); - setPanelInfo(info); + setPanelData(data.panelData); + setPanelInfo(data.panelInfo); - if (enablePush) { + if (data.enablePush) { auto menu = new QMenu(this); connect(menu->addAction(tr("&Commit only")), &QAction::triggered, this, &GitSubmitEditorWidget::commitOnlySlot); diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index aa6be0a8e6d..30004170828 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -64,11 +64,7 @@ public: GitSubmitEditorPanelData panelData() const; QString amendSHA1() const; void setHasUnmerged(bool e); - void initialize(CommitType commitType, - const Utils::FilePath &repository, - const GitSubmitEditorPanelData &data, - const GitSubmitEditorPanelInfo &info, - bool enablePush); + void initialize(const Utils::FilePath &repository, const CommitData &data); void refreshLog(const Utils::FilePath &repository); protected: