feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Refactor reset

Browse Source 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-04-19 09:20:08 +03:00
committed by Orgad Shaneh
parent cbfeb36ce7
commit e6da908321
5 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/logchangedialog.cpp
View File

@@ -72,8 +72,8 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent)
if (isReset) {
popUpLayout->addWidget(new QLabel(tr("Reset type:"), this));
m_resetTypeComboBox = new QComboBox(this);
m_resetTypeComboBox->addItem(tr("Hard Reset"), HardReset);
m_resetTypeComboBox->addItem(tr("Soft Reset"), SoftReset);
m_resetTypeComboBox->addItem(tr("Hard"), QLatin1String("--hard"));
m_resetTypeComboBox->addItem(tr("Soft"), QLatin1String("--soft"));
popUpLayout->addWidget(m_resetTypeComboBox);
popUpLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
}
@@ -112,11 +112,11 @@ QString LogChangeDialog::commit() const
return QString();
}
ResetType LogChangeDialog::resetType() const
QString LogChangeDialog::resetFlag() const
{
if (!m_resetTypeComboBox)
return HardReset;
return static_cast<ResetType>(m_resetTypeComboBox->itemData(m_resetTypeComboBox->currentIndex()).toInt());
return QString();
return m_resetTypeComboBox->itemData(m_resetTypeComboBox->currentIndex()).toString();
}
bool LogChangeDialog::populateLog(const QString &repository)