15 files changed, 115 insertions, 115 deletions

diff --git a/src/plugins/subversion/annotationhighlighter.cpp b/src/plugins/subversion/annotationhighlighter.cpp
index 1d5d0293055..ffde3871a2e 100644
--- a/src/plugins/subversion/annotationhighlighter.cpp
+++ b/src/plugins/subversion/annotationhighlighter.cpp
@@ -37,7 +37,7 @@ using namespace Subversion::Internal;
 
 SubversionAnnotationHighlighter::SubversionAnnotationHighlighter(const ChangeNumbers &changeNumbers,
                                                              QTextDocument *document) :
-    VCSBase::BaseAnnotationHighlighter(changeNumbers, document),
+    VcsBase::BaseAnnotationHighlighter(changeNumbers, document),
     m_blank(QLatin1Char(' '))
 {
 }
diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h
index 003f1a1e503..48d8ac17d8f 100644
--- a/src/plugins/subversion/annotationhighlighter.h
+++ b/src/plugins/subversion/annotationhighlighter.h
@@ -39,7 +39,7 @@ namespace Subversion {
 namespace Internal {
 
 // Annotation highlighter for subversion triggering on 'changenumber '
-class SubversionAnnotationHighlighter : public VCSBase::BaseAnnotationHighlighter
+class SubversionAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp
index 41b6f87d42f..06fbd4176c3 100644
--- a/src/plugins/subversion/checkoutwizard.cpp
+++ b/src/plugins/subversion/checkoutwizard.cpp
@@ -46,9 +46,9 @@ namespace Subversion {
 namespace Internal {
 
 CheckoutWizard::CheckoutWizard(QObject *parent) :
-        VCSBase::BaseCheckoutWizard(parent)
+        VcsBase::BaseCheckoutWizard(parent)
 {
-    setId(QLatin1String(VCSBase::Constants::VCS_ID_SUBVERSION));
+    setId(QLatin1String(VcsBase::Constants::VCS_ID_SUBVERSION));
 }
 
 QIcon CheckoutWizard::icon() const
@@ -71,19 +71,19 @@ QList<QWizardPage*> CheckoutWizard::createParameterPages(const QString &path)
     QList<QWizardPage*> rc;
     const Core::IVersionControl *vc = SubversionPlugin::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.append(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.
     const CheckoutWizardPage *cwp = qobject_cast<const CheckoutWizardPage *>(parameterPages.front());
-    QTC_ASSERT(cwp, return QSharedPointer<VCSBase::AbstractCheckoutJob>())
+    QTC_ASSERT(cwp, return QSharedPointer<VcsBase::AbstractCheckoutJob>())
     const SubversionSettings settings = SubversionPlugin::instance()->settings();
     const QString binary = settings.svnCommand;
     const QString directory = cwp->directory();
@@ -94,9 +94,9 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
     const QStringList completeArgs = settings.hasAuthentication() ?
                                      SubversionPlugin::addAuthenticationOptions(args, settings.user, settings.password) :
                                      args;
-    VCSBase::ProcessCheckoutJob *job = new VCSBase::ProcessCheckoutJob;
+    VcsBase::ProcessCheckoutJob *job = new VcsBase::ProcessCheckoutJob;
     job->addStep(binary, completeArgs, workingDirectory);
-    return QSharedPointer<VCSBase::AbstractCheckoutJob>(job);
+    return QSharedPointer<VcsBase::AbstractCheckoutJob>(job);
 }
 
 } // namespace Internal
diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h
index ae36f5130de..37dc0469910 100644
--- a/src/plugins/subversion/checkoutwizard.h
+++ b/src/plugins/subversion/checkoutwizard.h
@@ -38,7 +38,7 @@
 namespace Subversion {
 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);
 };
 
diff --git a/src/plugins/subversion/checkoutwizardpage.cpp b/src/plugins/subversion/checkoutwizardpage.cpp
index 2fd66ec40cd..bfe31563cfe 100644
--- a/src/plugins/subversion/checkoutwizardpage.cpp
+++ b/src/plugins/subversion/checkoutwizardpage.cpp
@@ -36,7 +36,7 @@ namespace Subversion {
 namespace Internal {
 
 CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) :
-    VCSBase::BaseCheckoutWizardPage(parent)
+    VcsBase::BaseCheckoutWizardPage(parent)
 {
     setTitle(tr("Location"));
     setSubTitle(tr("Specify repository URL, checkout directory and path."));
diff --git a/src/plugins/subversion/checkoutwizardpage.h b/src/plugins/subversion/checkoutwizardpage.h
index d1e2b7c73d4..d0cf610f5db 100644
--- a/src/plugins/subversion/checkoutwizardpage.h
+++ b/src/plugins/subversion/checkoutwizardpage.h
@@ -38,7 +38,7 @@
 namespace Subversion {
 namespace Internal {
 
-class CheckoutWizardPage : public VCSBase::BaseCheckoutWizardPage {
+class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage {
     Q_OBJECT
 public:
     CheckoutWizardPage(QWidget *parent = 0);
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index 8f444631999..8ccd596d243 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -109,7 +109,7 @@ SettingsPage::SettingsPage() :
 
 QString SettingsPage::id() const
 {
-    return QLatin1String(VCSBase::Constants::VCS_ID_SUBVERSION);
+    return QLatin1String(VcsBase::Constants::VCS_ID_SUBVERSION);
 }
 
 QString SettingsPage::displayName() const
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index 51bfe007828..6fbc141242f 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -67,7 +67,7 @@ private:
 };
 
 
-class SettingsPage : public VCSBase::VCSBaseOptionsPage
+class SettingsPage : public VcsBase::VcsBaseOptionsPage
 {
     Q_OBJECT
 
diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp
index 74d87ae5580..92a32a8581d 100644
--- a/src/plugins/subversion/subversioncontrol.cpp
+++ b/src/plugins/subversion/subversioncontrol.cpp
@@ -53,7 +53,7 @@ QString SubversionControl::displayName() const
 
 QString SubversionControl::id() const
 {
-    return QLatin1String(VCSBase::Constants::VCS_ID_SUBVERSION);
+    return QLatin1String(VcsBase::Constants::VCS_ID_SUBVERSION);
 }
 
 bool SubversionControl::isConfigured() const
diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp
index 377c2ae8a3d..27ae7a04487 100644
--- a/src/plugins/subversion/subversioneditor.cpp
+++ b/src/plugins/subversion/subversioneditor.cpp
@@ -47,9 +47,9 @@
 using namespace Subversion;
 using namespace Subversion::Internal;
 
-SubversionEditor::SubversionEditor(const VCSBase::VCSBaseEditorParameters *type,
+SubversionEditor::SubversionEditor(const VcsBase::VcsBaseEditorParameters *type,
                                    QWidget *parent) :
-    VCSBase::VCSBaseEditorWidget(type, parent),
+    VcsBase::VcsBaseEditorWidget(type, parent),
     m_changeNumberPattern(QLatin1String("^\\d+$")),
     m_revisionNumberPattern(QLatin1String("^r\\d+$"))
 {
@@ -110,14 +110,14 @@ QString SubversionEditor::changeUnderCursor(const QTextCursor &c) const
 \endcode
 */
 
-VCSBase::DiffHighlighter *SubversionEditor::createDiffHighlighter() const
+VcsBase::DiffHighlighter *SubversionEditor::createDiffHighlighter() const
 {
     const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*|^Index: .*|^==*$"));
     QTC_CHECK(filePattern.isValid());
-    return new VCSBase::DiffHighlighter(filePattern);
+    return new VcsBase::DiffHighlighter(filePattern);
 }
 
-VCSBase::BaseAnnotationHighlighter *SubversionEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighter *SubversionEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
 {
     return new SubversionAnnotationHighlighter(changes);
 }
diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h
index 2e2cb1baef7..00653c8097d 100644
--- a/src/plugins/subversion/subversioneditor.h
+++ b/src/plugins/subversion/subversioneditor.h
@@ -40,19 +40,19 @@
 namespace Subversion {
 namespace Internal {
 
-class SubversionEditor : public VCSBase::VCSBaseEditorWidget
+class SubversionEditor : public VcsBase::VcsBaseEditorWidget
 {
     Q_OBJECT
 
 public:
-    explicit SubversionEditor(const VCSBase::VCSBaseEditorParameters *type,
+    explicit SubversionEditor(const VcsBase::VcsBaseEditorParameters *type,
                             QWidget *parent);
 
 private:
     virtual QSet<QString> annotationChanges() const;
     virtual QString changeUnderCursor(const QTextCursor &) 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 &diffFileName) const;
     virtual QStringList annotationPreviousVersions(const QString &) const;
 
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index c8526105c5f..1f8be8b7c5f 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -114,27 +114,27 @@ static const char nonInteractiveOptionC[] = "--non-interactive";
 
 
 
-static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
+static const VcsBase::VcsBaseEditorParameters editorParameters[] = {
 {
-    VCSBase::RegularCommandOutput,
+    VcsBase::RegularCommandOutput,
     "Subversion Command Log Editor", // id
     QT_TRANSLATE_NOOP("VCS", "Subversion Command Log Editor"), // display name
     "Subversion Command Log Editor", // context
     "application/vnd.nokia.text.scs_svn_commandlog",
     "scslog"},
-{   VCSBase::LogOutput,
+{   VcsBase::LogOutput,
     "Subversion File Log Editor",   // id
     QT_TRANSLATE_NOOP("VCS", "Subversion File Log Editor"),   // display_name
     "Subversion File Log Editor",   // context
     "application/vnd.nokia.text.scs_svn_filelog",
     "scsfilelog"},
-{    VCSBase::AnnotateOutput,
+{    VcsBase::AnnotateOutput,
     "Subversion Annotation Editor",  // id
     QT_TRANSLATE_NOOP("VCS", "Subversion Annotation Editor"),   // display_name
     "Subversion Annotation Editor",  // context
     "application/vnd.nokia.text.scs_svn_annotation",
     "scsannotate"},
-{   VCSBase::DiffOutput,
+{   VcsBase::DiffOutput,
     "Subversion Diff Editor",  // id
     QT_TRANSLATE_NOOP("VCS", "Subversion Diff Editor"),   // display_name
     "Subversion Diff Editor",  // context
@@ -142,10 +142,10 @@ static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
 };
 
 // Utility to find a parameter set by type
-static inline const VCSBase::VCSBaseEditorParameters *findType(int ie)
+static inline const VcsBase::VcsBaseEditorParameters *findType(int ie)
 {
-    const VCSBase::EditorContentType et = static_cast<VCSBase::EditorContentType>(ie);
-    return  VCSBase::VCSBaseEditorWidget::findType(editorParameters, sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters), et);
+    const VcsBase::EditorContentType et = static_cast<VcsBase::EditorContentType>(ie);
+    return  VcsBase::VcsBaseEditorWidget::findType(editorParameters, sizeof(editorParameters)/sizeof(VcsBase::VcsBaseEditorParameters), et);
 }
 
 static inline QString debugCodec(const QTextCodec *c)
@@ -191,7 +191,7 @@ static inline QStringList svnDirectories()
 SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0;
 
 SubversionPlugin::SubversionPlugin() :
-    VCSBase::VCSBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID)),
+    VcsBase::VcsBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID)),
     m_svnDirectories(svnDirectories()),
     m_commandLocator(0),
     m_addAction(0),
@@ -241,7 +241,7 @@ bool SubversionPlugin::isCommitEditorOpen() const
     return !m_commitMessageFileName.isEmpty();
 }
 
-static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = {
+static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = {
     Subversion::Constants::SUBVERSION_SUBMIT_MIMETYPE,
     Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID,
     Subversion::Constants::SUBVERSIONCOMMITEDITOR_DISPLAY_NAME,
@@ -260,8 +260,8 @@ static inline Core::Command *createSeparator(QObject *parent,
 
 bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
 {
-    typedef VCSBase::VCSSubmitEditorFactory<SubversionSubmitEditor> SubversionSubmitEditorFactory;
-    typedef VCSBase::VCSEditorFactory<SubversionEditor> SubversionEditorFactory;
+    typedef VcsBase::VcsSubmitEditorFactory<SubversionSubmitEditor> SubversionSubmitEditorFactory;
+    typedef VcsBase::VcsEditorFactory<SubversionEditor> SubversionEditorFactory;
     using namespace Constants;
 
     using namespace Core::Constants;
@@ -283,7 +283,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     addAutoReleasedObject(new SubversionSubmitEditorFactory(&submitParameters));
 
     static const char *describeSlot = SLOT(describe(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 SubversionEditorFactory(editorParameters + i, this, describeSlot));
 
@@ -456,12 +456,12 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     // Actions of the submit editor
     Core::Context svncommitcontext(Constants::SUBVERSIONCOMMITEDITOR);
 
-    m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this);
+    m_submitCurrentLogAction = new QAction(VcsBase::VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
     command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(m_submitCurrentLogAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog()));
 
-    m_submitDiffAction = new QAction(VCSBase::VCSBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
+    m_submitDiffAction = new QAction(VcsBase::VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
     command = ami->registerAction(m_submitDiffAction , Constants::DIFF_SELECTED, svncommitcontext);
 
     m_submitUndoAction = new QAction(tr("&Undo"), this);
@@ -473,7 +473,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     return true;
 }
 
-bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor)
+bool SubversionPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor)
 {
     if (!isCommitEditorOpen())
         return true;
@@ -493,16 +493,16 @@ bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *su
     // Prompt user. Force a prompt unless submit was actually invoked (that
     // is, the editor was closed or shutdown).
     SubversionSettings newSettings = m_settings;
-    const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer =
+    const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult answer =
             editor->promptSubmit(tr("Closing Subversion Editor"),
                                  tr("Do you want to commit the change?"),
                                  tr("The commit message check failed. Do you want to commit the change?"),
                                  &newSettings.promptToSubmit, !m_submitActionTriggered);
     m_submitActionTriggered = false;
     switch (answer) {
-    case VCSBase::VCSBaseSubmitEditor::SubmitCanceled:
+    case VcsBase::VcsBaseSubmitEditor::SubmitCanceled:
         return false; // Keep editing and change file
-    case VCSBase::VCSBaseSubmitEditor::SubmitDiscarded:
+    case VcsBase::VcsBaseSubmitEditor::SubmitDiscarded:
         cleanCommitMessageFile();
         return true; // Cancel all
     default:
@@ -538,7 +538,7 @@ struct SubversionDiffParameters
 };
 
 // Parameter widget controlling whitespace diff mode, associated with a parameter
-class SubversionDiffParameterWidget : public VCSBase::VCSBaseEditorParameterWidget
+class SubversionDiffParameterWidget : public VcsBase::VcsBaseEditorParameterWidget
 {
     Q_OBJECT
 public:
@@ -555,7 +555,7 @@ private:
 };
 
 SubversionDiffParameterWidget::SubversionDiffParameterWidget(const SubversionDiffParameters &p, QWidget *parent) :
-    VCSBase::VCSBaseEditorParameterWidget(parent), m_parameters(p)
+    VcsBase::VcsBaseEditorParameterWidget(parent), m_parameters(p)
 {
     setBaseArguments(p.arguments);
     addToggleButton(QLatin1String("w"), tr("Ignore whitespace"));
@@ -574,7 +574,7 @@ void SubversionDiffParameterWidget::triggerReRun()
 
 static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db)
 {
-    if (VCSBase::VCSBaseEditorWidget *ve = qobject_cast<VCSBase::VCSBaseEditorWidget*>(editor->widget()))
+    if (VcsBase::VcsBaseEditorWidget *ve = qobject_cast<VcsBase::VcsBaseEditorWidget*>(editor->widget()))
         ve->setDiffBaseDirectory(db);
 }
 
@@ -591,8 +591,8 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet
 {
     if (Subversion::Constants::debug)
         qDebug() << Q_FUNC_INFO << p.files << p.diffName;
-    const QString source = VCSBase::VCSBaseEditorWidget::getSource(p.workingDir, p.files);
-    QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VCSBase::VCSBaseEditorWidget::getCodec(source);
+    const QString source = VcsBase::VcsBaseEditorWidget::getSource(p.workingDir, p.files);
+    QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VcsBase::VcsBaseEditorWidget::getCodec(source);
 
     const QString diffName = p.files.count() == 1 && p.diffName.isEmpty() ?
                              QFileInfo(p.files.front()).fileName() : p.diffName;
@@ -608,18 +608,18 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet
 
     // diff of a single file? re-use an existing view if possible to support
     // the common usage pattern of continuously changing and diffing a file
-    const QString tag = VCSBase::VCSBaseEditorWidget::editorTag(VCSBase::DiffOutput, p.workingDir, p.files);
+    const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, p.workingDir, p.files);
     // Show in the same editor if diff has been executed before
-    if (Core::IEditor *existingEditor = VCSBase::VCSBaseEditorWidget::locateEditorByTag(tag)) {
+    if (Core::IEditor *existingEditor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
         existingEditor->createNew(response.stdOut);
         Core::EditorManager::instance()->activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
         setDiffBaseDirectory(existingEditor, p.workingDir);
         return;
     }
     const QString title = QString::fromLatin1("svn diff %1").arg(diffName);
-    Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VCSBase::DiffOutput, source, codec);
+    Core::IEditor *editor = showOutputInEditor(title, response.stdOut, VcsBase::DiffOutput, source, codec);
     setDiffBaseDirectory(editor, p.workingDir);
-    VCSBase::VCSBaseEditorWidget::tagEditor(editor, tag);
+    VcsBase::VcsBaseEditorWidget::tagEditor(editor, tag);
     SubversionEditor *diffEditorWidget = qobject_cast<SubversionEditor *>(editor->widget());
     QTC_ASSERT(diffEditorWidget, return ; )
 
@@ -629,7 +629,7 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet
     SubversionDiffParameterWidget *pw = new SubversionDiffParameterWidget(p);
     connect(pw, SIGNAL(reRunDiff(Subversion::Internal::SubversionDiffParameters)),
             this, SLOT(svnDiff(Subversion::Internal::SubversionDiffParameters)));
-    connect(diffEditorWidget, SIGNAL(diffChunkReverted(VCSBase::DiffChunk)),
+    connect(diffEditorWidget, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)),
             pw, SLOT(triggerReRun()));
     diffEditorWidget->setConfigurationWidget(pw);
 }
@@ -647,7 +647,7 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri
     return submitEditor;
 }
 
-void SubversionPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
+void SubversionPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
@@ -685,14 +685,14 @@ void SubversionPlugin::updateActions(VCSBase::VCSBasePlugin::ActionState as)
 
 void SubversionPlugin::addCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
     vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
 }
 
 void SubversionPlugin::revertAll()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     const QString title = tr("Revert repository");
     if (QMessageBox::warning(0, title, tr("Revert all pending changes to the repository?"),
@@ -713,7 +713,7 @@ void SubversionPlugin::revertAll()
 
 void SubversionPlugin::revertCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
 
     QStringList args(QLatin1String("diff"));
@@ -748,35 +748,35 @@ void SubversionPlugin::revertCurrentFile()
 
 void SubversionPlugin::diffProject()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return)
     svnDiff(state.currentProjectTopLevel(), state.relativeCurrentProject(), state.currentProjectName());
 }
 
 void SubversionPlugin::diffCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
     svnDiff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
 }
 
 void SubversionPlugin::startCommitCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
     startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
 }
 
 void SubversionPlugin::startCommitAll()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return);
     startCommit(state.topLevel());
 }
 
 void SubversionPlugin::startCommitProject()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return);
     startCommit(state.currentProjectPath());
 }
@@ -786,10 +786,10 @@ void SubversionPlugin::startCommitProject()
  * commit will start. */
 void SubversionPlugin::startCommit(const QString &workingDir, const QStringList &files)
 {
-    if (VCSBase::VCSBaseSubmitEditor::raiseSubmitEditor())
+    if (VcsBase::VcsBaseSubmitEditor::raiseSubmitEditor())
         return;
     if (isCommitEditorOpen()) {
-        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
+        VcsBase::VcsBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed."));
         return;
     }
 
@@ -804,7 +804,7 @@ void SubversionPlugin::startCommit(const QString &workingDir, const QStringList
     // Get list of added/modified/deleted files
     const StatusList statusOutput = parseStatusOutput(response.stdOut);
     if (statusOutput.empty()) {
-        VCSBase::VCSBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
+        VcsBase::VcsBaseOutputWindow::instance()->appendWarning(tr("There are no modified files."));
         return;
     }
     m_commitRepository = workingDir;
@@ -816,7 +816,7 @@ void SubversionPlugin::startCommit(const QString &workingDir, const QStringList
     // Create a submit
     saver.write(submitTemplate.toUtf8());
     if (!saver.finalize()) {
-        VCSBase::VCSBaseOutputWindow::instance()->appendError(saver.errorString());
+        VcsBase::VcsBaseOutputWindow::instance()->appendError(saver.errorString());
         return;
     }
     m_commitMessageFileName = saver.fileName();
@@ -844,54 +844,54 @@ bool SubversionPlugin::commit(const QString &messageFile,
 
 void SubversionPlugin::filelogCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
    filelog(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true);
 }
 
 void SubversionPlugin::logProject()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return)
     filelog(state.currentProjectTopLevel(), state.relativeCurrentProject());
 }
 
 void SubversionPlugin::logRepository()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     filelog(state.topLevel());
 }
 
 void SubversionPlugin::diffRepository()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     svnDiff(state.topLevel(), QStringList());
 }
 
 void SubversionPlugin::statusRepository()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     svnStatus(state.topLevel());
 }
 
 void SubversionPlugin::updateRepository()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     svnUpdate(state.topLevel());
 }
 
 void SubversionPlugin::svnStatus(const QString &workingDir, const QStringList &relativePaths)
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return)
     QStringList args(QLatin1String("status"));
     if (!relativePaths.isEmpty())
         args.append(relativePaths);
-    VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
+    VcsBase::VcsBaseOutputWindow *outwin = VcsBase::VcsBaseOutputWindow::instance();
     outwin->setRepository(workingDir);
     runSvn(workingDir, args, m_settings.timeOutMS(),
            ShowStdOutInLogWindow|ShowSuccessMessage);
@@ -920,24 +920,24 @@ void SubversionPlugin::filelog(const QString &workingDir,
     // Re-use an existing view if possible to support
     // the common usage pattern of continuously changing and diffing a file
 
-    const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDir, files);
-    const QString tag = VCSBase::VCSBaseEditorWidget::editorTag(VCSBase::LogOutput, workingDir, files);
-    if (Core::IEditor *editor = VCSBase::VCSBaseEditorWidget::locateEditorByTag(tag)) {
+    const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(workingDir, files);
+    const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::LogOutput, workingDir, files);
+    if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
         editor->createNew(response.stdOut);
         Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
     } else {
         const QString title = QString::fromLatin1("svn log %1").arg(id);
-        const QString source = VCSBase::VCSBaseEditorWidget::getSource(workingDir, files);
-        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::LogOutput, source, /*codec*/0);
-        VCSBase::VCSBaseEditorWidget::tagEditor(newEditor, tag);
+        const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, files);
+        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VcsBase::LogOutput, source, /*codec*/0);
+        VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, tag);
         if (enableAnnotationContextMenu)
-            VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true);
+            VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true);
     }
 }
 
 void SubversionPlugin::updateProject()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return);
     svnUpdate(state.currentProjectTopLevel(), state.relativeCurrentProject());
 }
@@ -957,7 +957,7 @@ void SubversionPlugin::svnUpdate(const QString &workingDir, const QStringList &r
 
 void SubversionPlugin::annotateCurrentFile()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return);
     vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile());
 }
@@ -974,8 +974,8 @@ void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &fil
                                 const QString &revision /* = QString() */,
                                 int lineNumber /* = -1 */)
 {
-    const QString source = VCSBase::VCSBaseEditorWidget::getSource(workingDir, file);
-    QTextCodec *codec = VCSBase::VCSBaseEditorWidget::getCodec(source);
+    const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, file);
+    QTextCodec *codec = VcsBase::VcsBaseEditorWidget::getCodec(source);
 
     QStringList args(QLatin1String("annotate"));
     if (m_settings.spaceIgnorantAnnotation)
@@ -994,26 +994,26 @@ void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &fil
     // Re-use an existing view if possible to support
     // the common usage pattern of continuously changing and diffing a file
     if (lineNumber <= 0)
-        lineNumber = VCSBase::VCSBaseEditorWidget::lineNumberOfCurrentEditor(source);
+        lineNumber = VcsBase::VcsBaseEditorWidget::lineNumberOfCurrentEditor(source);
     // Determine id
     const QStringList files = QStringList(file);
-    const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDir, files, revision);
-    const QString tag = VCSBase::VCSBaseEditorWidget::editorTag(VCSBase::AnnotateOutput, workingDir, files);
-    if (Core::IEditor *editor = VCSBase::VCSBaseEditorWidget::locateEditorByTag(tag)) {
+    const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(workingDir, files, revision);
+    const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::AnnotateOutput, workingDir, files);
+    if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
         editor->createNew(response.stdOut);
-        VCSBase::VCSBaseEditorWidget::gotoLineOfEditor(editor, lineNumber);
+        VcsBase::VcsBaseEditorWidget::gotoLineOfEditor(editor, lineNumber);
         Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
     } else {
         const QString title = QString::fromLatin1("svn annotate %1").arg(id);
-        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, source, codec);
-        VCSBase::VCSBaseEditorWidget::tagEditor(newEditor, tag);
-        VCSBase::VCSBaseEditorWidget::gotoLineOfEditor(newEditor, lineNumber);
+        Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VcsBase::AnnotateOutput, source, codec);
+        VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, tag);
+        VcsBase::VcsBaseEditorWidget::gotoLineOfEditor(newEditor, lineNumber);
     }
 }
 
 void SubversionPlugin::projectStatus()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return);
     svnStatus(state.currentFileTopLevel(), state.relativeCurrentProject());
 }
@@ -1053,7 +1053,7 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
     QTextStream(&diffArg) << (number - 1) << ':' << number;
     args.push_back(diffArg);
 
-    QTextCodec *codec = VCSBase::VCSBaseEditorWidget::getCodec(source);
+    QTextCodec *codec = VcsBase::VcsBaseEditorWidget::getCodec(source);
     const SubversionResponse response =
             runSvn(topLevel, args, m_settings.timeOutMS(),
                    SshPasswordPrompt, codec);
@@ -1064,20 +1064,20 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
     // Re-use an existing view if possible to support
     // the common usage pattern of continuously changing and diffing a file
     const QString id = diffArg + source;
-    const QString tag = VCSBase::VCSBaseEditorWidget::editorTag(VCSBase::DiffOutput, source, QStringList(), changeNr);
-    if (Core::IEditor *editor = VCSBase::VCSBaseEditorWidget::locateEditorByTag(tag)) {
+    const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, source, QStringList(), changeNr);
+    if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
         editor->createNew(description);
         Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
     } else {
         const QString title = QString::fromLatin1("svn describe %1#%2").arg(fi.fileName(), changeNr);
-        Core::IEditor *newEditor = showOutputInEditor(title, description, VCSBase::DiffOutput, source, codec);
-        VCSBase::VCSBaseEditorWidget::tagEditor(newEditor, tag);
+        Core::IEditor *newEditor = showOutputInEditor(title, description, VcsBase::DiffOutput, source, codec);
+        VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, tag);
     }
 }
 
 void SubversionPlugin::slotDescribe()
 {
-    const VCSBase::VCSBasePluginState state = currentState();
+    const VcsBase::VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasTopLevel(), return);
 
     QInputDialog inputDialog(Core::ICore::instance()->mainWindow());
@@ -1151,7 +1151,7 @@ SubversionResponse SubversionPlugin::runSvn(const QString &workingDir,
 
     const QStringList completeArguments = SubversionPlugin::addAuthenticationOptions(arguments, userName, password);
     const Utils::SynchronousProcessResponse sp_resp =
-            VCSBase::VCSBasePlugin::runVCS(workingDir, executable,
+            VcsBase::VcsBasePlugin::runVcs(workingDir, executable,
                                            completeArguments, timeOut, flags, outputCodec);
 
     response.error = sp_resp.result != Utils::SynchronousProcessResponse::Finished;
@@ -1166,7 +1166,7 @@ Core::IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const
                                                      int editorType, const QString &source,
                                                      QTextCodec *codec)
 {
-    const VCSBase::VCSBaseEditorParameters *params = findType(editorType);
+    const VcsBase::VcsBaseEditorParameters *params = findType(editorType);
     QTC_ASSERT(params, return 0);
     const Core::Id id = params->id;
     if (Subversion::Constants::debug)
@@ -1309,12 +1309,12 @@ bool SubversionPlugin::vcsCheckout(const QString &directory, const QByteArray &u
         args << tempUrl.toEncoded() << directory;
         const SubversionResponse response = runSvn(directory, username, password, args,
                                                    m_settings.longTimeOutMS(),
-                                                   VCSBase::VCSBasePlugin::SshPasswordPrompt);
+                                                   VcsBase::VcsBasePlugin::SshPasswordPrompt);
         return !response.error;
     } else {
         args << url << directory;
         const SubversionResponse response = runSvn(directory, args, m_settings.longTimeOutMS(),
-                                                   VCSBase::VCSBasePlugin::SshPasswordPrompt);
+                                                   VcsBase::VcsBasePlugin::SshPasswordPrompt);
         return !response.error;
     }
 }
diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h
index 7f9386269eb..c6dc905e017 100644
--- a/src/plugins/subversion/subversionplugin.h
+++ b/src/plugins/subversion/subversionplugin.h
@@ -52,8 +52,8 @@ namespace Utils {
     class ParameterAction;
 }
 
-namespace VCSBase {
-    class VCSBaseSubmitEditor;
+namespace VcsBase {
+    class VcsBaseSubmitEditor;
 }
 
 namespace Locator {
@@ -76,7 +76,7 @@ struct SubversionResponse
     QString message;
 };
 
-class SubversionPlugin : public VCSBase::VCSBasePlugin
+class SubversionPlugin : public VcsBase::VcsBasePlugin
 {
     Q_OBJECT
 
@@ -140,8 +140,8 @@ private slots:
     void updateRepository();
 
 protected:
-    virtual void updateActions(VCSBase::VCSBasePlugin::ActionState);
-    virtual bool submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEditor);
+    virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
+    virtual bool submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor);
 
 private:
     inline bool isCommitEditorOpen() const;
diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp
index 6e17d683e48..5889b7a7e3a 100644
--- a/src/plugins/subversion/subversionsubmiteditor.cpp
+++ b/src/plugins/subversion/subversionsubmiteditor.cpp
@@ -38,9 +38,9 @@
 
 using namespace Subversion::Internal;
 
-SubversionSubmitEditor::SubversionSubmitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
+SubversionSubmitEditor::SubversionSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
                                                QWidget *parentWidget) :
-    VCSBase::VCSBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget))
+    VcsBase::VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget))
 {
     setDisplayName(tr("Subversion Submit"));
 }
@@ -48,7 +48,7 @@ SubversionSubmitEditor::SubversionSubmitEditor(const VCSBase::VCSBaseSubmitEdito
 void SubversionSubmitEditor::setStatusList(const QList<StatusFilePair> &statusOutput)
 {
     typedef QList<StatusFilePair>::const_iterator ConstIterator;
-    VCSBase::SubmitFileModel *model = new VCSBase::SubmitFileModel(this);
+    VcsBase::SubmitFileModel *model = new VcsBase::SubmitFileModel(this);
 
     const ConstIterator cend = statusOutput.constEnd();
     for (ConstIterator it = statusOutput.constBegin(); it != cend; ++it)
diff --git a/src/plugins/subversion/subversionsubmiteditor.h b/src/plugins/subversion/subversionsubmiteditor.h
index d58a9ad02b6..80d2657de43 100644
--- a/src/plugins/subversion/subversionsubmiteditor.h
+++ b/src/plugins/subversion/subversionsubmiteditor.h
@@ -41,11 +41,11 @@
 namespace Subversion {
 namespace Internal {
 
-class SubversionSubmitEditor : public VCSBase::VCSBaseSubmitEditor
+class SubversionSubmitEditor : public VcsBase::VcsBaseSubmitEditor
 {
     Q_OBJECT
 public:
-    explicit SubversionSubmitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
+    explicit SubversionSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
                                     QWidget *parentWidget = 0);
 
     static QString fileFromStatusLine(const QString &statusLine);