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;
......
This diff is collapsed.
......@@ -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<QWizardPage *> wizardPageList;
const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl();
if (!vc->isConfigured())
wizardPageList.append(new VCSBase::VcsConfigurationPage(vc));
wizardPageList.append(new VcsBase::VcsConfigurationPage(vc));
CloneWizardPage *page = new CloneWizardPage;
page->setPath(path);
wizardPageList.append(page);
return wizardPageList;
}
QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<QWizardPage *> &parameterPages,
QSharedPointer<VcsBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<QWizardPage *> &parameterPages,
QString *checkoutPath)
{
const CloneWizardPage *page = qobject_cast<const CloneWizardPage *>(parameterPages.front());
if (!page)
return QSharedPointer<VCSBase::AbstractCheckoutJob>();
return QSharedPointer<VcsBase::AbstractCheckoutJob>();
const BazaarSettings &settings = BazaarPlugin::instance()->settings();
*checkoutPath = page->path() + QLatin1Char('/') + page->directory();
......@@ -114,7 +114,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizard::createJob(const QList<
args << client->vcsCommandString(BazaarClient::CloneCommand)
<< 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());
return QSharedPointer<VCSBase::AbstractCheckoutJob>(job);
return QSharedPointer<VcsBase::AbstractCheckoutJob>(job);
}
......@@ -40,7 +40,7 @@
namespace Bazaar {
namespace Internal {
class CloneWizard : public VCSBase::BaseCheckoutWizard
class CloneWizard : public VcsBase::BaseCheckoutWizard
{
Q_OBJECT
......@@ -53,7 +53,7 @@ public:
protected:
QList<QWizardPage *> createParameterPages(const QString &path);
QSharedPointer<VCSBase::AbstractCheckoutJob> createJob(const QList<QWizardPage *> &parameterPages,
QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage *> &parameterPages,
QString *checkoutPath);
private:
......
......@@ -36,7 +36,7 @@
using namespace Bazaar::Internal;
CloneWizardPage::CloneWizardPage(QWidget *parent)
: VCSBase::BaseCheckoutWizardPage(parent),
: VcsBase::BaseCheckoutWizardPage(parent),
m_optionsPanel(new CloneOptionsPanel)
{
setTitle(tr("Location"));
......
......@@ -39,7 +39,7 @@ namespace Bazaar {
namespace Internal {
class CloneOptionsPanel;
class CloneWizardPage : public VCSBase::BaseCheckoutWizardPage
class CloneWizardPage : public VcsBase::BaseCheckoutWizardPage
{
Q_OBJECT
......
......@@ -42,8 +42,8 @@
using namespace Bazaar::Internal;
CommitEditor::CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters, QWidget *parent)
: VCSBase::VCSBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)),
CommitEditor::CommitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent)
: VcsBase::VcsBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)),
m_fileModel(0)
{
setDisplayName(tr("Commit Editor"));
......@@ -62,7 +62,7 @@ BazaarCommitWidget *CommitEditor::commitWidget()
void CommitEditor::setFields(const QString &repositoryRoot,
const BranchInfo &branch, const QString &userName,
const QString &email, const QList<VCSBase::VCSBaseClient::StatusItem> &repoStatus)
const QString &email, const QList<VcsBase::VcsBaseClient::StatusItem> &repoStatus)
{
BazaarCommitWidget *bazaarWidget = commitWidget();
if (!bazaarWidget)
......@@ -70,8 +70,8 @@ void CommitEditor::setFields(const QString &repositoryRoot,
bazaarWidget->setFields(branch, userName, email);
m_fileModel = new VCSBase::SubmitFileModel(this);
foreach (const VCSBase::VCSBaseClient::StatusItem &item, repoStatus)
m_fileModel = new VcsBase::SubmitFileModel(this);
foreach (const VcsBase::VcsBaseClient::StatusItem &item, repoStatus)
if (item.flags != QLatin1String("Unknown"))
m_fileModel->addFile(item.file, item.flags, true);
setFileModel(m_fileModel, repositoryRoot);
......
......@@ -36,7 +36,7 @@
#include <vcsbase/vcsbaseclient.h>
#include <vcsbase/vcsbasesubmiteditor.h>
namespace VCSBase {
namespace VcsBase {
class SubmitFileModel;
}
......@@ -46,23 +46,23 @@ namespace Internal {
class BranchInfo;
class BazaarCommitWidget;
class CommitEditor : public VCSBase::VCSBaseSubmitEditor
class CommitEditor : public VcsBase::VcsBaseSubmitEditor
{
Q_OBJECT
public:
explicit CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
explicit CommitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
QWidget *parent);
void setFields(const QString &repositoryRoot, const BranchInfo &branch,
const QString &userName, const QString &email,
const QList<VCSBase::VCSBaseClient::StatusItem> &repoStatus);
const QList<VcsBase::VcsBaseClient::StatusItem> &repoStatus);
const BazaarCommitWidget *commitWidget() const;
private:
BazaarCommitWidget *commitWidget();
VCSBase::SubmitFileModel *m_fileModel;
VcsBase::SubmitFileModel *m_fileModel;
};
}
......
......@@ -99,7 +99,7 @@ OptionsPage::OptionsPage()
QString OptionsPage::id() const
{
return QLatin1String(VCSBase::Constants::VCS_ID_BAZAAR);
return QLatin1String(VcsBase::Constants::VCS_ID_BAZAAR);
}
QString OptionsPage::displayName() const
......
......@@ -61,7 +61,7 @@ private:
};
class OptionsPage : public VCSBase::VCSBaseOptionsPage
class OptionsPage : public VcsBase::VcsBaseOptionsPage
{
Q_OBJECT
......
......@@ -78,7 +78,7 @@ namespace CodePaster {
post() functionality.
\sa ExtensionSystem::PluginManager::getObjectByClassName, ExtensionSystem::invoke
\sa VCSBase::VCSBaseEditorWidget
\sa VcsBase::VcsBaseEditorWidget
*/
CodePasterService::CodePasterService(QObject *parent) :
......
......@@ -37,7 +37,7 @@ using namespace CVS::Internal;
CVSAnnotationHighlighter::CVSAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) :
VCSBase::BaseAnnotationHighlighter(changeNumbers, document),
VcsBase::BaseAnnotationHighlighter(changeNumbers, document),
m_blank(QLatin1Char(' '))
{
}
......
......@@ -39,7 +39,7 @@ namespace CVS {
namespace Internal {
// Annotation highlighter for cvs triggering on 'changenumber '
class CVSAnnotationHighlighter : public VCSBase::BaseAnnotationHighlighter
class CVSAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{
Q_OBJECT
public:
......
......@@ -46,9 +46,9 @@ namespace CVS {
namespace Internal {
CheckoutWizard::CheckoutWizard(QObject *parent) :
VCSBase::BaseCheckoutWizard(parent)
VcsBase::BaseCheckoutWizard(parent)
{
setId(QLatin1String(VCSBase::Constants::VCS_ID_CVS));
setId(QLatin1String(VcsBase::Constants::VCS_ID_CVS));
}
QIcon CheckoutWizard::icon() const
......@@ -71,20 +71,20 @@ QList<QWizardPage*> CheckoutWizard::createParameterPages(const QString &path)
QList<QWizardPage*> rc;
const Core::IVersionControl *vc = CVSPlugin::instance()->versionControl();
if (!vc->isConfigured())
rc.append(new VCSBase::VcsConfigurationPage(vc));
rc.append(new VcsBase::VcsConfigurationPage(vc));
CheckoutWizardPage *cwp = new CheckoutWizardPage;
cwp->setPath(path);
rc.push_back(cwp);
return rc;
}
QSharedPointer<VCSBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QList<QWizardPage*> &parameterPages,
QSharedPointer<VcsBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QList<QWizardPage*> &parameterPages,
QString *checkoutPath)
{
// Collect parameters for the checkout command.
// CVS does not allow for checking out into a different directory.
const CheckoutWizardPage *cwp = qobject_cast<const CheckoutWizardPage *>(parameterPages.front());
QTC_ASSERT(cwp, return QSharedPointer<VCSBase::AbstractCheckoutJob>())
QTC_ASSERT(cwp, return QSharedPointer<VcsBase::AbstractCheckoutJob>())
const CVSSettings settings = CVSPlugin::instance()->settings();
const QString binary = settings.cvsCommand;
QStringList args;
......@@ -93,9 +93,9 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
const QString workingDirectory = cwp->path();
*checkoutPath = workingDirectory + QLatin1Char('/') + repository;
VCSBase::ProcessCheckoutJob *job = new VCSBase::ProcessCheckoutJob;
VcsBase::ProcessCheckoutJob *job = new VcsBase::ProcessCheckoutJob;
job->addStep(binary, settings.addOptions(args), workingDirectory);
return QSharedPointer<VCSBase::AbstractCheckoutJob>(job);
return QSharedPointer<VcsBase::AbstractCheckoutJob>(job);
}
} // namespace Internal
......
......@@ -38,7 +38,7 @@
namespace CVS {
namespace Internal {
class CheckoutWizard : public VCSBase::BaseCheckoutWizard
class CheckoutWizard : public VcsBase::BaseCheckoutWizard
{
Q_OBJECT
public:
......@@ -52,7 +52,7 @@ public:
protected:
// BaseCheckoutWizard
virtual QList<QWizardPage*> createParameterPages(const QString &path);
virtual QSharedPointer<VCSBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPage,
virtual QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPage,
QString *checkoutPath);
};
......
......@@ -36,7 +36,7 @@ namespace CVS {
namespace Internal {
CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) :
VCSBase::BaseCheckoutWizardPage(parent)
VcsBase::BaseCheckoutWizardPage(parent)
{
setTitle(tr("Location"));
setSubTitle(tr("Specify repository and path."));
......
......@@ -38,7 +38,7 @@
namespace CVS {
namespace Internal {
class CheckoutWizardPage : public VCSBase::BaseCheckoutWizardPage {
class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage {
Q_OBJECT
public:
CheckoutWi