From 7fafeaa513becad586c5011e90738fb43a1f80b0 Mon Sep 17 00:00:00 2001
From: hjk <qthjk@ovi.com>
Date: Fri, 18 Jan 2013 11:35:38 +0100
Subject: [PATCH] CommandLocator: use Id instead of QString.
There seems to be still disagreement in the code what the
individual parameters are meant for.
Change-Id: I9c51e6ee9cc8fd1a55d202b8131027de1ef812a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/plugins/bazaar/bazaarplugin.cpp | 2 +-
src/plugins/clearcase/clearcaseplugin.cpp | 2 +-
src/plugins/cvs/cvsplugin.cpp | 2 +-
src/plugins/git/gitplugin.cpp | 3 +--
src/plugins/locator/commandlocator.cpp | 5 ++---
src/plugins/locator/commandlocator.h | 6 ++----
src/plugins/mercurial/mercurialplugin.cpp | 2 +-
src/plugins/perforce/perforceplugin.cpp | 2 +-
src/plugins/subversion/subversionplugin.cpp | 3 +--
9 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 5144d36a79a..618b9d3ca7b 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -164,7 +164,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
addAutoReleasedObject(new CloneWizard);
const QString prefix = QLatin1String("bzr");
- m_commandLocator = new Locator::CommandLocator(QLatin1String("Bazaar"), prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("Bazaar", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
createMenu();
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index a9adb9e0c51..048d50a2347 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -301,7 +301,7 @@ bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *er
const QString description = QLatin1String("ClearCase");
const QString prefix = QLatin1String("cc");
// register cc prefix in Locator
- m_commandLocator = new Locator::CommandLocator(prefix, description, prefix);
+ m_commandLocator = new Locator::CommandLocator("cc", description, prefix);
addAutoReleasedObject(m_commandLocator);
//register actions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 4da18516c74..d921d9efd49 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -249,7 +249,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(new CheckoutWizard);
const QString prefix = QLatin1String("cvs");
- m_commandLocator = new Locator::CommandLocator(QLatin1String("CVS"), prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("CVS", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
// Register actions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 6a4491343f1..e97b78a4c18 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -294,9 +294,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(new CloneWizard);
addAutoReleasedObject(new Gitorious::Internal::GitoriousCloneWizard);
- const QString description = QLatin1String("Git");
const QString prefix = QLatin1String("git");
- m_commandLocator = new Locator::CommandLocator(description, prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("Git", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
//register actions
diff --git a/src/plugins/locator/commandlocator.cpp b/src/plugins/locator/commandlocator.cpp
index 04f5d606f69..32175900059 100644
--- a/src/plugins/locator/commandlocator.cpp
+++ b/src/plugins/locator/commandlocator.cpp
@@ -31,7 +31,6 @@
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/icore.h>
-#include <coreplugin/id.h>
#include <utils/qtcassert.h>
@@ -44,14 +43,14 @@ struct CommandLocatorPrivate
QList<Core::Command *> commands;
};
-CommandLocator::CommandLocator(const QString &prefix,
+CommandLocator::CommandLocator(Core::Id id,
const QString &displayName,
const QString &shortCutString,
QObject *parent) :
Locator::ILocatorFilter(parent),
d(new CommandLocatorPrivate)
{
- setId(Core::Id::fromString(prefix));
+ setId(id);
setDisplayName(displayName);
setShortcutString(shortCutString);
}
diff --git a/src/plugins/locator/commandlocator.h b/src/plugins/locator/commandlocator.h
index 556bdd8244b..3fd56e49b6a 100644
--- a/src/plugins/locator/commandlocator.h
+++ b/src/plugins/locator/commandlocator.h
@@ -46,10 +46,8 @@ class LOCATOR_EXPORT CommandLocator : public Locator::ILocatorFilter
Q_OBJECT
public:
- explicit CommandLocator(const QString &prefix,
- const QString &displayName,
- const QString &shortCutString,
- QObject *parent = 0);
+ CommandLocator(Core::Id id, const QString &displayName,
+ const QString &shortCutString, QObject *parent = 0);
~CommandLocator();
void appendCommand(Core::Command *cmd);
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index a17451c371c..f4682644842 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -162,7 +162,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
addAutoReleasedObject(new CloneWizard);
const QString prefix = QLatin1String("hg");
- m_commandLocator = new Locator::CommandLocator(QLatin1String("Mercurial"), prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("Mercurial", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
createMenu();
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index af684c9f462..54e74a889cb 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -239,7 +239,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
addAutoReleasedObject(new PerforceEditorFactory(editorParameters + i, this, describeSlot));
const QString prefix = QLatin1String("p4");
- m_commandLocator = new Locator::CommandLocator(QLatin1String("Perforce"), prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("Perforce", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
Core::ActionContainer *mtools =
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index ec8f7c5d659..5bb6533c58a 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -269,9 +269,8 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
addAutoReleasedObject(new CheckoutWizard);
- const QString description = QLatin1String("Subversion");
const QString prefix = QLatin1String("svn");
- m_commandLocator = new Locator::CommandLocator(description, prefix, prefix);
+ m_commandLocator = new Locator::CommandLocator("Subversion", prefix, prefix);
addAutoReleasedObject(m_commandLocator);
//register actions
--
GitLab