summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp2
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp2
-rw-r--r--src/plugins/cvs/cvsplugin.cpp2
-rw-r--r--src/plugins/git/gitplugin.cpp2
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp2
-rw-r--r--src/plugins/perforce/perforceplugin.cpp2
-rw-r--r--src/plugins/subversion/subversionplugin.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbaseplugin.cpp8
-rw-r--r--src/plugins/vcsbase/vcsbaseplugin.h3
9 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index ff74da8d45..413f09dcbb 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -116,7 +116,7 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitEditorParameters = {
BazaarPlugin *BazaarPlugin::m_instance = 0;
BazaarPlugin::BazaarPlugin()
- : VcsBase::VcsBasePlugin(QLatin1String(Constants::COMMIT_ID)),
+ : VcsBase::VcsBasePlugin(Constants::COMMIT_ID),
m_optionsPage(0),
m_client(0),
m_commandLocator(0),
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index d36c81eb0d..17a3bfb503 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -169,7 +169,7 @@ ViewData::ViewData() :
}
ClearCasePlugin::ClearCasePlugin() :
- VcsBase::VcsBasePlugin(QLatin1String(ClearCase::Constants::CLEARCASECHECKINEDITOR_ID)),
+ VcsBase::VcsBasePlugin(ClearCase::Constants::CLEARCASECHECKINEDITOR_ID),
m_commandLocator(0),
m_checkOutAction(0),
m_checkInCurrentAction(0),
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index d2830a3a9f..7bdc936517 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -162,7 +162,7 @@ static inline bool messageBoxQuestion(const QString &title, const QString &quest
CvsPlugin *CvsPlugin::m_cvsPluginInstance = 0;
CvsPlugin::CvsPlugin() :
- VcsBasePlugin(QLatin1String(Constants::CVSCOMMITEDITOR_ID)),
+ VcsBasePlugin(Constants::CVSCOMMITEDITOR_ID),
m_commandLocator(0),
m_addAction(0),
m_deleteAction(0),
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 00767d78d8..b8913b7b81 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -128,7 +128,7 @@ using namespace Git::Internal;
GitPlugin *GitPlugin::m_instance = 0;
GitPlugin::GitPlugin() :
- VcsBase::VcsBasePlugin(QLatin1String(Git::Constants::GITSUBMITEDITOR_ID)),
+ VcsBase::VcsBasePlugin(Git::Constants::GITSUBMITEDITOR_ID),
m_commandLocator(0),
m_showAction(0),
m_submitCurrentAction(0),
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index f89b755a4f..ebdb31a913 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -115,7 +115,7 @@ static const VcsBaseSubmitEditorParameters submitEditorParameters = {
MercurialPlugin *MercurialPlugin::m_instance = 0;
MercurialPlugin::MercurialPlugin() :
- VcsBasePlugin(QLatin1String(Constants::COMMIT_ID)),
+ VcsBasePlugin(Constants::COMMIT_ID),
optionsPage(0),
m_client(0),
core(0),
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 9790ef20b8..9039fc7bc1 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -176,7 +176,7 @@ PerforceResponse::PerforceResponse() :
PerforcePlugin *PerforcePlugin::m_perforcePluginInstance = NULL;
PerforcePlugin::PerforcePlugin() :
- VcsBase::VcsBasePlugin(QLatin1String(Constants::PERFORCE_SUBMIT_EDITOR_ID)),
+ VcsBase::VcsBasePlugin(Constants::PERFORCE_SUBMIT_EDITOR_ID),
m_commandLocator(0),
m_editAction(0),
m_addAction(0),
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index d38a2a9036..d8a90ea058 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -186,7 +186,7 @@ static inline QStringList svnDirectories()
SubversionPlugin *SubversionPlugin::m_subversionPluginInstance = 0;
SubversionPlugin::SubversionPlugin() :
- VcsBase::VcsBasePlugin(QLatin1String(Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID)),
+ VcsBase::VcsBasePlugin(Subversion::Constants::SUBVERSIONCOMMITEDITOR_ID),
m_svnDirectories(svnDirectories()),
m_commandLocator(0),
m_addAction(0),
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index bda5e4a3e9..4af135df64 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -494,7 +494,7 @@ VCSBASE_EXPORT QDebug operator<<(QDebug in, const VcsBasePluginState &state)
struct VcsBasePluginPrivate
{
- explicit VcsBasePluginPrivate(const QString &submitEditorId);
+ explicit VcsBasePluginPrivate(const Core::Id submitEditorId);
inline bool supportsRepositoryCreation() const;
@@ -511,8 +511,8 @@ struct VcsBasePluginPrivate
static Internal::StateListener *m_listener;
};
-VcsBasePluginPrivate::VcsBasePluginPrivate(const QString &submitEditorId) :
- m_submitEditorId(Core::Id::fromString(submitEditorId)),
+VcsBasePluginPrivate::VcsBasePluginPrivate(const Core::Id submitEditorId) :
+ m_submitEditorId(submitEditorId),
m_versionControl(0),
m_actionState(-1),
m_testSnapshotAction(0),
@@ -529,7 +529,7 @@ bool VcsBasePluginPrivate::supportsRepositoryCreation() const
Internal::StateListener *VcsBasePluginPrivate::m_listener = 0;
-VcsBasePlugin::VcsBasePlugin(const QString &submitEditorId) :
+VcsBasePlugin::VcsBasePlugin(const Core::Id submitEditorId) :
d(new VcsBasePluginPrivate(submitEditorId))
{
}
diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h
index 570f370c44..c27b68a5b6 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.h
+++ b/src/plugins/vcsbase/vcsbaseplugin.h
@@ -32,6 +32,7 @@
#include "vcsbase_global.h"
+#include <coreplugin/id.h>
#include <extensionsystem/iplugin.h>
#include <QSharedDataPointer>
@@ -124,7 +125,7 @@ class VCSBASE_EXPORT VcsBasePlugin : public ExtensionSystem::IPlugin
Q_OBJECT
protected:
- explicit VcsBasePlugin(const QString &submitEditorId);
+ explicit VcsBasePlugin(const Core::Id submitEditorId);
void initializeVcs(Core::IVersionControl *vc);
virtual void extensionsInitialized();