VCS: Do not hide virtual methods

Change-Id: I818eb8246f27b023e35155d50a8d08548660f709
Reviewed-on: http://codereview.qt.nokia.com/350
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-06-04 21:07:34 +02:00
parent 148e1fdf67
commit 7f33ef02e7
8 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -154,7 +154,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory; typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory;
m_client = new BazaarClient(m_bazaarSettings); m_client = new BazaarClient(m_bazaarSettings);
VCSBase::VCSBasePlugin::initialize(new BazaarControl(m_client)); initializeVcs(new BazaarControl(m_client));
m_core = Core::ICore::instance(); m_core = Core::ICore::instance();
m_actionManager = m_core->actionManager(); m_actionManager = m_core->actionManager();
+1 -1
View File
@@ -239,7 +239,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes
using namespace Core::Constants; using namespace Core::Constants;
using namespace ExtensionSystem; using namespace ExtensionSystem;
VCSBase::VCSBasePlugin::initialize(new CVSControl(this)); initializeVcs(new CVSControl(this));
m_cvsPluginInstance = this; m_cvsPluginInstance = this;
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
+1 -1
View File
@@ -285,7 +285,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
typedef VCSBase::VCSEditorFactory<GitEditor> GitEditorFactory; typedef VCSBase::VCSEditorFactory<GitEditor> GitEditorFactory;
typedef VCSBase::VCSSubmitEditorFactory<GitSubmitEditor> GitSubmitEditorFactory; 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 // Create the globalcontext list to register actions accordingly
Core::Context globalcontext(Core::Constants::C_GLOBAL); Core::Context globalcontext(Core::Constants::C_GLOBAL);
+1 -1
View File
@@ -157,7 +157,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory; typedef VCSBase::VCSEditorFactory<MercurialEditor> MercurialEditorFactory;
m_client = new MercurialClient(mercurialSettings); m_client = new MercurialClient(mercurialSettings);
VCSBase::VCSBasePlugin::initialize(new MercurialControl(m_client)); initializeVcs(new MercurialControl(m_client));
core = Core::ICore::instance(); core = Core::ICore::instance();
actionManager = core->actionManager(); actionManager = core->actionManager();
+1 -1
View File
@@ -235,7 +235,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
typedef VCSBase::VCSEditorFactory<PerforceEditor> PerforceEditorFactory; typedef VCSBase::VCSEditorFactory<PerforceEditor> PerforceEditorFactory;
typedef VCSBase::VCSSubmitEditorFactory<PerforceSubmitEditor> PerforceSubmitEditorFactory; typedef VCSBase::VCSSubmitEditorFactory<PerforceSubmitEditor> PerforceSubmitEditorFactory;
VCSBase::VCSBasePlugin::initialize(new PerforceVersionControl(this)); initializeVcs(new PerforceVersionControl(this));
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.perforce/Perforce.mimetypes.xml"), errorMessage)) if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.perforce/Perforce.mimetypes.xml"), errorMessage))
+1 -1
View File
@@ -267,7 +267,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
using namespace Core::Constants; using namespace Core::Constants;
using namespace ExtensionSystem; using namespace ExtensionSystem;
VCSBase::VCSBasePlugin::initialize(new SubversionControl(this)); initializeVcs(new SubversionControl(this));
m_subversionPluginInstance = this; m_subversionPluginInstance = this;
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
+1 -1
View File
@@ -525,7 +525,7 @@ VCSBasePlugin::~VCSBasePlugin()
delete d; delete d;
} }
void VCSBasePlugin::initialize(Core::IVersionControl *vc) void VCSBasePlugin::initializeVcs(Core::IVersionControl *vc)
{ {
d->m_versionControl = vc; d->m_versionControl = vc;
addAutoReleasedObject(vc); addAutoReleasedObject(vc);
+1 -1
View File
@@ -133,7 +133,7 @@ class VCSBASE_EXPORT VCSBasePlugin : public ExtensionSystem::IPlugin
protected: protected:
explicit VCSBasePlugin(const QString &submitEditorId); explicit VCSBasePlugin(const QString &submitEditorId);
virtual void initialize(Core::IVersionControl *vc); void initializeVcs(Core::IVersionControl *vc);
virtual void extensionsInitialized(); virtual void extensionsInitialized();
public: public: