Commit 6681d3ed authored by hjk's avatar hjk

vcs: s/VCS/Vcs/

According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@nokia.com>
parent 641716be
......@@ -112,7 +112,7 @@
\o Debugging functionality.
\row
\o \l{VCSBase}
\o \l{VcsBase}
\o Base classes for version control support.
\row
......
......@@ -38,7 +38,7 @@ using namespace Bazaar;
BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document)
: VCSBase::BaseAnnotationHighlighter(changeNumbers, document),
: VcsBase::BaseAnnotationHighlighter(changeNumbers, document),
m_changeset(QLatin1String(Constants::CHANGESET_ID))
{
}
......
......@@ -39,7 +39,7 @@
namespace Bazaar {
namespace Internal {
class BazaarAnnotationHighlighter : public VCSBase::BaseAnnotationHighlighter
class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{
public:
explicit BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers,
......
......@@ -49,13 +49,13 @@ namespace Bazaar {
namespace Internal {
BazaarClient::BazaarClient(BazaarSettings *settings) :
VCSBase::VCSBaseClient(settings)
VcsBase::VcsBaseClient(settings)
{
}
BazaarSettings *BazaarClient::settings() const
{
return dynamic_cast<BazaarSettings *>(VCSBase::VCSBaseClient::settings());
return dynamic_cast<BazaarSettings *>(VcsBase::VcsBaseClient::settings());
}
bool BazaarClient::synchronousSetUserId()
......@@ -97,7 +97,7 @@ BranchInfo BazaarClient::synchronousBranchQuery(const QString &repositoryRoot) c
void BazaarClient::commit(const QString &repositoryRoot, const QStringList &files,
const QString &commitMessageFile, const QStringList &extraOptions)
{
VCSBaseClient::commit(repositoryRoot, files, commitMessageFile,
VcsBaseClient::commit(repositoryRoot, files, commitMessageFile,
QStringList(extraOptions) << QLatin1String("-F") << commitMessageFile);
}
......@@ -105,7 +105,7 @@ void BazaarClient::annotate(const QString &workingDir, const QString &file,
const QString revision, int lineNumber,
const QStringList &extraOptions)
{
VCSBaseClient::annotate(workingDir, file, revision, lineNumber,
VcsBaseClient::annotate(workingDir, file, revision, lineNumber,
QStringList(extraOptions) << QLatin1String("--long"));
}
......@@ -114,9 +114,9 @@ QString BazaarClient::findTopLevelForFile(const QFileInfo &file) const
const QString repositoryCheckFile =
QLatin1String(Constants::BAZAARREPO) + QLatin1String("/branch-format");
return file.isDir() ?
VCSBase::VCSBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(),
VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(),
repositoryCheckFile) :
VCSBase::VCSBasePlugin::findRepositoryForDirectory(file.absolutePath(),
VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absolutePath(),
repositoryCheckFile);
}
......@@ -124,10 +124,10 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL
{
QStringList args(QLatin1String("log"));
args << QLatin1String("-p") << QLatin1String("-v") << extraOptions;
VCSBaseClient::view(source, id, args);
VcsBaseClient::view(source, id, args);
}
QString BazaarClient::vcsEditorKind(VCSCommand cmd) const
QString BazaarClient::vcsEditorKind(VcsCommand cmd) const
{
switch(cmd) {
case AnnotateCommand:
......@@ -210,13 +210,13 @@ struct BazaarCommandParameters
};
// Parameter widget controlling whitespace diff mode, associated with a parameter
class BazaarDiffParameterWidget : public VCSBase::VCSBaseEditorParameterWidget
class BazaarDiffParameterWidget : public VcsBase::VcsBaseEditorParameterWidget
{
Q_OBJECT
public:
BazaarDiffParameterWidget(BazaarClient *client,
const BazaarCommandParameters &p, QWidget *parent = 0) :
VCSBase::VCSBaseEditorParameterWidget(parent), m_client(client), m_params(p)
VcsBase::VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
{
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore whitespace")),
client->settings()->boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey));
......@@ -228,7 +228,7 @@ public:
{
QStringList args;
// Bazaar wants "--diff-options=-w -B.."
const QStringList formatArguments = VCSBaseEditorParameterWidget::arguments();
const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
if (!formatArguments.isEmpty()) {
const QString a = QLatin1String("--diff-options=")
+ formatArguments.join(QString(QLatin1Char(' ')));
......@@ -247,20 +247,20 @@ private:
const BazaarCommandParameters m_params;
};
VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createDiffEditor(
VcsBase::VcsBaseEditorParameterWidget *BazaarClient::createDiffEditor(
const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
{
const BazaarCommandParameters parameters(workingDir, files, extraOptions);
return new BazaarDiffParameterWidget(this, parameters);
}
class BazaarLogParameterWidget : public VCSBase::VCSBaseEditorParameterWidget
class BazaarLogParameterWidget : public VcsBase::VcsBaseEditorParameterWidget
{
Q_OBJECT
public:
BazaarLogParameterWidget(BazaarClient *client,
const BazaarCommandParameters &p, QWidget *parent = 0) :
VCSBase::VCSBaseEditorParameterWidget(parent), m_client(client), m_params(p)
VcsBase::VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
{
mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
tr("Show files changed in each revision")),
......@@ -291,7 +291,7 @@ private:
const BazaarCommandParameters m_params;
};
VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createLogEditor(
VcsBase::VcsBaseEditorParameterWidget *BazaarClient::createLogEditor(
const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
{
const BazaarCommandParameters parameters(workingDir, files, extraOptions);
......
......@@ -42,7 +42,7 @@ namespace Internal {
class BazaarSettings;
class BazaarClient : public VCSBase::VCSBaseClient
class BazaarClient : public VcsBase::VcsBaseClient
{
Q_OBJECT
......@@ -63,12 +63,12 @@ public:
QString findTopLevelForFile(const QFileInfo &file) const;
protected:
QString vcsEditorKind(VCSCommand cmd) const;
QString vcsEditorKind(VcsCommand cmd) const;
QStringList revisionSpec(const QString &revision) const;
VCSBase::VCSBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
VcsBase::VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
const QStringList &files,
const QStringList &extraOptions);
VCSBase::VCSBaseEditorParameterWidget *createLogEditor(const QString &workingDir,
VcsBase::VcsBaseEditorParameterWidget *createLogEditor(const QString &workingDir,
const QStringList &files,
const QStringList &extraOptions);
StatusItem parseStatusLine(const QString &line) const;
......
......@@ -55,7 +55,7 @@ QString BazaarControl::displayName() const
QString BazaarControl::id() const
{
return QLatin1String(VCSBase::Constants::VCS_ID_BAZAAR);
return QLatin1String(VcsBase::Constants::VCS_ID_BAZAAR);
}
bool BazaarControl::managesDirectory(const QString &directory, QString *topLevel) const
......
......@@ -53,8 +53,8 @@
using namespace Bazaar::Internal;
using namespace Bazaar;
BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent)
: VCSBase::VCSBaseEditorWidget(type, parent),
BazaarEditor::BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent)
: VcsBase::VcsBaseEditorWidget(type, parent),
m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)),
m_diffFileId(QLatin1String("^=== [a-z]+ [a-z]+ '(.*)'\\s*"))
{
......@@ -96,12 +96,12 @@ QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const
return QString();
}
VCSBase::DiffHighlighter *BazaarEditor::createDiffHighlighter() const
VcsBase::DiffHighlighter *BazaarEditor::createDiffHighlighter() const
{
return new VCSBase::DiffHighlighter(m_diffFileId);
return new VcsBase::DiffHighlighter(m_diffFileId);
}
VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
VcsBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new BazaarAnnotationHighlighter(changes);
}
......
......@@ -40,18 +40,18 @@
namespace Bazaar {
namespace Internal {
class BazaarEditor : public VCSBase::VCSBaseEditorWidget
class BazaarEditor : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
public:
explicit BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent);
explicit BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent);
private:
virtual QSet<QString> annotationChanges() const;
virtual QString changeUnderCursor(const QTextCursor &cursor) const;
virtual VCSBase::DiffHighlighter *createDiffHighlighter() const;
virtual VCSBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const;
virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const;
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
const QRegExp m_exactChangesetId;
......
......@@ -79,30 +79,30 @@
using namespace Bazaar::Internal;
using namespace Bazaar;
static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
static const VcsBase::VcsBaseEditorParameters editorParameters[] = {
{
VCSBase::RegularCommandOutput, //type
VcsBase::RegularCommandOutput, //type
Constants::COMMANDLOG_ID, // id
Constants::COMMANDLOG_DISPLAY_NAME, // display name
Constants::COMMANDLOG, // context
Constants::COMMANDAPP, // mime type
Constants::COMMANDEXT}, //extension
{ VCSBase::LogOutput,
{ VcsBase::LogOutput,
Constants::FILELOG_ID,
Constants::FILELOG_DISPLAY_NAME,
Constants::FILELOG,
Constants::LOGAPP,
Constants::LOGEXT},
{ VCSBase::AnnotateOutput,
{ VcsBase::AnnotateOutput,
Constants::ANNOTATELOG_ID,
Constants::ANNOTATELOG_DISPLAY_NAME,
Constants::ANNOTATELOG,
Constants::ANNOTATEAPP,
Constants::ANNOTATEEXT},
{ VCSBase::DiffOutput,
{ VcsBase::DiffOutput,
Constants::DIFFLOG_ID,
Constants::DIFFLOG_DISPLAY_NAME,
Constants::DIFFLOG,
......@@ -110,7 +110,7 @@ static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
Constants::DIFFEXT}
};
static const VCSBase::VCSBaseSubmitEditorParameters submitEditorParameters = {
static const VcsBase::VcsBaseSubmitEditorParameters submitEditorParameters = {
Constants::COMMITMIMETYPE,
Constants::COMMIT_ID,
Constants::COMMIT_DISPLAY_NAME,
......@@ -121,7 +121,7 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitEditorParameters = {
BazaarPlugin *BazaarPlugin::m_instance = 0;
BazaarPlugin::BazaarPlugin()
: VCSBase::VCSBasePlugin(QLatin1String(Constants::COMMIT_ID)),
: VcsBase::VcsBasePlugin(QLatin1String(Constants::COMMIT_ID)),
m_optionsPage(0),
m_client(0),
m_core(0),
......@@ -151,7 +151,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
Q_UNUSED(arguments);
Q_UNUSED(errorMessage);
typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory;
typedef VcsBase::VcsEditorFactory<BazaarEditor> BazaarEditorFactory;
m_client = new BazaarClient(&m_bazaarSettings);
initializeVcs(new BazaarControl(m_client));
......@@ -166,11 +166,11 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
static const char *describeSlot = SLOT(view(QString,QString));
const int editorCount = sizeof(editorParameters) / sizeof(VCSBase::VCSBaseEditorParameters);
const int editorCount = sizeof(editorParameters) / sizeof(VcsBase::VcsBaseEditorParameters);
for (int i = 0; i < editorCount; i++)
addAutoReleasedObject(new BazaarEditorFactory(editorParameters + i, m_client, describeSlot));
addAutoReleasedObject(new VCSBase::VCSSubmitEditorFactory<CommitEditor>(&submitEditorParameters));
addAutoReleasedObject(new VcsBase::VcsSubmitEditorFactory<CommitEditor>(&submitEditorParameters));
addAutoReleasedObject(new CloneWizard);
......@@ -294,28 +294,28 @@ void BazaarPlugin::createFileActions(const Core::Context &context)
void BazaarPlugin::addCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
}
void BazaarPlugin::annotateCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
}
void BazaarPlugin::diffCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
}
void BazaarPlugin::logCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()),
QStringList(), true);
......@@ -323,7 +323,7 @@ void BazaarPlugin::logCurrentFile()
void BazaarPlugin::revertCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
QDialog dialog;
......@@ -338,7 +338,7 @@ void BazaarPlugin::revertCurrentFile()
void BazaarPlugin::statusCurrentFile()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile());
}
......@@ -380,14 +380,14 @@ void BazaarPlugin::createDirectoryActions(const Core::Context &context)
void BazaarPlugin::diffRepository()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_client->diff(state.topLevel());
}
void BazaarPlugin::logRepository()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
QStringList extraOptions;
extraOptions += QString("--limit=%1").arg(settings().intValue(BazaarSettings::logCountKey));
......@@ -396,7 +396,7 @@ void BazaarPlugin::logRepository()
void BazaarPlugin::revertAll()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
QDialog dialog;
......@@ -409,7 +409,7 @@ void BazaarPlugin::revertAll()
void BazaarPlugin::statusMulti()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_client->status(state.topLevel());
}
......@@ -456,7 +456,7 @@ void BazaarPlugin::createRepositoryActions(const Core::Context &context)
void BazaarPlugin::pull()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
PullOrPushDialog dialog(PullOrPushDialog::PullMode);
......@@ -476,7 +476,7 @@ void BazaarPlugin::pull()
void BazaarPlugin::push()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
PullOrPushDialog dialog(PullOrPushDialog::PushMode);
......@@ -498,7 +498,7 @@ void BazaarPlugin::push()
void BazaarPlugin::update()
{
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
QDialog dialog;
......@@ -515,12 +515,12 @@ void BazaarPlugin::createSubmitEditorActions()
Core::Context context(Constants::COMMIT_ID);
Core::Command *command;
m_editorCommit = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this);
m_editorCommit = new QAction(VcsBase::VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
command = m_actionManager->registerAction(m_editorCommit, Core::Id(Constants::COMMIT), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_editorCommit, SIGNAL(triggered()), this, SLOT(commitFromEditor()));
m_editorDiff = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
m_editorDiff = new QAction(VcsBase::VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
command = m_actionManager->registerAction(m_editorDiff, Core::Id(Constants::DIFFEDITOR), context);
m_editorUndo = new QAction(tr("&Undo"), this);
......@@ -532,26 +532,26 @@ void BazaarPlugin::createSubmitEditorActions()
void BazaarPlugin::commit()
{
if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
if (VcsBase::VcsBaseSubmitEditor::raiseSubmitEditor())
return;
const VCSBase::VCSBasePluginState state = currentState();
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
m_submitRepository = state.topLevel();
connect(m_client, SIGNAL(parsedStatus(QList<VCSBase::VCSBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VCSBase::VCSBaseClient::StatusItem>)));
connect(m_client, SIGNAL(parsedStatus(QList<VcsBase::VcsBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VcsBase::VcsBaseClient::StatusItem>)));
// The "--short" option allows to easily parse status output
m_client->emitParsedStatus(m_submitRepository, QStringList(QLatin1String("--short")));
}
void BazaarPlugin::showCommitWidget(const QList<VCSBase::VCSBaseClient::StatusItem> &status)
void BazaarPlugin::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status)
{
VCSBase::VCSBaseOutputWindow *outputWindow = VCSBase::VCSBaseOutputWindow::instance();
VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance();
//Once we receive our data release the connection so it can be reused elsewhere
disconnect(m_client, SIGNAL(parsedStatus(QList<VCSBase::VCSBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VCSBase::VCSBaseClient::StatusItem>)));
disconnect(m_client, SIGNAL(parsedStatus(QList<VcsBase::VcsBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VcsBase::VcsBaseClient::StatusItem>)));
if (status.isEmpty()) {
outputWindow->appendError(tr("There are no changes to commit."));
......@@ -615,7 +615,7 @@ void BazaarPlugin::commitFromEditor()
m_core->editorManager()->closeEditors(m_core->editorManager()->editorsForFileName(m_changeLog->fileName()));
}
bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
bool BazaarPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor)
{
if (!m_changeLog)
return true;
......@@ -625,15 +625,15 @@ bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submit
return true;
bool dummyPrompt = m_bazaarSettings.boolValue(BazaarSettings::promptOnSubmitKey);
const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult response =
const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult response =
commitEditor->promptSubmit(tr("Close Commit Editor"), tr("Do you want to commit the changes?"),
tr("Message check failed. Do you want to proceed?"),
&dummyPrompt, dummyPrompt);
switch (response) {
case VCSBase::VCSBaseSubmitEditor::SubmitCanceled:
case VcsBase::VcsBaseSubmitEditor::SubmitCanceled:
return false;
case VCSBase::VCSBaseSubmitEditor::SubmitDiscarded:
case VcsBase::VcsBaseSubmitEditor::SubmitDiscarded:
deleteCommitLog();
return true;
default:
......@@ -687,7 +687,7 @@ void BazaarPlugin::createSeparator(const Core::Context &context, const Core::Id
m_bazaarContainer->addAction(m_actionManager->registerAction(action, id, context));
}
void BazaarPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
void BazaarPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as)
{
if (!enableMenuAction(as, m_menuAction)) {
m_commandLocator->setEnabled(false);
......
......@@ -63,8 +63,8 @@ namespace Utils {
class ParameterAction;
} //namespace Utils
namespace VCSBase {
class VCSBaseSubmitEditor;
namespace VcsBase {
class VcsBaseSubmitEditor;
}
namespace Locator {
......@@ -79,7 +79,7 @@ class BazaarClient;
class BazaarControl;
class BazaarEditor;
class BazaarPlugin : public VCSBase::VCSBasePlugin
class BazaarPlugin : public VcsBase::VcsBasePlugin
{
Q_OBJECT
......@@ -114,13 +114,13 @@ private slots:
void push();
void update();
void commit();
void showCommitWidget(const QList<VCSBase::VCSBaseClient::StatusItem> &status);
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
void commitFromEditor();
void diffFromEditorSelected(const QStringList &files);
protected:
void updateActions(VCSBase::VCSBasePlugin::ActionState);
bool submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor);
void updateActions(VcsBase::VcsBasePlugin::ActionState);
bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private:
// Methods
......
......@@ -38,7 +38,7 @@
namespace Bazaar {
namespace Internal {
class BazaarSettings : public VCSBase::VCSBaseClientSettings
class BazaarSettings : public VcsBase::VcsBaseClientSettings
{
public:
static const QLatin1String diffIgnoreWhiteSpaceKey;
......
......@@ -47,10 +47,10 @@
using namespace Bazaar::Internal;
CloneWizard::CloneWizard(QObject *parent)
: VCSBase::BaseCheckoutWizard(parent),
: VcsBase::BaseCheckoutWizard(parent),
m_icon(QIcon(QLatin1String(":/bazaar/images/bazaar.png")))
{
setId(QLatin1String(VCSBase::Constants::VCS_ID_BAZAAR));
setId(QLatin1String(VcsBase::Constants::VCS_ID_BAZAAR));
}
QIcon CloneWizard::icon() const
......@@ -73,20 +73,20 @@ QList<QWizardPage *> CloneWizard::createParameterPages(const QString &path)
QList<