summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-10-23 04:42:43 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-10-24 16:23:59 +0000
commitc8440716279228b41bb50ba284101ffba7c4b4a5 (patch)
treec2aa9b2d9fb23db5d828570e8132318d61664fc5 /src/plugins/mercurial
parent2c6adc1e747575af5198cc7ea2277b9a70366d3c (diff)
downloadqt-creator-c8440716279228b41bb50ba284101ffba7c4b4a5.tar.gz
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/mercurial')
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index c7e920caec..3efc8a3352 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -30,7 +30,7 @@
#include <vcsbase/vcsoutputwindow.h>
#include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcsbaseeditor.h>
-#include <vcsbase/vcsbaseeditorparameterwidget.h>
+#include <vcsbase/vcsbaseeditorconfig.h>
#include <utils/synchronousprocess.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
@@ -50,12 +50,12 @@ namespace Mercurial {
namespace Internal {
// Parameter widget controlling whitespace diff mode, associated with a parameter
-class MercurialDiffParameterWidget : public VcsBaseEditorParameterWidget
+class MercurialDiffConfig : public VcsBaseEditorConfig
{
Q_OBJECT
public:
- MercurialDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) :
- VcsBaseEditorParameterWidget(toolBar)
+ MercurialDiffConfig(VcsBaseClientSettings &settings, QToolBar *toolBar) :
+ VcsBaseEditorConfig(toolBar)
{
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
settings.boolPointer(MercurialSettings::diffIgnoreWhiteSpaceKey));
@@ -66,8 +66,8 @@ public:
MercurialClient::MercurialClient() : VcsBaseClient(new MercurialSettings)
{
- setDiffParameterWidgetCreator([this](QToolBar *toolBar) {
- return new MercurialDiffParameterWidget(settings(), toolBar);
+ setDiffConfigCreator([this](QToolBar *toolBar) {
+ return new MercurialDiffConfig(settings(), toolBar);
});
}