Commit 7f33ef02 authored by Tobias Hunger's avatar Tobias Hunger

VCS: Do not hide virtual methods

Change-Id: I818eb8246f27b023e35155d50a8d08548660f709
Reviewed-on: http://codereview.qt.nokia.com/350Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 148e1fdf
......@@ -154,7 +154,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory;
m_client = new BazaarClient(m_bazaarSettings);
VCSBase::VCSBasePlugin::initialize(new BazaarControl(m_client));
initializeVcs(new BazaarControl(m_client));
m_core = Core::ICore::instance();
m_actionManager = m_core->actionManager();
......
......@@ -239,7 +239,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes
using namespace Core::Constants;
using namespace ExtensionSystem;
VCSBase::VCSBasePlugin::initialize(new CVSControl(this));
initializeVcs(new CVSControl(this));
m_cvsPluginInstance = this;
Core::ICore *core = Core::ICore::instance();
......
......@@ -285,7 +285,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
typedef VCSBase::VCSEditorFactory<GitEditor> GitEditorFactory;
typedef VCSBase::VCSSubmitEditorFactory<GitSubmitEditor> GitSubmitEditorFactory;
VCSBase::VCSBasePlugin::initialize(new GitVersionControl(m_gitClient));
initializeVcs(new GitVersionControl(m_gitClient));
// Create the globalcontext list to register actions accordingly
Core::Context globalcontext(Core::Constants::C_GLOBAL);
......
......@@ -157,7 +157,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
m_client = new MercurialClient(mercurialSettings);
VCSBase::VCSBasePlugin::initialize(new MercurialControl(m_client));
initializeVcs(new MercurialControl(m_client));
core = Core::ICore::instance();
actionManager = core->actionManager();
......
......@@ -235,7 +235,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
typedef VCSBase::VCSEditorFactory<PerforceEditor> PerforceEditorFactory;
typedef VCSBase::VCSSubmitEditorFactory<PerforceSubmitEditor> PerforceSubmitEditorFactory;
VCSBase::VCSBasePlugin::initialize(new PerforceVersionControl(this));
initializeVcs(new PerforceVersionControl(this));
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.perforce/Perforce.mimetypes.xml"), errorMessage))
......
......@@ -267,7 +267,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
using namespace Core::Constants;
using namespace ExtensionSystem;
VCSBase::VCSBasePlugin::initialize(new SubversionControl(this));
initializeVcs(new SubversionControl(this));
m_subversionPluginInstance = this;
Core::ICore *core = Core::ICore::instance();
......
......@@ -525,7 +525,7 @@ VCSBasePlugin::~VCSBasePlugin()
delete d;
}
void VCSBasePlugin::initialize(Core::IVersionControl *vc)
void VCSBasePlugin::initializeVcs(Core::IVersionControl *vc)
{
d->m_versionControl = vc;
addAutoReleasedObject(vc);
......
......@@ -133,7 +133,7 @@ class VCSBASE_EXPORT VCSBasePlugin : public ExtensionSystem::IPlugin
protected:
explicit VCSBasePlugin(const QString &submitEditorId);
virtual void initialize(Core::IVersionControl *vc);
void initializeVcs(Core::IVersionControl *vc);
virtual void extensionsInitialized();
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment