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 @@ ...@@ -112,7 +112,7 @@
\o Debugging functionality. \o Debugging functionality.
\row \row
\o \l{VCSBase} \o \l{VcsBase}
\o Base classes for version control support. \o Base classes for version control support.
\row \row
......
...@@ -38,7 +38,7 @@ using namespace Bazaar; ...@@ -38,7 +38,7 @@ using namespace Bazaar;
BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers, BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) QTextDocument *document)
: VCSBase::BaseAnnotationHighlighter(changeNumbers, document), : VcsBase::BaseAnnotationHighlighter(changeNumbers, document),
m_changeset(QLatin1String(Constants::CHANGESET_ID)) m_changeset(QLatin1String(Constants::CHANGESET_ID))
{ {
} }
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class BazaarAnnotationHighlighter : public VCSBase::BaseAnnotationHighlighter class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
public: public:
explicit BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers, explicit BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers,
......
...@@ -49,13 +49,13 @@ namespace Bazaar { ...@@ -49,13 +49,13 @@ namespace Bazaar {
namespace Internal { namespace Internal {
BazaarClient::BazaarClient(BazaarSettings *settings) : BazaarClient::BazaarClient(BazaarSettings *settings) :
VCSBase::VCSBaseClient(settings) VcsBase::VcsBaseClient(settings)
{ {
} }
BazaarSettings *BazaarClient::settings() const BazaarSettings *BazaarClient::settings() const
{ {
return dynamic_cast<BazaarSettings *>(VCSBase::VCSBaseClient::settings()); return dynamic_cast<BazaarSettings *>(VcsBase::VcsBaseClient::settings());
} }
bool BazaarClient::synchronousSetUserId() bool BazaarClient::synchronousSetUserId()
...@@ -97,7 +97,7 @@ BranchInfo BazaarClient::synchronousBranchQuery(const QString &repositoryRoot) c ...@@ -97,7 +97,7 @@ BranchInfo BazaarClient::synchronousBranchQuery(const QString &repositoryRoot) c
void BazaarClient::commit(const QString &repositoryRoot, const QStringList &files, void BazaarClient::commit(const QString &repositoryRoot, const QStringList &files,
const QString &commitMessageFile, const QStringList &extraOptions) const QString &commitMessageFile, const QStringList &extraOptions)
{ {
VCSBaseClient::commit(repositoryRoot, files, commitMessageFile, VcsBaseClient::commit(repositoryRoot, files, commitMessageFile,
QStringList(extraOptions) << QLatin1String("-F") << commitMessageFile); QStringList(extraOptions) << QLatin1String("-F") << commitMessageFile);
} }
...@@ -105,7 +105,7 @@ void BazaarClient::annotate(const QString &workingDir, const QString &file, ...@@ -105,7 +105,7 @@ void BazaarClient::annotate(const QString &workingDir, const QString &file,
const QString revision, int lineNumber, const QString revision, int lineNumber,
const QStringList &extraOptions) const QStringList &extraOptions)
{ {
VCSBaseClient::annotate(workingDir, file, revision, lineNumber, VcsBaseClient::annotate(workingDir, file, revision, lineNumber,
QStringList(extraOptions) << QLatin1String("--long")); QStringList(extraOptions) << QLatin1String("--long"));
} }
...@@ -114,9 +114,9 @@ QString BazaarClient::findTopLevelForFile(const QFileInfo &file) const ...@@ -114,9 +114,9 @@ QString BazaarClient::findTopLevelForFile(const QFileInfo &file) const
const QString repositoryCheckFile = const QString repositoryCheckFile =
QLatin1String(Constants::BAZAARREPO) + QLatin1String("/branch-format"); QLatin1String(Constants::BAZAARREPO) + QLatin1String("/branch-format");
return file.isDir() ? return file.isDir() ?
VCSBase::VCSBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(), VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(),
repositoryCheckFile) : repositoryCheckFile) :
VCSBase::VCSBasePlugin::findRepositoryForDirectory(file.absolutePath(), VcsBase::VcsBasePlugin::findRepositoryForDirectory(file.absolutePath(),
repositoryCheckFile); repositoryCheckFile);
} }
...@@ -124,10 +124,10 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL ...@@ -124,10 +124,10 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL
{ {
QStringList args(QLatin1String("log")); QStringList args(QLatin1String("log"));
args << QLatin1String("-p") << QLatin1String("-v") << extraOptions; 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) { switch(cmd) {
case AnnotateCommand: case AnnotateCommand:
...@@ -210,13 +210,13 @@ struct BazaarCommandParameters ...@@ -210,13 +210,13 @@ struct BazaarCommandParameters
}; };
// Parameter widget controlling whitespace diff mode, associated with a parameter // Parameter widget controlling whitespace diff mode, associated with a parameter
class BazaarDiffParameterWidget : public VCSBase::VCSBaseEditorParameterWidget class BazaarDiffParameterWidget : public VcsBase::VcsBaseEditorParameterWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
BazaarDiffParameterWidget(BazaarClient *client, BazaarDiffParameterWidget(BazaarClient *client,
const BazaarCommandParameters &p, QWidget *parent = 0) : 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")), mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore whitespace")),
client->settings()->boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey)); client->settings()->boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey));
...@@ -228,7 +228,7 @@ public: ...@@ -228,7 +228,7 @@ public:
{ {
QStringList args; QStringList args;
// Bazaar wants "--diff-options=-w -B.." // Bazaar wants "--diff-options=-w -B.."
const QStringList formatArguments = VCSBaseEditorParameterWidget::arguments(); const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
if (!formatArguments.isEmpty()) { if (!formatArguments.isEmpty()) {
const QString a = QLatin1String("--diff-options=") const QString a = QLatin1String("--diff-options=")
+ formatArguments.join(QString(QLatin1Char(' '))); + formatArguments.join(QString(QLatin1Char(' ')));
...@@ -247,20 +247,20 @@ private: ...@@ -247,20 +247,20 @@ private:
const BazaarCommandParameters m_params; const BazaarCommandParameters m_params;
}; };
VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createDiffEditor( VcsBase::VcsBaseEditorParameterWidget *BazaarClient::createDiffEditor(
const QString &workingDir, const QStringList &files, const QStringList &extraOptions) const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
{ {
const BazaarCommandParameters parameters(workingDir, files, extraOptions); const BazaarCommandParameters parameters(workingDir, files, extraOptions);
return new BazaarDiffParameterWidget(this, parameters); return new BazaarDiffParameterWidget(this, parameters);
} }
class BazaarLogParameterWidget : public VCSBase::VCSBaseEditorParameterWidget class BazaarLogParameterWidget : public VcsBase::VcsBaseEditorParameterWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
BazaarLogParameterWidget(BazaarClient *client, BazaarLogParameterWidget(BazaarClient *client,
const BazaarCommandParameters &p, QWidget *parent = 0) : 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"), mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
tr("Show files changed in each revision")), tr("Show files changed in each revision")),
...@@ -291,7 +291,7 @@ private: ...@@ -291,7 +291,7 @@ private:
const BazaarCommandParameters m_params; const BazaarCommandParameters m_params;
}; };
VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createLogEditor( VcsBase::VcsBaseEditorParameterWidget *BazaarClient::createLogEditor(
const QString &workingDir, const QStringList &files, const QStringList &extraOptions) const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
{ {
const BazaarCommandParameters parameters(workingDir, files, extraOptions); const BazaarCommandParameters parameters(workingDir, files, extraOptions);
......
...@@ -42,7 +42,7 @@ namespace Internal { ...@@ -42,7 +42,7 @@ namespace Internal {
class BazaarSettings; class BazaarSettings;
class BazaarClient : public VCSBase::VCSBaseClient class BazaarClient : public VcsBase::VcsBaseClient
{ {
Q_OBJECT Q_OBJECT
...@@ -63,12 +63,12 @@ public: ...@@ -63,12 +63,12 @@ public:
QString findTopLevelForFile(const QFileInfo &file) const; QString findTopLevelForFile(const QFileInfo &file) const;
protected: protected:
QString vcsEditorKind(VCSCommand cmd) const; QString vcsEditorKind(VcsCommand cmd) const;
QStringList revisionSpec(const QString &revision) const; QStringList revisionSpec(const QString &revision) const;
VCSBase::VCSBaseEditorParameterWidget *createDiffEditor(const QString &workingDir, VcsBase::VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
const QStringList &files, const QStringList &files,
const QStringList &extraOptions); const QStringList &extraOptions);
VCSBase::VCSBaseEditorParameterWidget *createLogEditor(const QString &workingDir, VcsBase::VcsBaseEditorParameterWidget *createLogEditor(const QString &workingDir,
const QStringList &files, const QStringList &files,
const QStringList &extraOptions); const QStringList &extraOptions);
StatusItem parseStatusLine(const QString &line) const; StatusItem parseStatusLine(const QString &line) const;
......
...@@ -55,7 +55,7 @@ QString BazaarControl::displayName() const ...@@ -55,7 +55,7 @@ QString BazaarControl::displayName() const
QString BazaarControl::id() 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 bool BazaarControl::managesDirectory(const QString &directory, QString *topLevel) const
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
using namespace Bazaar::Internal; using namespace Bazaar::Internal;
using namespace Bazaar; using namespace Bazaar;
BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) BazaarEditor::BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent)
: VCSBase::VCSBaseEditorWidget(type, parent), : VcsBase::VcsBaseEditorWidget(type, parent),
m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)), m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)),
m_diffFileId(QLatin1String("^=== [a-z]+ [a-z]+ '(.*)'\\s*")) m_diffFileId(QLatin1String("^=== [a-z]+ [a-z]+ '(.*)'\\s*"))
{ {
...@@ -96,12 +96,12 @@ QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const ...@@ -96,12 +96,12 @@ QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const
return QString(); 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); return new BazaarAnnotationHighlighter(changes);
} }
......
...@@ -40,18 +40,18 @@ ...@@ -40,18 +40,18 @@
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class BazaarEditor : public VCSBase::VCSBaseEditorWidget class BazaarEditor : public VcsBase::VcsBaseEditorWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent); explicit BazaarEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent);
private: private:
virtual QSet<QString> annotationChanges() const; virtual QSet<QString> annotationChanges() const;
virtual QString changeUnderCursor(const QTextCursor &cursor) const; virtual QString changeUnderCursor(const QTextCursor &cursor) const;
virtual VCSBase::DiffHighlighter *createDiffHighlighter() const; virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
virtual VCSBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const; virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const;
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const; virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
const QRegExp m_exactChangesetId; const QRegExp m_exactChangesetId;
......
This diff is collapsed.
...@@ -63,8 +63,8 @@ namespace Utils { ...@@ -63,8 +63,8 @@ namespace Utils {
class ParameterAction; class ParameterAction;
} //namespace Utils } //namespace Utils
namespace VCSBase { namespace VcsBase {
class VCSBaseSubmitEditor; class VcsBaseSubmitEditor;
} }
namespace Locator { namespace Locator {
...@@ -79,7 +79,7 @@ class BazaarClient; ...@@ -79,7 +79,7 @@ class BazaarClient;
class BazaarControl; class BazaarControl;
class BazaarEditor; class BazaarEditor;
class BazaarPlugin : public VCSBase::VCSBasePlugin class BazaarPlugin : public VcsBase::VcsBasePlugin
{ {
Q_OBJECT Q_OBJECT
...@@ -114,13 +114,13 @@ private slots: ...@@ -114,13 +114,13 @@ private slots:
void push(); void push();
void update(); void update();
void commit(); void commit();
void showCommitWidget(const QList<VCSBase::VCSBaseClient::StatusItem> &status); void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
void commitFromEditor(); void commitFromEditor();
void diffFromEditorSelected(const QStringList &files); void diffFromEditorSelected(const QStringList &files);
protected: protected:
void updateActions(VCSBase::VCSBasePlugin::ActionState); void updateActions(VcsBase::VcsBasePlugin::ActionState);
bool submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor); bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
private: private:
// Methods // Methods
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class BazaarSettings : public VCSBase::VCSBaseClientSettings class BazaarSettings : public VcsBase::VcsBaseClientSettings
{ {
public: public:
static const QLatin1String diffIgnoreWhiteSpaceKey; static const QLatin1String diffIgnoreWhiteSpaceKey;
......
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
using namespace Bazaar::Internal; using namespace Bazaar::Internal;
CloneWizard::CloneWizard(QObject *parent) CloneWizard::CloneWizard(QObject *parent)
: VCSBase::BaseCheckoutWizard(parent), : VcsBase::BaseCheckoutWizard(parent),
m_icon(QIcon(QLatin1String(":/bazaar/images/bazaar.png"))) 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 QIcon CloneWizard::icon() const
...@@ -73,20 +73,20 @@ QList<QWizardPage *> CloneWizard::createParameterPages(const QString &path) ...@@ -73,20 +73,20 @@ QList<QWizardPage *> CloneWizard::createParameterPages(const QString &path)
QList<QWizardPage *> wizardPageList; QList<QWizardPage *> wizardPageList;
const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl(); const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl();
if (!vc->isConfigured()) if (!vc->isConfigured())
wizardPageList.append(new VCSBase::VcsConfigurationPage(vc)); wizardPageList.append(new VcsBase::VcsConfigurationPage(vc));
CloneWizardPage *page = new CloneWizardPage; CloneWizardPage *page = new CloneWizardPage;
page->setPath(path); page->setPath(path);
wizardPageList.append(page); wizardPageList.append(page);
return wizardPageList; return wizardPageList;
} }
QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<QWizardPage *> &parameterPages, QSharedPointer<VcsBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<QWizardPage *> &parameterPages,
QString *checkoutPath) QString *checkoutPath)
{ {
const CloneWizardPage *page = qobject_cast<const CloneWizardPage *>(parameterPages.front()); const CloneWizardPage *page = qobject_cast<const CloneWizardPage *>(parameterPages.front());
if (!page) if (!page)
return QSharedPointer<VCSBase::AbstractCheckoutJob>(); return QSharedPointer<VcsBase::AbstractCheckoutJob>();
const BazaarSettings &settings = BazaarPlugin::instance()->settings(); const BazaarSettings &settings = BazaarPlugin::instance()->settings();
*checkoutPath = page->path() + QLatin1Char('/') + page->directory(); *checkoutPath = page->path() + QLatin1Char('/') + page->directory();
...@@ -114,7 +114,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizard::createJob(const QList< ...@@ -114,7 +114,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<
args << client->vcsCommandString(BazaarClient::CloneCommand) args << client->vcsCommandString(BazaarClient::CloneCommand)
<< extraOptions << page->repository() << page->directory(); << extraOptions << page->repository() << page->directory();
VCSBase::ProcessCheckoutJob *job = new VCSBase::ProcessCheckoutJob; VcsBase::ProcessCheckoutJob *job = new VcsBase::ProcessCheckoutJob;
job->addStep(settings.stringValue(BazaarSettings::binaryPathKey), args, page->path()); job->addStep(settings.stringValue(BazaarSettings::binaryPathKey), args, page->path());
return QSharedPointer<VCSBase::AbstractCheckoutJob>(job); return QSharedPointer<VcsBase::AbstractCheckoutJob>(job);
} }
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
namespace Bazaar { namespace Bazaar {
namespace Internal { namespace Internal {
class CloneWizard : public VCSBase::BaseCheckoutWizard class CloneWizard : public VcsBase::BaseCheckoutWizard
{ {
Q_OBJECT Q_OBJECT
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
protected: protected:
QList<QWizardPage *> createParameterPages(const QString &path); QList<QWizardPage *> createParameterPages(const QString &path);
QSharedPointer<VCSBase::AbstractCheckoutJob> createJob(const QList<QWizardPage *> &parameterPages, QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage *> &parameterPages,
QString *checkoutPath); QString *checkoutPath);
private: private:
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
using namespace Bazaar::Internal; using namespace Bazaar::Internal;
CloneWizardPage::CloneWizardPage(QWidget *parent) CloneWizardPage::CloneWizardPage(QWidget *parent)
: VCSBase::BaseCheckoutWizardPage(parent), : VcsBase::BaseCheckoutWizardPage(parent),
m_optionsPanel(new CloneOptionsPanel) m_optionsPanel(new CloneOptionsPanel)
{ {
setTitle(tr("Location")); setTitle(tr("Location"));
......
...@@ -39,7 +39,7 @@ namespace Bazaar { ...@@ -39,7 +39,7 @@ namespace Bazaar {
namespace Internal { namespace Internal {
class CloneOptionsPanel; class CloneOptionsPanel;
class CloneWizardPage : public VCSBase::BaseCheckoutWizardPage class CloneWizardPage : public VcsBase::BaseCheckoutWizardPage
{ {
Q_OBJECT Q_OBJECT
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
using namespace Bazaar::Internal; using namespace Bazaar::Internal;
CommitEditor::CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters, QWidget *parent) CommitEditor::CommitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent)
: VCSBase::VCSBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)), : VcsBase::VcsBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)),
m_fileModel(0) m_fileModel(0)
{ {
setDisplayName(tr("Commit Editor")); setDisplayName(tr("Commit Editor"));
...@@ -62,7 +62,7 @@ BazaarCommitWidget *CommitEditor::commitWidget() ...@@ -62,7 +62,7 @@ BazaarCommitWidget *CommitEditor::commitWidget()
void CommitEditor::setFields(const QString &repositoryRoot,