diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-10-23 04:42:43 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-10-24 16:23:59 +0000 |
| commit | c8440716279228b41bb50ba284101ffba7c4b4a5 (patch) | |
| tree | c2aa9b2d9fb23db5d828570e8132318d61664fc5 /src/plugins/cvs | |
| parent | 2c6adc1e747575af5198cc7ea2277b9a70366d3c (diff) | |
Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfig
Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvsclient.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/cvs/cvsclient.cpp b/src/plugins/cvs/cvsclient.cpp index 072832005c9..bd6052a4ee1 100644 --- a/src/plugins/cvs/cvsclient.cpp +++ b/src/plugins/cvs/cvsclient.cpp @@ -29,7 +29,7 @@ #include <vcsbase/vcsbaseplugin.h> #include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbaseconstants.h> -#include <vcsbase/vcsbaseeditorparameterwidget.h> +#include <vcsbase/vcsbaseeditorconfig.h> #include <QDir> #include <QFileInfo> @@ -43,19 +43,19 @@ namespace Cvs { namespace Internal { // Parameter widget controlling whitespace diff mode, associated with a parameter -class CvsDiffParameterWidget : public VcsBaseEditorParameterWidget +class CvsDiffConfig : public VcsBaseEditorConfig { Q_OBJECT public: - CvsDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar); + CvsDiffConfig(VcsBaseClientSettings &settings, QToolBar *toolBar); QStringList arguments() const; private: VcsBaseClientSettings &m_settings; }; -CvsDiffParameterWidget::CvsDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) : - VcsBaseEditorParameterWidget(toolBar), +CvsDiffConfig::CvsDiffConfig(VcsBaseClientSettings &settings, QToolBar *toolBar) : + VcsBaseEditorConfig(toolBar), m_settings(settings) { mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")), @@ -64,19 +64,19 @@ CvsDiffParameterWidget::CvsDiffParameterWidget(VcsBaseClientSettings &settings, settings.boolPointer(CvsSettings::diffIgnoreBlankLinesKey)); } -QStringList CvsDiffParameterWidget::arguments() const +QStringList CvsDiffConfig::arguments() const { QStringList args; args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(QLatin1Char(' '), QString::SkipEmptyParts); - args += VcsBaseEditorParameterWidget::arguments(); + args += VcsBaseEditorConfig::arguments(); return args; } CvsClient::CvsClient() : VcsBaseClient(new CvsSettings) { - setDiffParameterWidgetCreator([this](QToolBar *toolBar) { - return new CvsDiffParameterWidget(settings(), toolBar); + setDiffConfigCreator([this](QToolBar *toolBar) { + return new CvsDiffConfig(settings(), toolBar); }); } diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 336a45f6a80..06c25a42709 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -34,7 +34,6 @@ #include <vcsbase/basevcssubmiteditorfactory.h> #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbaseeditor.h> -#include <vcsbase/vcsbaseeditorparameterwidget.h> #include <vcsbase/vcscommand.h> #include <vcsbase/vcsoutputwindow.h> |