diff options
| author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2013-10-15 20:03:22 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-10-16 08:34:28 +0200 |
| commit | 72da839bbfe2b526e95d92d9979d18477db8abb5 (patch) | |
| tree | 615e4eaa8301c749012d649fff637aa45e839649 /src/plugins/cvs/settingspage.cpp | |
| parent | 0f4808a6294a7fd565f0dd3988d19838d05edd8d (diff) | |
| download | qt-creator-72da839bbfe2b526e95d92d9979d18477db8abb5.tar.gz | |
Use VcsBaseClient::diff instead of cvs's one
The second step in cleaning a mess in VCS
Change-Id: I3eb360825480c74242110b0da9f90b39fc4c767f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/cvs/settingspage.cpp')
| -rw-r--r-- | src/plugins/cvs/settingspage.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp index e5f051579e..2d2dcd755a 100644 --- a/src/plugins/cvs/settingspage.cpp +++ b/src/plugins/cvs/settingspage.cpp @@ -54,24 +54,23 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) : CvsSettings SettingsPageWidget::settings() const { CvsSettings rc; - rc.cvsCommand = m_ui.commandPathChooser->rawPath(); - rc.cvsBinaryPath = m_ui.commandPathChooser->path(); - rc.cvsRoot = m_ui.rootLineEdit->text(); - rc.cvsDiffOptions = m_ui.diffOptionsLineEdit->text(); - rc.timeOutS = m_ui.timeOutSpinBox->value(); - rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked(); - rc.describeByCommitId = m_ui.describeByCommitIdCheckBox->isChecked(); + rc.setValue(CvsSettings::binaryPathKey, m_ui.commandPathChooser->rawPath()); + rc.setValue(CvsSettings::cvsRootKey, m_ui.rootLineEdit->text()); + rc.setValue(CvsSettings::diffOptionsKey, m_ui.diffOptionsLineEdit->text()); + rc.setValue(CvsSettings::timeoutKey, m_ui.timeOutSpinBox->value()); + rc.setValue(CvsSettings::promptOnSubmitKey, m_ui.promptToSubmitCheckBox->isChecked()); + rc.setValue(CvsSettings::describeByCommitIdKey, m_ui.describeByCommitIdCheckBox->isChecked()); return rc; } void SettingsPageWidget::setSettings(const CvsSettings &s) { - m_ui.commandPathChooser->setPath(s.cvsCommand); - m_ui.rootLineEdit->setText(s.cvsRoot); - m_ui.diffOptionsLineEdit->setText(s.cvsDiffOptions); - m_ui.timeOutSpinBox->setValue(s.timeOutS); - m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit); - m_ui.describeByCommitIdCheckBox->setChecked(s.describeByCommitId); + m_ui.commandPathChooser->setPath(s.binaryPath()); + m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey)); + m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey)); + m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey)); + m_ui.promptToSubmitCheckBox->setChecked(s.boolValue(CvsSettings::promptOnSubmitKey)); + m_ui.describeByCommitIdCheckBox->setChecked(s.boolValue(CvsSettings::describeByCommitIdKey)); } QString SettingsPageWidget::searchKeywords() const |