Vcs: Rename VcsBasePluginPrivate to VersionControlBase

The classes derived from this had a dual role of implementing the
version control interface (IVersionControl) and as the plugin pimpls.
The name was focusing on the latter, but plugin pimpls are being phased
out in the new 'setupFoo()' world, so only the version control interface
part remains.

Change-Id: I60396f1729c736bc6c9e4fca250a5926e9d60f51
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

16 files changed, 65 insertions, 65 deletions

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 0f800642f5..3511bc32ce 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -152,7 +152,7 @@ public:
     QLineEdit *revisionLineEdit;
 };
 
-class BazaarPluginPrivate final : public VcsBasePluginPrivate
+class BazaarPluginPrivate final : public VersionControlBase
 {
 public:
     BazaarPluginPrivate();
@@ -183,7 +183,7 @@ public:
     // files changed signals according to the variant's type:
     // String -> repository, StringList -> files
     void changed(const QVariant &);
-    void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) final;
+    void updateActions(VcsBase::VersionControlBase::ActionState) final;
     bool activateCommit() final;
 
     // File menu action slots
@@ -321,7 +321,7 @@ private:
 };
 
 BazaarPluginPrivate::BazaarPluginPrivate()
-    : VcsBasePluginPrivate(Context(Constants::BAZAAR_CONTEXT))
+    : VersionControlBase(Context(Constants::BAZAAR_CONTEXT))
 {
     Context context(Constants::BAZAAR_CONTEXT);
 
@@ -850,7 +850,7 @@ bool BazaarPluginPrivate::activateCommit()
     return true;
 }
 
-void BazaarPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void BazaarPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 39a15984b0..18c364d101 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -134,7 +134,7 @@ static QString debugCodec(const QTextCodec *c)
     return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec");
 }
 
-class ClearCasePluginPrivate final : public VcsBase::VcsBasePluginPrivate
+class ClearCasePluginPrivate final : public VcsBase::VersionControlBase
 {
     Q_OBJECT
 
@@ -216,7 +216,7 @@ public:
     void updateStreamAndView();
 
 protected:
-    void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override;
+    void updateActions(VcsBase::VersionControlBase::ActionState) override;
     bool activateCommit() override;
     void discardCommit() override { cleanCheckInMessageFile(); }
     QString ccGet(const FilePath &workingDir, const QString &file, const QString &prefix = {});
@@ -563,7 +563,7 @@ QString ClearCasePluginPrivate::findTopLevel(const FilePath &directory) const
 }
 
 ClearCasePluginPrivate::ClearCasePluginPrivate()
-    : VcsBase::VcsBasePluginPrivate(Context(CLEARCASE_CONTEXT)),
+    : VcsBase::VersionControlBase(Context(CLEARCASE_CONTEXT)),
       m_statusMap(new StatusMap)
 {
     dd = this;
@@ -937,7 +937,7 @@ void ClearCasePluginPrivate::updateStatusActions()
     m_diffActivityAction->setEnabled(m_viewData.isUcm);
 }
 
-void ClearCasePluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void ClearCasePluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 04bc58099a..b930616e29 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -183,7 +183,7 @@ public:
     }
 };
 
-class CvsPluginPrivate final : public VcsBasePluginPrivate
+class CvsPluginPrivate final : public VersionControlBase
 {
 public:
     CvsPluginPrivate();
@@ -467,7 +467,7 @@ bool CvsPluginPrivate::isCommitEditorOpen() const
 }
 
 CvsPluginPrivate::CvsPluginPrivate()
-    : VcsBasePluginPrivate(Context(CVS_CONTEXT))
+    : VersionControlBase(Context(CVS_CONTEXT))
 {
     using namespace Core::Constants;
     dd = this;
@@ -730,7 +730,7 @@ CvsSubmitEditor *CvsPluginPrivate::openCVSSubmitEditor(const QString &fileName)
     return submitEditor;
 }
 
-void CvsPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void CvsPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index d185d33149..a08d2d444d 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -108,7 +108,7 @@ const VcsBaseSubmitEditorParameters submitEditorParameters {
 };
 
 
-class FossilPluginPrivate final : public VcsBasePluginPrivate
+class FossilPluginPrivate final : public VersionControlBase
 {
 public:
     enum SyncMode {
@@ -143,7 +143,7 @@ public:
                                              const QString &localName,
                                              const QStringList &extraArgs) final;
 
-    void updateActions(VcsBasePluginPrivate::ActionState) override;
+    void updateActions(VersionControlBase::ActionState) override;
     bool activateCommit() override;
 
     // File menu action slots
@@ -245,7 +245,7 @@ private:
 
 
 FossilPluginPrivate::FossilPluginPrivate()
-    : VcsBasePluginPrivate(Context(Constants::FOSSIL_CONTEXT))
+    : VersionControlBase(Context(Constants::FOSSIL_CONTEXT))
 {
     Context context(Constants::FOSSIL_CONTEXT);
 
@@ -784,7 +784,7 @@ bool FossilPluginPrivate::activateCommit()
 }
 
 
-void FossilPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void FossilPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     m_createRepositoryAction->setEnabled(true);
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 4f3ee3fbc3..e5d07ea914 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -185,7 +185,7 @@ const VcsBaseEditorParameters rebaseEditorParameters {
 
 // GitPlugin
 
-class GitPluginPrivate final : public VcsBasePluginPrivate
+class GitPluginPrivate final : public VersionControlBase
 {
     Q_OBJECT
 
@@ -256,7 +256,7 @@ public:
     void initRepository();
     void startRebaseFromCommit(const FilePath &workingDirectory, QString commit);
 
-    void updateActions(VcsBasePluginPrivate::ActionState) override;
+    void updateActions(VersionControlBase::ActionState) override;
     bool activateCommit() override;
     void discardCommit() override { cleanCommitMessageFile(); }
 
@@ -596,7 +596,7 @@ QAction *GitPluginPrivate::createRepositoryAction(ActionContainer *ac, const QSt
 }
 
 GitPluginPrivate::GitPluginPrivate()
-    : VcsBasePluginPrivate(Context(Constants::GIT_CONTEXT))
+    : VersionControlBase(Context(Constants::GIT_CONTEXT))
 {
     dd = this;
 
@@ -1624,7 +1624,7 @@ void GitPluginPrivate::stashList()
     ICore::registerWindow(m_stashDialog, Context("Git.Stashes"));
 }
 
-void GitPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void GitPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     const VcsBasePluginState state = currentState();
     const bool repositoryEnabled = state.hasTopLevel();
diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp
index 0f845294f5..abd442de08 100644
--- a/src/plugins/gitlab/gitlabclonedialog.cpp
+++ b/src/plugins/gitlab/gitlabclonedialog.cpp
@@ -132,7 +132,7 @@ void GitLabCloneDialog::updateUi()
 
 void GitLabCloneDialog::cloneProject()
 {
-    VcsBasePluginPrivate *vc = static_cast<VcsBasePluginPrivate *>(
+    VersionControlBase *vc = static_cast<VersionControlBase *>(
                 Core::VcsManager::versionControl(Id::fromString("G.Git")));
     QTC_ASSERT(vc, return);
     const QStringList extraArgs = m_submodulesCB->isChecked() ? QStringList{ "--recursive" }
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index e67f9ca8da..f667121244 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -100,7 +100,7 @@ const VcsBaseSubmitEditorParameters submitEditorParameters {
     VcsBaseSubmitEditorParameters::DiffFiles
 };
 
-class MercurialPluginPrivate final : public VcsBase::VcsBasePluginPrivate
+class MercurialPluginPrivate final : public VcsBase::VersionControlBase
 {
 public:
     MercurialPluginPrivate();
@@ -135,7 +135,7 @@ public:
     void changed(const QVariant&);
 
 private:
-    void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) final;
+    void updateActions(VcsBase::VersionControlBase::ActionState) final;
     bool activateCommit() final;
 
     // File menu action slots
@@ -219,7 +219,7 @@ public:
 static MercurialPluginPrivate *dd = nullptr;
 
 MercurialPluginPrivate::MercurialPluginPrivate()
-    : VcsBase::VcsBasePluginPrivate(Core::Context(Constants::MERCURIAL_CONTEXT))
+    : VcsBase::VersionControlBase(Core::Context(Constants::MERCURIAL_CONTEXT))
 {
     dd = this;
 
@@ -646,7 +646,7 @@ bool MercurialPluginPrivate::activateCommit()
     return true;
 }
 
-void MercurialPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void MercurialPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 198910ef53..6e74aa54f4 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -181,7 +181,7 @@ struct PerforceDiffParameters
     QStringList files;
 };
 
-class PerforcePluginPrivate final : public VcsBasePluginPrivate
+class PerforcePluginPrivate final : public VersionControlBase
 {
 public:
     PerforcePluginPrivate();
@@ -361,7 +361,7 @@ public:
 static PerforcePluginPrivate *dd = nullptr;
 
 PerforcePluginPrivate::PerforcePluginPrivate()
-    : VcsBasePluginPrivate(Context(PERFORCE_CONTEXT))
+    : VersionControlBase(Context(PERFORCE_CONTEXT))
 {
     Context context(PERFORCE_CONTEXT);
 
@@ -912,7 +912,7 @@ void PerforcePluginPrivate::changelists(const FilePath &workingDir, const QStrin
     }
 }
 
-void PerforcePluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void PerforcePluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     const bool menuActionEnabled = enableMenuAction(as, m_menuAction);
     const bool enableActions = currentState().hasTopLevel() && menuActionEnabled;
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index f543683af2..0f046dae26 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -166,7 +166,7 @@ private:
     SubversionPluginPrivate *m_plugin;
 };
 
-class SubversionPluginPrivate final : public VcsBase::VcsBasePluginPrivate
+class SubversionPluginPrivate final : public VcsBase::VersionControlBase
 {
 public:
     SubversionPluginPrivate();
@@ -220,7 +220,7 @@ public:
                            const QString &revision = {}, int lineNumber = -1);
 
 protected:
-    void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override;
+    void updateActions(VcsBase::VersionControlBase::ActionState) override;
     bool activateCommit() override;
     void discardCommit() override { cleanCommitMessageFile(); }
 
@@ -334,7 +334,7 @@ bool SubversionPluginPrivate::isCommitEditorOpen() const
 }
 
 SubversionPluginPrivate::SubversionPluginPrivate()
-    : VcsBasePluginPrivate(Context(Constants::SUBVERSION_CONTEXT)),
+    : VersionControlBase(Context(Constants::SUBVERSION_CONTEXT)),
       m_svnDirectories(svnDirectories())
 {
     dd = this;
@@ -568,7 +568,7 @@ SubversionSubmitEditor *SubversionPluginPrivate::openSubversionSubmitEditor(cons
     return submitEditor;
 }
 
-void SubversionPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
+void SubversionPluginPrivate::updateActions(VersionControlBase::ActionState as)
 {
     if (!enableMenuAction(as, m_menuAction)) {
         m_commandLocator->setEnabled(false);
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
index af46903b38..55aef0b9d1 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
@@ -20,7 +20,7 @@ const char DIFF_SELECTED[] = "Vcs.DiffSelectedFiles";
 VcsSubmitEditorFactory::VcsSubmitEditorFactory
         (const VcsBaseSubmitEditorParameters &parameters,
          const EditorCreator &editorCreator,
-         VcsBasePluginPrivate *plugin)
+         VersionControlBase *plugin)
 {
     setId(parameters.id);
     setDisplayName(QLatin1String(parameters.displayName));
@@ -46,7 +46,7 @@ VcsSubmitEditorFactory::VcsSubmitEditorFactory
 
     Command *command = ActionManager::registerAction(&m_submitAction, SUBMIT, context);
     command->setAttribute(Command::CA_UpdateText);
-    QObject::connect(&m_submitAction, &QAction::triggered, plugin, &VcsBasePluginPrivate::commitFromEditor);
+    QObject::connect(&m_submitAction, &QAction::triggered, plugin, &VersionControlBase::commitFromEditor);
 
     m_diffAction.setIcon(VcsBaseSubmitEditor::diffIcon());
     m_diffAction.setText(Tr::tr("Diff &Selected Files"));
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
index a7e30bb5a9..5aaa0fa727 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h
@@ -14,7 +14,7 @@ namespace VcsBase {
 
 class VcsBaseSubmitEditor;
 class VcsBaseSubmitEditorParameters;
-class VcsBasePluginPrivate;
+class VersionControlBase;
 
 // Parametrizable base class for editor factories creating instances of
 // VcsBaseSubmitEditor subclasses.
@@ -26,7 +26,7 @@ public:
 
     VcsSubmitEditorFactory(const VcsBaseSubmitEditorParameters &parameters,
                            const EditorCreator &editorCreator,
-                           VcsBasePluginPrivate *plugin);
+                           VersionControlBase *plugin);
 
     ~VcsSubmitEditorFactory();
 
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 95dad8bd6b..ee2ea42813 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -490,14 +490,14 @@ VCSBASE_EXPORT QDebug operator<<(QDebug in, const VcsBasePluginState &state)
     keep it, as it may rapidly change due to context changes, etc.
 */
 
-bool VcsBasePluginPrivate::supportsRepositoryCreation() const
+bool VersionControlBase::supportsRepositoryCreation() const
 {
     return supportsOperation(IVersionControl::CreateRepositoryOperation);
 }
 
 static Internal::StateListener *m_listener = nullptr;
 
-VcsBasePluginPrivate::VcsBasePluginPrivate(const Context &context)
+VersionControlBase::VersionControlBase(const Context &context)
     : m_context(context)
 {
     EditorManager::addCloseEditorListener([this](IEditor *editor) {
@@ -514,7 +514,7 @@ VcsBasePluginPrivate::VcsBasePluginPrivate(const Context &context)
     if (!m_listener)
         m_listener = new Internal::StateListener(Internal::VcsPlugin::instance());
     connect(m_listener, &Internal::StateListener::stateChanged,
-            this, &VcsBasePluginPrivate::slotStateChanged);
+            this, &VersionControlBase::slotStateChanged);
     // VCSes might have become (un-)available, so clear the VCS directory cache
     connect(this, &IVersionControl::configurationChanged,
             VcsManager::instance(), &VcsManager::clearVersionControlCache);
@@ -522,13 +522,13 @@ VcsBasePluginPrivate::VcsBasePluginPrivate(const Context &context)
             m_listener, &Internal::StateListener::slotStateChanged);
 }
 
-void VcsBasePluginPrivate::extensionsInitialized()
+void VersionControlBase::extensionsInitialized()
 {
     // Initialize enable menus.
     m_listener->slotStateChanged();
 }
 
-void VcsBasePluginPrivate::slotStateChanged(const Internal::State &newInternalState, IVersionControl *vc)
+void VersionControlBase::slotStateChanged(const Internal::State &newInternalState, IVersionControl *vc)
 {
     if (vc == this) {
         // We are directly affected: Change state
@@ -550,12 +550,12 @@ void VcsBasePluginPrivate::slotStateChanged(const Internal::State &newInternalSt
     }
 }
 
-const VcsBasePluginState &VcsBasePluginPrivate::currentState() const
+const VcsBasePluginState &VersionControlBase::currentState() const
 {
     return m_state;
 }
 
-VcsCommand *VcsBasePluginPrivate::createInitialCheckoutCommand(const QString &url,
+VcsCommand *VersionControlBase::createInitialCheckoutCommand(const QString &url,
                                                                const FilePath &baseDirectory,
                                                                const QString &localName,
                                                                const QStringList &extraArgs)
@@ -567,7 +567,7 @@ VcsCommand *VcsBasePluginPrivate::createInitialCheckoutCommand(const QString &ur
     return nullptr;
 }
 
-bool VcsBasePluginPrivate::enableMenuAction(ActionState as, QAction *menuAction) const
+bool VersionControlBase::enableMenuAction(ActionState as, QAction *menuAction) const
 {
     qCDebug(baseLog) << "enableMenuAction" << menuAction->text() << as;
     switch (as) {
@@ -588,42 +588,42 @@ bool VcsBasePluginPrivate::enableMenuAction(ActionState as, QAction *menuAction)
     return true;
 }
 
-QString VcsBasePluginPrivate::commitDisplayName() const
+QString VersionControlBase::commitDisplayName() const
 {
     //: Name of the "commit" action of the VCS
     return Tr::tr("Commit", "name of \"commit\" action of the VCS.");
 }
 
-QString VcsBasePluginPrivate::commitAbortTitle() const
+QString VersionControlBase::commitAbortTitle() const
 {
     return Tr::tr("Close Commit Editor");
 }
 
-QString VcsBasePluginPrivate::commitAbortMessage() const
+QString VersionControlBase::commitAbortMessage() const
 {
     return Tr::tr("Closing this editor will abort the commit.");
 }
 
-QString VcsBasePluginPrivate::commitErrorMessage(const QString &error) const
+QString VersionControlBase::commitErrorMessage(const QString &error) const
 {
     if (error.isEmpty())
         return Tr::tr("Cannot commit.");
     return Tr::tr("Cannot commit: %1.").arg(error);
 }
 
-void VcsBasePluginPrivate::commitFromEditor()
+void VersionControlBase::commitFromEditor()
 {
     QTC_ASSERT(m_submitEditor, return);
     m_submitEditor->accept(this);
 }
 
-bool VcsBasePluginPrivate::promptBeforeCommit()
+bool VersionControlBase::promptBeforeCommit()
 {
     return DocumentManager::saveAllModifiedDocuments(Tr::tr("Save before %1?")
                                                      .arg(commitDisplayName().toLower()));
 }
 
-void VcsBasePluginPrivate::promptToDeleteCurrentFile()
+void VersionControlBase::promptToDeleteCurrentFile()
 {
     const VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return);
@@ -642,7 +642,7 @@ static inline bool ask(QWidget *parent, const QString &title, const QString &que
     return QMessageBox::question(parent, title, question, QMessageBox::Yes|QMessageBox::No, defaultButton) == QMessageBox::Yes;
 }
 
-void VcsBasePluginPrivate::createRepository()
+void VersionControlBase::createRepository()
 {
     QTC_ASSERT(supportsOperation(IVersionControl::CreateRepositoryOperation), return);
     // Find current starting directory
@@ -679,17 +679,17 @@ void VcsBasePluginPrivate::createRepository()
     }
 }
 
-void VcsBasePluginPrivate::setSubmitEditor(VcsBaseSubmitEditor *submitEditor)
+void VersionControlBase::setSubmitEditor(VcsBaseSubmitEditor *submitEditor)
 {
     m_submitEditor = submitEditor;
 }
 
-VcsBaseSubmitEditor *VcsBasePluginPrivate::submitEditor() const
+VcsBaseSubmitEditor *VersionControlBase::submitEditor() const
 {
     return m_submitEditor;
 }
 
-bool VcsBasePluginPrivate::raiseSubmitEditor() const
+bool VersionControlBase::raiseSubmitEditor() const
 {
     if (!m_submitEditor)
         return false;
@@ -697,7 +697,7 @@ bool VcsBasePluginPrivate::raiseSubmitEditor() const
     return true;
 }
 
-void VcsBasePluginPrivate::discardCommit()
+void VersionControlBase::discardCommit()
 {
 }
 
diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h
index 5a4c9ae6b3..b1c9abf32a 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.h
+++ b/src/plugins/vcsbase/vcsbaseplugin.h
@@ -30,7 +30,7 @@ namespace VcsBase {
 namespace Internal { class State; }
 
 class VcsBaseSubmitEditor;
-class VcsBasePluginPrivate;
+class VersionControlBase;
 class VcsBasePluginStateData;
 class VcsCommand;
 
@@ -87,7 +87,7 @@ public:
     { return !s1.equals(s2); }
 
 private:
-    friend class VcsBasePluginPrivate;
+    friend class VersionControlBase;
     bool equals(const Internal::State &s) const;
     void setState(const Internal::State &s);
 
@@ -111,12 +111,12 @@ VCSBASE_EXPORT void setSource(Core::IDocument *document, const Utils::FilePath &
 // Returns the source of editor contents.
 VCSBASE_EXPORT Utils::FilePath source(Core::IDocument *document);
 
-class VCSBASE_EXPORT VcsBasePluginPrivate : public Core::IVersionControl
+class VCSBASE_EXPORT VersionControlBase : public Core::IVersionControl
 {
     Q_OBJECT
 
 protected:
-    explicit VcsBasePluginPrivate(const Core::Context &context);
+    explicit VersionControlBase(const Core::Context &context);
 
 public:
     void extensionsInitialized();
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 70d0ec4b8a..7eb3673a4e 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -436,7 +436,7 @@ void VcsBaseSubmitEditor::setDescriptionMandatory(bool v)
 
 enum { checkDialogMinimumWidth = 500 };
 
-void VcsBaseSubmitEditor::accept(VcsBasePluginPrivate *plugin)
+void VcsBaseSubmitEditor::accept(VersionControlBase *plugin)
 {
     auto submitWidget = static_cast<SubmitEditorWidget *>(this->widget());
 
@@ -457,7 +457,7 @@ void VcsBaseSubmitEditor::close()
     EditorManager::closeDocuments({document()});
 }
 
-bool VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin)
+bool VcsBaseSubmitEditor::promptSubmit(VersionControlBase *plugin)
 {
     if (d->m_disablePrompt)
         return true;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 2c3123d736..29351a1cb2 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -21,7 +21,7 @@ namespace Internal { class SubmitEditorFile; }
 
 class SubmitEditorWidget;
 class SubmitFileModel;
-class VcsBasePluginPrivate;
+class VersionControlBase;
 class VcsBaseSubmitEditorPrivate;
 
 class VCSBASE_EXPORT VcsBaseSubmitEditorParameters
@@ -47,8 +47,8 @@ public:
 
     ~VcsBaseSubmitEditor() override;
 
-    void accept(VcsBasePluginPrivate *plugin);
-    bool promptSubmit(VcsBasePluginPrivate *plugin);
+    void accept(VersionControlBase *plugin);
+    bool promptSubmit(VersionControlBase *plugin);
 
     QAbstractItemView::SelectionMode fileListSelectionMode() const;
     void setFileListSelectionMode(QAbstractItemView::SelectionMode sm);
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
index 0877e3ffbe..c24cdfce0e 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
@@ -260,7 +260,7 @@ void VcsCommandPage::delayedInitialize()
     QTC_ASSERT(wiz, return);
 
     const QString vcsId = wiz->expander()->expand(m_vcsId);
-    VcsBasePluginPrivate *vc = static_cast<VcsBasePluginPrivate *>(
+    VersionControlBase *vc = static_cast<VersionControlBase *>(
                 VcsManager::versionControl(Id::fromString(vcsId)));
     if (!vc) {
         qWarning() << Tr::tr("\"%1\" (%2) not found.")