aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/bazaar
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/bazaar
parent2c6adc1e747575af5198cc7ea2277b9a70366d3c (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/bazaar')
-rw-r--r--src/plugins/bazaar/bazaarclient.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index e843a5ea1d..b2bdac3288 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -30,7 +30,7 @@
#include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcsoutputwindow.h>
-#include <vcsbase/vcsbaseeditorparameterwidget.h>
+#include <vcsbase/vcsbaseeditorconfig.h>
#include <utils/hostosinfo.h>
@@ -46,12 +46,12 @@ namespace Bazaar {
namespace Internal {
// Parameter widget controlling whitespace diff mode, associated with a parameter
-class BazaarDiffParameterWidget : public VcsBaseEditorParameterWidget
+class BazaarDiffConfig : public VcsBaseEditorConfig
{
Q_OBJECT
public:
- BazaarDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) :
- VcsBaseEditorParameterWidget(toolBar)
+ BazaarDiffConfig(VcsBaseClientSettings &settings, QToolBar *toolBar) :
+ VcsBaseEditorConfig(toolBar)
{
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
settings.boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey));
@@ -63,7 +63,7 @@ public:
{
QStringList args;
// Bazaar wants "--diff-options=-w -B.."
- const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
+ const QStringList formatArguments = VcsBaseEditorConfig::arguments();
if (!formatArguments.isEmpty()) {
const QString a = QLatin1String("--diff-options=")
+ formatArguments.join(QString(QLatin1Char(' ')));
@@ -73,12 +73,12 @@ public:
}
};
-class BazaarLogParameterWidget : public VcsBaseEditorParameterWidget
+class BazaarLogConfig : public VcsBaseEditorConfig
{
Q_OBJECT
public:
- BazaarLogParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) :
- VcsBaseEditorParameterWidget(toolBar)
+ BazaarLogConfig(VcsBaseClientSettings &settings, QToolBar *toolBar) :
+ VcsBaseEditorConfig(toolBar)
{
mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
tr("Show files changed in each revision.")),
@@ -102,11 +102,11 @@ public:
BazaarClient::BazaarClient() : VcsBaseClient(new BazaarSettings)
{
- setDiffParameterWidgetCreator([this](QToolBar *toolBar) {
- return new BazaarDiffParameterWidget(settings(), toolBar);
+ setDiffConfigCreator([this](QToolBar *toolBar) {
+ return new BazaarDiffConfig(settings(), toolBar);
});
- setLogParameterWidgetCreator([this](QToolBar *toolBar) {
- return new BazaarLogParameterWidget(settings(), toolBar);
+ setLogConfigCreator([this](QToolBar *toolBar) {
+ return new BazaarLogConfig(settings(), toolBar);
});
}