diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index 129e256d9f7ce6b25e6047241d6c0ccd86e5616f..7654d003722231652c38a09665a554412001706b 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -53,7 +53,7 @@ void GitSubmitEditorPanelData::clear() author.clear(); email.clear(); bypassHooks = false; - pushAction = CommitOnly; + pushAction = NoPush; hasRemotes = false; } diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index 824f9dfe5d62d950879eec72ed16c837868eab5c..deb5072c3d1d8705fe6a0dc81e6e38f0a27ac3fd 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -53,9 +53,9 @@ struct GitSubmitEditorPanelInfo QDebug operator<<(QDebug d, const GitSubmitEditorPanelInfo &); enum PushAction { - CommitOnly, - CommitAndPush, - CommitAndPushToGerrit + NoPush, + NormalPush, + PushToGerrit }; struct GitSubmitEditorPanelData diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 72d9f4bb6dbdec1bfeafe0f7a6203048c46cca48..7d0f918c744de7cf389a24373af45b442011c07e 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1123,9 +1123,9 @@ bool GitPlugin::submitEditorAboutToClose() } if (m_gitClient->checkCommandInProgress(m_submitRepository) == GitClient::NoCommand) { - if (editor->panelData().pushAction == CommitAndPush) + if (editor->panelData().pushAction == NormalPush) m_gitClient->push(m_submitRepository); - else if (editor->panelData().pushAction == CommitAndPushToGerrit) + else if (editor->panelData().pushAction == PushToGerrit) connect(editor, SIGNAL(destroyed()), this, SLOT(delayedPushToGerrit())); } diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 133e5583f074f630b22aae40f9fda5fbe1c57463..7b9260a8ae9e801f72fd3f3ce5929df7b7f6b5d9 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -47,7 +47,7 @@ namespace Internal { // ------------------ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) : VcsBase::SubmitEditorWidget(parent), - m_pushAction(CommitOnly), + m_pushAction(NoPush), m_gitSubmitPanel(new QWidget), m_logChangeWidget(0), m_hasUnmerged(false), @@ -171,9 +171,9 @@ QString GitSubmitEditorWidget::cleanupDescription(const QString &input) const QString GitSubmitEditorWidget::commitName() const { - if (m_pushAction == CommitAndPush) + if (m_pushAction == NormalPush) return tr("Commit and Push"); - else if (m_pushAction == CommitAndPushToGerrit) + else if (m_pushAction == PushToGerrit) return tr("Commit and Push to Gerrit"); return tr("Commit"); @@ -194,19 +194,19 @@ void GitSubmitEditorWidget::authorInformationChanged() void GitSubmitEditorWidget::commitOnlySlot() { - m_pushAction = CommitOnly; + m_pushAction = NoPush; updateSubmitAction(); } void GitSubmitEditorWidget::commitAndPushSlot() { - m_pushAction = CommitAndPush; + m_pushAction = NormalPush; updateSubmitAction(); } void GitSubmitEditorWidget::commitAndPushToGerritSlot() { - m_pushAction = CommitAndPushToGerrit; + m_pushAction = PushToGerrit; updateSubmitAction(); }