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

Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfig

Browse Source 
Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2016-10-23 04:42:43 +03:00
committed by Orgad Shaneh
parent 2c6adc1e74
commit c844071627
18 changed files with 119 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/bazaar/bazaarclient.cpp
View File

@@ -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);
});
}