feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Always pass Core::Id by value.

Browse Source 
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Kandeler
2014-07-01 11:08:26 +02:00
committed by hjk
parent 139449239c
commit 93304df038
208 changed files with 472 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddeployconfiguration.cpp
View File

@@ -67,12 +67,12 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory(QObject *pa
setObjectName(QLatin1String("AndroidDeployConfigurationFactory"));
}
bool AndroidDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool AndroidDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
DeployConfiguration *AndroidDeployConfigurationFactory::create(Target *parent, const Core::Id id)
DeployConfiguration *AndroidDeployConfigurationFactory::create(Target *parent, Core::Id id)
{
AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent, id);
@@ -143,7 +143,7 @@ QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *
return ids;
}
QString AndroidDeployConfigurationFactory::displayNameForId(const Core::Id id) const
QString AndroidDeployConfigurationFactory::displayNameForId(Core::Id id) const
{
if (id.name().startsWith(ANDROID_DC_PREFIX)
|| id.name().startsWith(ANDROID_DC2_PREFIX))

6
src/plugins/android/androiddeployconfiguration.h
View File

@@ -62,8 +62,8 @@ class AndroidDeployConfigurationFactory : public ProjectExplorer::DeployConfigur
public:
explicit AndroidDeployConfigurationFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const;
@@ -71,7 +71,7 @@ public:
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
// used to translate the ids to names to display to the user
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
private:
bool canHandle(ProjectExplorer::Target *parent) const;

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -87,19 +87,19 @@ QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer
return QList<Core::Id>() << AndroidDeployQtStep::Id;
}
QString AndroidDeployQtStepFactory::displayNameForId(const Core::Id id) const
QString AndroidDeployQtStepFactory::displayNameForId(Core::Id id) const
{
if (id == AndroidDeployQtStep::Id)
return tr("Deploy to Android device or emulator");
return QString();
}
bool AndroidDeployQtStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const
bool AndroidDeployQtStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id)
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
Q_UNUSED(id);

4
src/plugins/android/androiddeployqtstep.h
View File

@@ -50,11 +50,11 @@ public:
explicit AndroidDeployQtStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);

6
src/plugins/android/androiddeploystepfactory.cpp
View File

@@ -64,19 +64,19 @@ QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *pa
return QList<Core::Id>() << AndroidDeployStep::Id;
}
QString AndroidDeployStepFactory::displayNameForId(const Core::Id id) const
QString AndroidDeployStepFactory::displayNameForId(Core::Id id) const
{
if (id == AndroidDeployStep::Id)
return tr("Deploy to Android device or emulator");
return QString();
}
bool AndroidDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool AndroidDeployStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
BuildStep *AndroidDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *AndroidDeployStepFactory::create(BuildStepList *parent, Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
Q_UNUSED(id);

4
src/plugins/android/androiddeploystepfactory.h
View File

@@ -42,11 +42,11 @@ public:
explicit AndroidDeployStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);

6
src/plugins/android/androidpackagecreationfactory.cpp
View File

@@ -62,19 +62,19 @@ QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(BuildStepLis
return QList<Core::Id>() << AndroidPackageCreationStep::CreatePackageId;
}
QString AndroidPackageCreationFactory::displayNameForId(const Core::Id id) const
QString AndroidPackageCreationFactory::displayNameForId(Core::Id id) const
{
if (id == AndroidPackageCreationStep::CreatePackageId)
return tr("Create Android (.apk) Package");
return QString();
}
bool AndroidPackageCreationFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool AndroidPackageCreationFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
BuildStep *AndroidPackageCreationFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *AndroidPackageCreationFactory::create(BuildStepList *parent, Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
Q_UNUSED(id);

4
src/plugins/android/androidpackagecreationfactory.h
View File

@@ -42,11 +42,11 @@ public:
explicit AndroidPackageCreationFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canRestore(ProjectExplorer::BuildStepList *parent,
const QVariantMap &map) const;

6
src/plugins/android/androidpackageinstallationfactory.cpp
View File

@@ -54,21 +54,21 @@ QList<Core::Id> AndroidPackageInstallationFactory::availableCreationIds(BuildSte
return QList<Core::Id>();
}
QString AndroidPackageInstallationFactory::displayNameForId(const Core::Id id) const
QString AndroidPackageInstallationFactory::displayNameForId(Core::Id id) const
{
if (id == AndroidPackageInstallationStep::Id)
return tr("Deploy to device");
return QString();
}
bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
Q_UNUSED(parent);
Q_UNUSED(id);
return false;
}
BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, Core::Id id)
{
Q_UNUSED(parent);
Q_UNUSED(id);

4
src/plugins/android/androidpackageinstallationfactory.h
View File

@@ -42,11 +42,11 @@ public:
explicit AndroidPackageInstallationFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canRestore(ProjectExplorer::BuildStepList *parent,
const QVariantMap &map) const;

8
src/plugins/android/androidrunfactories.cpp
View File

@@ -55,7 +55,7 @@ namespace Internal {
static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
static QString pathFromId(const Core::Id id)
static QString pathFromId(Core::Id id)
{
return id.suffixAfter(ANDROID_RC_ID_PREFIX);
}
@@ -66,7 +66,7 @@ AndroidRunConfigurationFactory::AndroidRunConfigurationFactory(QObject *parent)
setObjectName(QLatin1String("AndroidRunConfigurationFactory"));
}
bool AndroidRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool AndroidRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
if (!canHandle(parent))
return false;
@@ -103,12 +103,12 @@ QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *par
return QmakeProject::idsForNodes(base, nodes);
}
QString AndroidRunConfigurationFactory::displayNameForId(const Core::Id id) const
QString AndroidRunConfigurationFactory::displayNameForId(Core::Id id) const
{
return QFileInfo(pathFromId(id)).completeBaseName();
}
RunConfiguration *AndroidRunConfigurationFactory::doCreate(Target *parent, const Core::Id id)
RunConfiguration *AndroidRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
{
return new AndroidRunConfiguration(parent, id, pathFromId(id));
}

6
src/plugins/android/androidrunfactories.h
View File

@@ -50,10 +50,10 @@ class AndroidRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfi
public:
explicit AndroidRunConfigurationFactory(QObject *parent = 0);
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const;
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
@@ -66,7 +66,7 @@ public:
private:
bool canHandle(ProjectExplorer::Target *t) const;
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id);
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id);
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map);
};

2
src/plugins/android/javacompletionassistprovider.cpp
View File

@@ -104,7 +104,7 @@ void JavaCompletionAssistProvider::init() const
m_keywords.append(QLatin1String(keywords[i]));
}
bool JavaCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool JavaCompletionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == Constants::JAVA_EDITOR_ID;
}

2
src/plugins/android/javacompletionassistprovider.h
View File

@@ -46,7 +46,7 @@ public:
void init() const;
bool supportsEditor(const Core::Id &editorId) const;
bool supportsEditor(Core::Id editorId) const;
TextEditor::IAssistProcessor *createProcessor() const;
private:

8
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -69,19 +69,19 @@ QList<Core::Id> AutogenStepFactory::availableCreationIds(BuildStepList *parent)
return QList<Core::Id>() << Core::Id(AUTOGEN_STEP_ID);
}
QString AutogenStepFactory::displayNameForId(const Core::Id id) const
QString AutogenStepFactory::displayNameForId(Core::Id id) const
{
if (id == AUTOGEN_STEP_ID)
return tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id.");
return QString();
}
bool AutogenStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool AutogenStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return canHandle(parent) && Core::Id(AUTOGEN_STEP_ID) == id;
}
BuildStep *AutogenStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *AutogenStepFactory::create(BuildStepList *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -133,7 +133,7 @@ AutogenStep::AutogenStep(BuildStepList *bsl) :
ctor();
}
AutogenStep::AutogenStep(BuildStepList *bsl, const Core::Id id) :
AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id)
{
ctor();

8
src/plugins/autotoolsprojectmanager/autogenstep.h
View File

@@ -61,9 +61,9 @@ public:
AutogenStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -110,7 +110,7 @@ signals:
protected:
AutogenStep(ProjectExplorer::BuildStepList *bsl, AutogenStep *bs);
AutogenStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map);

8
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -68,19 +68,19 @@ QList<Core::Id> AutoreconfStepFactory::availableCreationIds(BuildStepList *paren
return QList<Core::Id>() << Core::Id(AUTORECONF_STEP_ID);
}
QString AutoreconfStepFactory::displayNameForId(const Core::Id id) const
QString AutoreconfStepFactory::displayNameForId(Core::Id id) const
{
if (id == AUTORECONF_STEP_ID)
return tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id.");
return QString();
}
bool AutoreconfStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool AutoreconfStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return canHandle(parent) && Core::Id(AUTORECONF_STEP_ID) == id;
}
BuildStep *AutoreconfStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *AutoreconfStepFactory::create(BuildStepList *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -132,7 +132,7 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl) :
ctor();
}
AutoreconfStep::AutoreconfStep(BuildStepList *bsl, const Core::Id id) :
AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id)
{
ctor();

8
src/plugins/autotoolsprojectmanager/autoreconfstep.h
View File

@@ -60,10 +60,10 @@ public:
AutoreconfStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -110,7 +110,7 @@ signals:
protected:
AutoreconfStep(ProjectExplorer::BuildStepList *bsl, AutoreconfStep *bs);
AutoreconfStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map);

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -70,7 +70,7 @@ NamedWidget *AutotoolsBuildConfiguration::createConfigWidget()
return new AutotoolsBuildSettingsWidget(this);
}
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id)
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id)
: BuildConfiguration(parent, id)
{ }

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
View File

@@ -56,7 +56,7 @@ public:
BuildType buildType() const;
protected:
AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id);
AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id);
AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, AutotoolsBuildConfiguration *source);
friend class AutotoolsBuildSettingsWidget;

8
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -69,19 +69,19 @@ QList<Core::Id> ConfigureStepFactory::availableCreationIds(BuildStepList *parent
return QList<Core::Id>() << Core::Id(CONFIGURE_STEP_ID);
}
QString ConfigureStepFactory::displayNameForId(const Core::Id id) const
QString ConfigureStepFactory::displayNameForId(Core::Id id) const
{
if (id == CONFIGURE_STEP_ID)
return tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id.");
return QString();
}
bool ConfigureStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool ConfigureStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return canHandle(parent) && id == CONFIGURE_STEP_ID;
}
BuildStep *ConfigureStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *ConfigureStepFactory::create(BuildStepList *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -133,7 +133,7 @@ ConfigureStep::ConfigureStep(BuildStepList* bsl) :
ctor();
}
ConfigureStep::ConfigureStep(BuildStepList *bsl, const Core::Id id) :
ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id)
{
ctor();

8
src/plugins/autotoolsprojectmanager/configurestep.h
View File

@@ -60,10 +60,10 @@ public:
ConfigureStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -109,7 +109,7 @@ signals:
protected:
ConfigureStep(ProjectExplorer::BuildStepList *bsl, ConfigureStep *bs);
ConfigureStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map);

8
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -74,21 +74,21 @@ QList<Core::Id> MakeStepFactory::availableCreationIds(BuildStepList *parent) con
return QList<Core::Id>();
}
QString MakeStepFactory::displayNameForId(const Core::Id id) const
QString MakeStepFactory::displayNameForId(Core::Id id) const
{
if (id == MAKE_STEP_ID)
return tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.");
return QString();
}
bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool MakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
if (parent->target()->project()->id() == AUTOTOOLS_PROJECT_ID)
return id == MAKE_STEP_ID;
return false;
}
BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *MakeStepFactory::create(BuildStepList *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -133,7 +133,7 @@ MakeStep::MakeStep(BuildStepList* bsl) :
ctor();
}
MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id),
m_clean(false)
{

8
src/plugins/autotoolsprojectmanager/makestep.h
View File

@@ -61,10 +61,10 @@ public:
MakeStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -110,7 +110,7 @@ signals:
protected:
MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map);

2
src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
View File

@@ -43,7 +43,7 @@ class BareMetalGdbCommandsDeployStep : public ProjectExplorer::BuildStep
Q_OBJECT
public:
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl,
BareMetalGdbCommandsDeployStep *other);
~BareMetalGdbCommandsDeployStep();

2
src/plugins/baremetal/baremetalrunconfiguration.h
View File

@@ -46,7 +46,7 @@ class BareMetalRunConfiguration : public ProjectExplorer::RunConfiguration
friend class BareMetalRunConfigurationWidget;
public:
explicit BareMetalRunConfiguration(ProjectExplorer::Target *parent, const Core::Id id,
explicit BareMetalRunConfiguration(ProjectExplorer::Target *parent, Core::Id id,
const QString &projectFilePath);
bool isEnabled() const;

6
src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
View File

@@ -63,7 +63,7 @@ BareMetalRunConfigurationFactory::~BareMetalRunConfigurationFactory()
{
}
bool BareMetalRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool BareMetalRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
if (!canHandle(parent))
return false;
@@ -97,13 +97,13 @@ QList<Core::Id> BareMetalRunConfigurationFactory::availableCreationIds(Target *p
return result;
}
QString BareMetalRunConfigurationFactory::displayNameForId(const Core::Id id) const
QString BareMetalRunConfigurationFactory::displayNameForId(Core::Id id) const
{
return tr("%1 (on GDB server or hardware debugger)")
.arg(QFileInfo(pathFromId(id)).completeBaseName());
}
RunConfiguration *BareMetalRunConfigurationFactory::doCreate(Target *parent, const Core::Id id)
RunConfiguration *BareMetalRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
{
Q_UNUSED(id);
return new BareMetalRunConfiguration(parent, id, pathFromId(id));

6
src/plugins/baremetal/baremetalrunconfigurationfactory.h
View File

@@ -43,10 +43,10 @@ public:
explicit BareMetalRunConfigurationFactory(QObject *parent = 0);
~BareMetalRunConfigurationFactory();
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
@@ -56,7 +56,7 @@ public:
private:
bool canHandle(const ProjectExplorer::Target *target) const;
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id);
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id);
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map);
};

2
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
View File

@@ -46,7 +46,7 @@ CMakeFileCompletionAssistProvider::CMakeFileCompletionAssistProvider(CMakeSettin
CMakeFileCompletionAssistProvider::~CMakeFileCompletionAssistProvider()
{}
bool CMakeFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool CMakeFileCompletionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
}

2
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
View File

@@ -45,7 +45,7 @@ public:
CMakeFileCompletionAssistProvider(CMakeSettingsPage *settingsPage);
~CMakeFileCompletionAssistProvider();
bool supportsEditor(const Core::Id &editorId) const;
bool supportsEditor(Core::Id editorId) const;
TextEditor::IAssistProcessor *createProcessor() const;
private:

6
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -365,7 +365,7 @@ QList<Core::Id> CMakeRunConfigurationFactory::availableCreationIds(Target *paren
}
// used to translate the ids to names to display to the user
QString CMakeRunConfigurationFactory::displayNameForId(const Core::Id id) const
QString CMakeRunConfigurationFactory::displayNameForId(Core::Id id) const
{
return buildTargetFromId(id);
}
@@ -377,7 +377,7 @@ bool CMakeRunConfigurationFactory::canHandle(Target *parent) const
return qobject_cast<CMakeProject *>(parent->project());
}
bool CMakeRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool CMakeRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
if (!canHandle(parent))
return false;
@@ -385,7 +385,7 @@ bool CMakeRunConfigurationFactory::canCreate(Target *parent, const Core::Id id)
return project->hasBuildTarget(buildTargetFromId(id));
}
RunConfiguration *CMakeRunConfigurationFactory::doCreate(Target *parent, const Core::Id id)
RunConfiguration *CMakeRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
{
CMakeProject *project = static_cast<CMakeProject *>(parent->project());
const QString title(buildTargetFromId(id));

6
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -133,13 +133,13 @@ public:
explicit CMakeRunConfigurationFactory(QObject *parent = 0);
~CMakeRunConfigurationFactory();
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product);
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
static Core::Id idFromBuildTarget(const QString &target);
static QString buildTargetFromId(Core::Id id);
@@ -147,7 +147,7 @@ public:
private:
bool canHandle(ProjectExplorer::Target *parent) const;
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id);
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id);
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map);
};

8
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -70,7 +70,7 @@ MakeStep::MakeStep(BuildStepList *bsl) :
ctor();
}
MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) :
AbstractProcessStep(bsl, id), m_clean(false)
{
ctor();
@@ -452,14 +452,14 @@ MakeStepFactory::~MakeStepFactory()
{
}
bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool MakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
if (parent->target()->project()->id() == Constants::CMAKEPROJECT_ID)
return id == MS_ID;
return false;
}
BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *MakeStepFactory::create(BuildStepList *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;
@@ -506,7 +506,7 @@ QList<Core::Id> MakeStepFactory::availableCreationIds(ProjectExplorer::BuildStep
return QList<Core::Id>();
}
QString MakeStepFactory::displayNameForId(const Core::Id id) const
QString MakeStepFactory::displayNameForId(Core::Id id) const
{
if (id == MS_ID)
return tr("Make", "Display name for CMakeProjectManager::MakeStep id.");

8
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -95,7 +95,7 @@ protected:
void processFinished(int exitCode, QProcess::ExitStatus status);
MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map);
@@ -145,15 +145,15 @@ public:
explicit MakeStepFactory(QObject *parent = 0);
virtual ~MakeStepFactory();
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
};
} // namespace Internal

8
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -117,13 +117,13 @@ using namespace Core::Internal;
*/
/*!
\fn QAction *ActionContainer::insertLocation(const Id &group) const
\fn QAction *ActionContainer::insertLocation(Id group) const
Returns an action representing the \a group,
that could be used with \c{QWidget::insertAction}.
*/
/*!
\fn void ActionContainer::appendGroup(const Id &group)
\fn void ActionContainer::appendGroup(Id group)
Adds a group with the given \a identifier to the action container. Using groups
you can segment your action container into logical parts and add actions and
menus directly to these parts.
@@ -132,7 +132,7 @@ using namespace Core::Internal;
*/
/*!
\fn void ActionContainer::addAction(Command *action, const Id &group = Id())
\fn void ActionContainer::addAction(Command *action, Id group = Id())
Add the \a action as a menu item to this action container. The action is added as the
last item of the specified \a group.
\sa appendGroup()
@@ -140,7 +140,7 @@ using namespace Core::Internal;
*/
/*!
\fn void ActionContainer::addMenu(ActionContainer *menu, const Id &group = Id())
\fn void ActionContainer::addMenu(ActionContainer *menu, Id group = Id())
Add the \a menu as a submenu to this action container. The menu is added as the
last item of the specified \a group.
\sa appendGroup()

2
src/plugins/coreplugin/actionmanager/actioncontainer_p.h
View File

@@ -40,7 +40,7 @@ namespace Internal {
struct Group
{
Group(const Id &id) : id(id) {}
Group(Id id) : id(id) {}
Id id;
QList<QObject *> items; // Command * or ActionContainer *
};

2
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -1133,7 +1133,7 @@ void DocumentManager::checkForReload()
\a editorId defaults to the empty id, which lets \QC figure out
the best editor itself.
*/
void DocumentManager::addToRecentFiles(const QString &fileName, const Id &editorId)
void DocumentManager::addToRecentFiles(const QString &fileName, Id editorId)
{
if (fileName.isEmpty())
return;

2
src/plugins/coreplugin/documentmanager.h
View File

@@ -74,7 +74,7 @@ public:
static void unexpectFileChange(const QString &fileName);
// recent files
static void addToRecentFiles(const QString &fileName, const Id &editorId = Id());
static void addToRecentFiles(const QString &fileName, Id editorId = Id());
Q_SLOT void clearRecentFiles();
static QList<RecentFile> recentFiles();

2
src/plugins/coreplugin/editormanager/documentmodel.cpp
View File

@@ -175,7 +175,7 @@ void DocumentModel::addEditor(IEditor *editor, bool *isNewDocument)
}
}
void DocumentModel::addRestoredDocument(const QString &fileName, const QString &displayName, const Id &id)
void DocumentModel::addRestoredDocument(const QString &fileName, const QString &displayName, Id id)
{
Entry *entry = new Entry;
entry->m_fileName = fileName;

2
src/plugins/coreplugin/editormanager/documentmodel.h
View File

@@ -83,7 +83,7 @@ public:
// editor manager related functions, nobody else should call it
static void addEditor(IEditor *editor, bool *isNewDocument);
static void addRestoredDocument(const QString &fileName, const QString &displayName, const Id &id);
static void addRestoredDocument(const QString &fileName, const QString &displayName, Id id);
static Entry *firstRestoredEntry();
static void removeEditor(IEditor *editor, bool *lastOneForDocument);
static void removeDocument(const QString &fileName);

14
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1393,7 +1393,7 @@ EditorManager::ExternalEditorList
/* For something that has a 'QString id' (IEditorFactory
* or IExternalEditor), find the one matching a id. */
template <class EditorFactoryLike>
EditorFactoryLike *findById(const Core::Id &id)
EditorFactoryLike *findById(Core::Id id)
{
return ExtensionSystem::PluginManager::getObject<EditorFactoryLike>(
[&id](EditorFactoryLike *efl) {
@@ -1401,7 +1401,7 @@ EditorFactoryLike *findById(const Core::Id &id)
});
}
IEditor *EditorManager::createEditor(const Id &editorId, const QString &fileName)
IEditor *EditorManager::createEditor(Id editorId, const QString &fileName)
{
if (debugEditorManager)
qDebug() << Q_FUNC_INFO << editorId.name() << fileName;
@@ -1503,7 +1503,7 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
return selectedId;
}
IEditor *EditorManager::openEditor(const QString &fileName, const Id &editorId,
IEditor *EditorManager::openEditor(const QString &fileName, Id editorId,
OpenEditorFlags flags, bool *newEditor)
{
if (flags & EditorManager::OpenInOtherSplit) {
@@ -1518,7 +1518,7 @@ IEditor *EditorManager::openEditor(const QString &fileName, const Id &editorId,
}
IEditor *EditorManager::openEditorAt(const QString &fileName, int line, int column,
const Id &editorId, OpenEditorFlags flags, bool *newEditor)
Id editorId, OpenEditorFlags flags, bool *newEditor)
{
m_instance->cutForwardNavigationHistory();
m_instance->addCurrentPositionToNavigationHistory();
@@ -1586,7 +1586,7 @@ bool EditorManager::isAutoSaveFile(const QString &fileName)
}
IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QString &fileName,
const Id &editorId, OpenEditorFlags flags, bool *newEditor)
Id editorId, OpenEditorFlags flags, bool *newEditor)
{
if (debugEditorManager)
qDebug() << Q_FUNC_INFO << fileName << editorId.name();
@@ -1654,7 +1654,7 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
return result;
}
bool EditorManager::openExternalEditor(const QString &fileName, const Core::Id &editorId)
bool EditorManager::openExternalEditor(const QString &fileName, Core::Id editorId)
{
IExternalEditor *ee = findById<IExternalEditor>(editorId);
if (!ee)
@@ -1676,7 +1676,7 @@ QStringList EditorManager::getOpenFileNames()
}
IEditor *EditorManager::openEditorWithContents(const Id &editorId,
IEditor *EditorManager::openEditorWithContents(Id editorId,
QString *titlePattern,
const QByteArray &contents,
OpenEditorFlags flags)

12
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -109,16 +109,16 @@ public:
Q_DECLARE_FLAGS(OpenEditorFlags, OpenEditorFlag)
static QString splitLineNumber(QString *fileName);
static IEditor *openEditor(const QString &fileName, const Id &editorId = Id(),
static IEditor *openEditor(const QString &fileName, Id editorId = Id(),
OpenEditorFlags flags = NoFlags, bool *newEditor = 0);
static IEditor *openEditorAt(const QString &fileName, int line, int column = 0,
const Id &editorId = Id(), OpenEditorFlags flags = NoFlags,
Id editorId = Id(), OpenEditorFlags flags = NoFlags,
bool *newEditor = 0);
static IEditor *openEditorWithContents(const Id &editorId, QString *titlePattern = 0,
static IEditor *openEditorWithContents(Id editorId, QString *titlePattern = 0,
const QByteArray &contents = QByteArray(),
OpenEditorFlags flags = NoFlags);
static bool openExternalEditor(const QString &fileName, const Id &editorId);
static bool openExternalEditor(const QString &fileName, Id editorId);
static QStringList getOpenFileNames();
static Id getOpenWithEditorId(const QString &fileName, bool *isExternalEditor = 0);
@@ -252,7 +252,7 @@ private:
~EditorManager();
static void init();
static IEditor *createEditor(const Id &id = Id(), const QString &fileName = QString());
static IEditor *createEditor(Id id = Id(), const QString &fileName = QString());
static void addEditor(IEditor *editor);
static void removeEditor(IEditor *editor);
@@ -265,7 +265,7 @@ private:
OpenEditorFlags flags = NoFlags);
static void activateView(Internal::EditorView *view);
static IEditor *openEditor(Internal::EditorView *view, const QString &fileName,
const Id &id = Id(), OpenEditorFlags flags = NoFlags, bool *newEditor = 0);
Id id = Id(), OpenEditorFlags flags = NoFlags, bool *newEditor = 0);
static int visibleDocumentsCount();
static void setCurrentEditor(IEditor *editor, bool ignoreNavigationHistory = false);

2
src/plugins/coreplugin/generatedfile.cpp
View File

@@ -141,7 +141,7 @@ Id GeneratedFile::editorId() const
return m_d->editorId;
}
void GeneratedFile::setEditorId(const Id &id)
void GeneratedFile::setEditorId(Id id)
{
m_d->editorId = id;
}

2
src/plugins/coreplugin/generatedfile.h
View File

@@ -77,7 +77,7 @@ public:
// Id of editor to open the file with
Id editorId() const;
void setEditorId(const Id &id);
void setEditorId(Id id);
bool write(QString *errorMessage) const;

2
src/plugins/coreplugin/id.cpp
View File

@@ -351,7 +351,7 @@ QString Id::suffixAfter(Id baseId) const
QT_BEGIN_NAMESPACE
QDataStream &operator<<(QDataStream &ds, const Core::Id &id)
QDataStream &operator<<(QDataStream &ds, Core::Id id)
{
return ds << id.name();
}

4
src/plugins/coreplugin/id.h
View File

@@ -81,7 +81,7 @@ private:
int m_id;
};
inline uint qHash(const Id &id) { return id.uniqueIdentifier(); }
inline uint qHash(Id id) { return id.uniqueIdentifier(); }
} // namespace Core
@@ -89,7 +89,7 @@ Q_DECLARE_METATYPE(Core::Id)
Q_DECLARE_METATYPE(QList<Core::Id>)
QT_BEGIN_NAMESPACE
QDataStream &operator<<(QDataStream &ds, const Core::Id &id);
QDataStream &operator<<(QDataStream &ds, Core::Id id);
QDataStream &operator>>(QDataStream &ds, Core::Id &id);
QT_END_NAMESPACE

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -260,7 +260,7 @@ void NavigationWidget::activateSubWidget()
activateSubWidget(id);
}
void NavigationWidget::activateSubWidget(const Id &factoryId)
void NavigationWidget::activateSubWidget(Id factoryId)
{
setShown(true);
foreach (Internal::NavigationSubWidget *subWidget, d->m_subWidgets) {
@@ -413,7 +413,7 @@ void NavigationWidget::setSuppressed(bool b)
NavigationWidgetPlaceHolder::m_current->setVisible(d->m_shown && !d->m_suppressed);
}
int NavigationWidget::factoryIndex(const Id &id)
int NavigationWidget::factoryIndex(Id id)
{
for (int row = 0; row < d->m_factoryModel->rowCount(); ++row) {
if (d->m_factoryModel->data(d->m_factoryModel->index(row, 0), FactoryIdRole).value<Core::Id>() == id)

4
src/plugins/coreplugin/navigationwidget.h
View File

@@ -87,7 +87,7 @@ public:
void saveSettings(QSettings *settings);
void restoreSettings(QSettings *settings);
void activateSubWidget(const Id &factoryId);
void activateSubWidget(Id factoryId);
void closeSubWidgets();
bool isShown() const;
@@ -117,7 +117,7 @@ private slots:
private:
void updateToggleText();
Internal::NavigationSubWidget *insertSubItem(int position, int index);
int factoryIndex(const Id &id);
int factoryIndex(Id id);
NavigationWidgetPrivate *d;
};

2
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -763,7 +763,7 @@ void ProgressManager::setApplicationLabel(const QString &text)
m_instance->doSetApplicationLabel(text);
}
void ProgressManager::cancelTasks(const Id type)
void ProgressManager::cancelTasks(Id type)
{
if (m_instance)
m_instance->doCancelTasks(type);

2
src/plugins/coreplugin/progressmanager/progressmanager.h
View File

@@ -60,7 +60,7 @@ public:
static void setApplicationLabel(const QString &text);
public slots:
static void cancelTasks(const Core::Id type);
static void cancelTasks(Id type);
signals:
void taskStarted(Core::Id type);

2
src/plugins/cppeditor/cppquickfixassistant.cpp
View File

@@ -51,7 +51,7 @@ bool CppQuickFixAssistProvider::isAsynchronous() const
return false;
}
bool CppQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const
bool CppQuickFixAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == CppEditor::Constants::CPPEDITOR_ID;
}

2
src/plugins/cppeditor/cppquickfixassistant.h
View File

@@ -89,7 +89,7 @@ class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{
public:
bool isAsynchronous() const QTC_OVERRIDE;
bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;

2
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -214,7 +214,7 @@ bool VirtualFunctionAssistProvider::isAsynchronous() const
return true;
}
bool VirtualFunctionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool VirtualFunctionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == CppEditor::Constants::CPPEDITOR_ID;
}

2
src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
View File

@@ -65,7 +65,7 @@ public:
void clearParams() { m_params = Parameters(); }
bool isAsynchronous() const QTC_OVERRIDE;
bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
private:

2
src/plugins/cpptools/cppcompletionassistprovider.cpp
View File

@@ -41,7 +41,7 @@ using namespace CppTools;
// ---------------------------
// CppCompletionAssistProvider
// ---------------------------
bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool CppCompletionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == CppEditor::Constants::CPPEDITOR_ID;
}

2
src/plugins/cpptools/cppcompletionassistprovider.h
View File

@@ -55,7 +55,7 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT
public:
bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
int activationCharSequenceLength() const QTC_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;

2
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -526,7 +526,7 @@ Kit *AttachToQmlPortDialog::kit() const
return d->kitChooser->currentKit();
}
void AttachToQmlPortDialog::setKitId(const Id &id)
void AttachToQmlPortDialog::setKitId(Id id)
{
d->kitChooser->setCurrentKitId(id);
}

2
src/plugins/debugger/debuggerdialogs.h
View File

@@ -108,7 +108,7 @@ public:
void setPort(const int port);
ProjectExplorer::Kit *kit() const;
void setKitId(const Core::Id &id);
void setKitId(Core::Id id);
private:
AttachToQmlPortDialogPrivate *d;

2
src/plugins/debugger/loadcoredialog.cpp
View File

@@ -396,7 +396,7 @@ QString AttachCoreDialog::remoteCoreFile() const
return d->remoteCoreFileName->text();
}
void AttachCoreDialog::setKitId(const Core::Id &id)
void AttachCoreDialog::setKitId(Core::Id id)
{
d->kitChooser->setCurrentKitId(id);
}

2
src/plugins/debugger/loadcoredialog.h
View File

@@ -64,7 +64,7 @@ public:
void setLocalCoreFile(const QString &core);
void setRemoteCoreFile(const QString &core);
void setOverrideStartScript(const QString &scriptName);
void setKitId(const Core::Id &id);
void setKitId(Core::Id id);
void setForceLocalCoreFile(bool on);
private slots:

6
src/plugins/designer/formeditorw.cpp
View File

@@ -200,7 +200,7 @@ FormEditorW::~FormEditorW()
// Add an actioon to toggle the view state of a dock window
void FormEditorW::addDockViewAction(ActionContainer *viewMenu,
int index, const Context &context,
const QString &title, const Id &id)
const QString &title, Id id)
{
if (const QDockWidget *dw = m_editorWidget->designerDockWidgets()[index]) {
QAction *action = dw->toggleViewAction();
@@ -635,7 +635,7 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
const Context &context,
ActionContainer *medit,
const QString &actionName,
const Id &id,
Id id,
int toolNumber,
const QString &iconName,
const QString &keySequence)
@@ -656,7 +656,7 @@ QAction *FormEditorW::createEditModeAction(QActionGroup *ag,
}
// Create a tool action
Command *FormEditorW::addToolAction(QAction *a, const Context &context, const Id &id,
Command *FormEditorW::addToolAction(QAction *a, const Context &context, Id id,
ActionContainer *c1, const QString &keySequence,
Core::Id groupId)
{

6
src/plugins/designer/formeditorw.h
View File

@@ -143,7 +143,7 @@ private:
void addDockViewAction(Core::ActionContainer *viewMenu,
int index,
const Core::Context &context,
const QString &title, const Core::Id &id);
const QString &title, Core::Id id);
Core::ActionContainer *createPreviewStyleMenu(QActionGroup *actionGroup);
@@ -153,12 +153,12 @@ private:
const Core::Context &context,
Core::ActionContainer *medit,
const QString &actionName,
const Core::Id &id,
Core::Id id,
int toolNumber,
const QString &iconName = QString(),
const QString &keySequence = QString());
Core::Command *addToolAction(QAction *a,
const Core::Context &context, const Core::Id &id,
const Core::Context &context, Core::Id id,
Core::ActionContainer *c1, const QString &keySequence = QString(),
Core::Id groupId = Core::Id());
QToolBar *createEditorToolBar() const;

2
src/plugins/emacskeys/emacskeysplugin.cpp
View File

@@ -328,7 +328,7 @@ void EmacsKeysPlugin::insertLineAndIndent()
m_currentState->endOwnAction(KeysActionOther);
}
QAction *EmacsKeysPlugin::registerAction(const Core::Id &id, const char *slot,
QAction *EmacsKeysPlugin::registerAction(Core::Id id, const char *slot,
const QString &title)
{
QAction *result = new QAction(title, this);

2
src/plugins/emacskeys/emacskeysplugin.h
View File

@@ -94,7 +94,7 @@ private slots:
void scrollHalfUp(); // M-v
private:
QAction *registerAction(const Core::Id &id, const char *slot,
QAction *registerAction(Core::Id id, const char *slot,
const QString &title);
void genericGoto(QTextCursor::MoveOperation op, bool abortAssist = true);
void genericVScroll(int direction);

10
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -831,7 +831,7 @@ void FakeVimUserCommandsPage::apply()
class FakeVimCompletionAssistProvider : public CompletionAssistProvider
{
public:
bool supportsEditor(const Id &) const
bool supportsEditor(Id ) const
{
return false;
}
@@ -1058,8 +1058,8 @@ private:
FakeVimUserCommandsPage *m_fakeVimUserCommandsPage;
QHash<IEditor *, FakeVimHandler *> m_editorToHandler;
void triggerAction(const Id &id);
void setActionChecked(const Id &id, bool check);
void triggerAction(Id id);
void setActionChecked(Id id, bool check);
typedef int (*DistFunction)(const QRect &cursor, const QRect &other);
void moveSomewhere(DistFunction f, int count);
@@ -1386,7 +1386,7 @@ void FakeVimPluginPrivate::showSettingsDialog()
ICore::showOptionsDialog(SETTINGS_CATEGORY, SETTINGS_ID);
}
void FakeVimPluginPrivate::triggerAction(const Id &id)
void FakeVimPluginPrivate::triggerAction(Id id)
{
Core::Command *cmd = ActionManager::command(id);
QTC_ASSERT(cmd, qDebug() << "UNKNOWN CODE: " << id.name(); return);
@@ -1395,7 +1395,7 @@ void FakeVimPluginPrivate::triggerAction(const Id &id)
action->trigger();
}
void FakeVimPluginPrivate::setActionChecked(const Id &id, bool check)
void FakeVimPluginPrivate::setActionChecked(Id id, bool check)
{
Core::Command *cmd = ActionManager::command(id);
QTC_ASSERT(cmd, return);

2
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -58,7 +58,7 @@ GenericBuildConfiguration::GenericBuildConfiguration(Target *parent)
{
}
GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, const Core::Id id)
GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, Core::Id id)
: BuildConfiguration(parent, id)
{
}

2
src/plugins/genericprojectmanager/genericbuildconfiguration.h
View File

@@ -59,7 +59,7 @@ public:
protected:
GenericBuildConfiguration(ProjectExplorer::Target *parent, GenericBuildConfiguration *source);
GenericBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id);
GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id);
friend class GenericBuildSettingsWidget;
};

8
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -71,7 +71,7 @@ public:
protected:
GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs);
GenericMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
GenericMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool fromMap(const QVariantMap &map);
private:
@@ -113,8 +113,8 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit GenericMakeStepFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) const;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
@@ -124,7 +124,7 @@ public:
const QVariantMap &map);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const Core::Id id) const;
QString displayNameForId(Core::Id id) const;
};
} // namespace Internal

2
src/plugins/git/gitclient.cpp
View File

@@ -900,7 +900,7 @@ void GitClient::stage(const QString &patch, bool revert)
* existing instance and to reuse it (in case, say, 'git diff foo' is
* already open). */
VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
const Core::Id &id,
Core::Id id,
QString title,
const QString &source, // Source file or directory
CodecType codecType,

2
src/plugins/git/gitclient.h
View File

@@ -360,7 +360,7 @@ private:
const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,
VcsBase::VcsBaseEditorWidget *createVcsEditor(Core::Id kind,
QString title,
const QString &source,
CodecType codecType,

12
src/plugins/git/gitplugin.cpp
View File

@@ -180,7 +180,7 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = {
ParameterActionCommandPair
GitPlugin::createParameterAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context,
Core::Id id, const Core::Context &context,
bool addToLocator)
{
Utils::ParameterAction *action = new Utils::ParameterAction(defaultText, parameterText,
@@ -198,7 +198,7 @@ ParameterActionCommandPair
ParameterActionCommandPair
GitPlugin::createFileAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator,
Core::Id id, const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
const ParameterActionCommandPair rc = createParameterAction(ac, defaultText, parameterText, id, context, addToLocator);
@@ -211,7 +211,7 @@ ParameterActionCommandPair
ParameterActionCommandPair
GitPlugin::createProjectAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator,
Core::Id id, const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
const ParameterActionCommandPair rc = createParameterAction(ac, defaultText, parameterText, id, context, addToLocator);
@@ -223,7 +223,7 @@ ParameterActionCommandPair
// Create an action to act on the repository
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context, bool addToLocator)
{
QAction *action = new QAction(text, this);
@@ -239,7 +239,7 @@ ActionCommandPair
// Create an action to act on the repository with slot
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context, bool addToLocator,
const char *pluginSlot)
{
@@ -253,7 +253,7 @@ ActionCommandPair
// taking the directory. Store the member function as data on the action.
ActionCommandPair
GitPlugin::createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context, bool addToLocator,
GitClientMemberFunc func)
{

14
src/plugins/git/gitplugin.h
View File

@@ -158,35 +158,35 @@ private:
inline ParameterActionCommandPair
createParameterAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator);
Core::Id id, const Core::Context &context, bool addToLocator);
inline ParameterActionCommandPair
createFileAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator,
Core::Id id, const Core::Context &context, bool addToLocator,
const char *pluginSlot);
inline ParameterActionCommandPair
createProjectAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator);
Core::Id id, const Core::Context &context, bool addToLocator);
inline ParameterActionCommandPair
createProjectAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
const Core::Id &id, const Core::Context &context, bool addToLocator,
Core::Id id, const Core::Context &context, bool addToLocator,
const char *pluginSlot);
inline ActionCommandPair createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context, bool addToLocator);
inline ActionCommandPair createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context,
bool addToLocator, const char *pluginSlot);
inline ActionCommandPair createRepositoryAction(Core::ActionContainer *ac,
const QString &text, const Core::Id &id,
const QString &text, Core::Id id,
const Core::Context &context,
bool addToLocator, GitClientMemberFunc);

2
src/plugins/glsleditor/glslcompletionassist.cpp
View File

@@ -120,7 +120,7 @@ bool checkStartOfIdentifier(const QString &word)
// ----------------------------
// GLSLCompletionAssistProvider
// ----------------------------
bool GLSLCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
bool GLSLCompletionAssistProvider::supportsEditor(Core::Id editorId) const
{
return editorId == Constants::C_GLSLEDITOR_ID;
}

2
src/plugins/glsleditor/glslcompletionassist.h
View File

@@ -56,7 +56,7 @@ class GLSLCompletionAssistProvider : public TextEditor::CompletionAssistProvider
Q_OBJECT
public:
bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
int activationCharSequenceLength() const QTC_OVERRIDE;

2
src/plugins/imageviewer/imagevieweractionhandler.cpp
View File

@@ -119,7 +119,7 @@ void ImageViewerActionHandler::createActions()
and keyboard shortcut \a key, and registers it in the action manager.
*/
void ImageViewerActionHandler::registerNewAction(int actionId, const Core::Id &id,
void ImageViewerActionHandler::registerNewAction(int actionId, Core::Id id,
const QString &title, const QKeySequence &key)
{
Core::Context context(Constants::IMAGEVIEWER_ID);

2
src/plugins/imageviewer/imagevieweractionhandler.h
View File

@@ -56,7 +56,7 @@ public slots:
protected:
void registerNewAction(int actionId, const Core::Id &id, const QString &title,
void registerNewAction(int actionId, Core::Id id, const QString &title,
const QKeySequence &key);
private:

8
src/plugins/ios/iosbuildstep.h
View File

@@ -72,7 +72,7 @@ public:
QVariantMap toMap() const QTC_OVERRIDE;
protected:
IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
IosBuildStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
private:
@@ -114,8 +114,8 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosBuildStepFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id) QTC_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
@@ -125,7 +125,7 @@ public:
const QVariantMap &map) QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
};
} // namespace Internal

6
src/plugins/ios/iosdeployconfiguration.cpp
View File

@@ -63,12 +63,12 @@ IosDeployConfigurationFactory::IosDeployConfigurationFactory(QObject *parent)
setObjectName(QLatin1String("IosDeployConfigurationFactory"));
}
bool IosDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool IosDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
DeployConfiguration *IosDeployConfigurationFactory::create(Target *parent, const Core::Id id)
DeployConfiguration *IosDeployConfigurationFactory::create(Target *parent, Core::Id id)
{
IosDeployConfiguration *dc = new IosDeployConfiguration(parent, id);
dc->stepList()->insertStep(0, new IosDeployStep(dc->stepList()));
@@ -120,7 +120,7 @@ QList<Core::Id> IosDeployConfigurationFactory::availableCreationIds(Target *pare
return ids;
}
QString IosDeployConfigurationFactory::displayNameForId(const Core::Id id) const
QString IosDeployConfigurationFactory::displayNameForId(Core::Id id) const
{
if (id.name().startsWith(IOS_DC_PREFIX))
return tr("Deploy on iOS");

6
src/plugins/ios/iosdeployconfiguration.h
View File

@@ -59,8 +59,8 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
public:
explicit IosDeployConfigurationFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id) QTC_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
const QVariantMap &map) QTC_OVERRIDE;
@@ -71,7 +71,7 @@ public:
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
// used to translate the ids to names to display to the user
QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
private:
bool canHandle(ProjectExplorer::Target *parent) const QTC_OVERRIDE;

6
src/plugins/ios/iosdeploystepfactory.cpp
View File

@@ -61,19 +61,19 @@ QList<Core::Id> IosDeployStepFactory::availableCreationIds(BuildStepList *parent
return QList<Core::Id>() << IosDeployStep::Id;
}
QString IosDeployStepFactory::displayNameForId(const Core::Id id) const
QString IosDeployStepFactory::displayNameForId(Core::Id id) const
{
if (id == IosDeployStep::Id)
return tr("Deploy to iOS device or emulator");
return QString();
}
bool IosDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
bool IosDeployStepFactory::canCreate(BuildStepList *parent, Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
BuildStep *IosDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
BuildStep *IosDeployStepFactory::create(BuildStepList *parent, Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
Q_UNUSED(id);

4
src/plugins/ios/iosdeploystepfactory.h
View File

@@ -42,11 +42,11 @@ public:
explicit IosDeployStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE;
QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id) QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE;

10
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -66,7 +66,7 @@ public:
QVariantMap toMap() const QTC_OVERRIDE;
protected:
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
virtual bool completeSetup();
virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
@@ -107,7 +107,7 @@ class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosPresetBuildStepFactory(QObject *parent = 0);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id) QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
@@ -128,16 +128,16 @@ class IosDsymBuildStep : public IosPresetBuildStep
protected:
QStringList defaultCleanCmdList() const QTC_OVERRIDE;
QStringList defaultCmdList() const QTC_OVERRIDE;
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
};
class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
{
Q_OBJECT
public:
bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const QTC_OVERRIDE;
};

8
src/plugins/ios/iosrunfactories.cpp
View File

@@ -57,7 +57,7 @@ namespace Internal {
#define IOS_PREFIX "Qt4ProjectManager.IosRunConfiguration"
#define IOS_RC_ID_PREFIX IOS_PREFIX ":"
static QString pathFromId(const Core::Id id)
static QString pathFromId(Core::Id id)
{
QString pathStr = id.toString();
const QString prefix = QLatin1String(IOS_RC_ID_PREFIX);
@@ -72,7 +72,7 @@ IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent)
setObjectName(QLatin1String("IosRunConfigurationFactory"));
}
bool IosRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool IosRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
if (!canHandle(parent))
return false;
@@ -108,7 +108,7 @@ QList<Core::Id> IosRunConfigurationFactory::availableCreationIds(Target *parent,
return QmakeProject::idsForNodes(baseId, nodes);
}
QString IosRunConfigurationFactory::displayNameForId(const Core::Id id) const
QString IosRunConfigurationFactory::displayNameForId(Core::Id id) const
{
return QFileInfo(pathFromId(id)).completeBaseName();
}
@@ -139,7 +139,7 @@ QList<RunConfiguration *> IosRunConfigurationFactory::runConfigurationsForNode(T
return result;
}
RunConfiguration *IosRunConfigurationFactory::doCreate(Target *parent, const Core::Id id)
RunConfiguration *IosRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
{
return new IosRunConfiguration(parent, id, pathFromId(id));
}

4
src/plugins/ios/iosrunfactories.h
View File

@@ -50,10 +50,10 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura
public:
explicit IosRunConfigurationFactory(QObject *parent = 0);
QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;

2
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -86,7 +86,7 @@ using namespace ProjectExplorer;
Should be used in init().
*/
AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, const Core::Id id) :
AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, Core::Id id) :
BuildStep(bsl, id), m_timer(0), m_futureInterface(0),
m_ignoreReturnValue(false), m_process(0),
m_outputParserChain(0), m_skipFlush(false)

2
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -69,7 +69,7 @@ public:
void emitFaultyConfigurationMessage();
protected:
AbstractProcessStep(BuildStepList *bsl, const Core::Id id);
AbstractProcessStep(BuildStepList *bsl, Core::Id id);
AbstractProcessStep(BuildStepList *bsl, AbstractProcessStep *bs);
virtual void processStarted();

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -79,7 +79,7 @@ bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
}
} // namespace Internal
BuildConfiguration::BuildConfiguration(Target *target, const Core::Id id) :
BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) :
ProjectConfiguration(target, id),
m_clearSystemEnvironment(false),
m_macroExpander(0)

2
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -97,7 +97,7 @@ signals:
void enabledChanged();
protected:
BuildConfiguration(Target *target, const Core::Id id);
BuildConfiguration(Target *target, Core::Id id);
BuildConfiguration(Target *target, BuildConfiguration *source);
virtual void setBuildDirectory(const Utils::FileName &dir);

2
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -113,7 +113,7 @@ static const char buildStepEnabledKey[] = "ProjectExplorer.BuildStep.Enabled";
using namespace ProjectExplorer;
BuildStep::BuildStep(BuildStepList *bsl, const Core::Id id) :
BuildStep::BuildStep(BuildStepList *bsl, Core::Id id) :
ProjectConfiguration(bsl, id), m_enabled(true)
{
Q_ASSERT(bsl);

8
src/plugins/projectexplorer/buildstep.h
View File

@@ -51,7 +51,7 @@ class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration
Q_OBJECT
protected:
BuildStep(BuildStepList *bsl, const Core::Id id);
BuildStep(BuildStepList *bsl, Core::Id id);
BuildStep(BuildStepList *bsl, BuildStep *bs);
public:
@@ -107,10 +107,10 @@ public:
// used to show the list of possible additons to a target, returns a list of types
virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const = 0;
// used to translate the types to names to display to the user
virtual QString displayNameForId(const Core::Id id) const = 0;
virtual QString displayNameForId(Core::Id id) const = 0;
virtual bool canCreate(BuildStepList *parent, const Core::Id id) const = 0;
virtual BuildStep *create(BuildStepList *parent, const Core::Id id) = 0;
virtual bool canCreate(BuildStepList *parent, Core::Id id) const = 0;
virtual BuildStep *create(BuildStepList *parent, Core::Id id) = 0;
// used to recreate the runConfigurations when restoring settings
virtual bool canRestore(BuildStepList *parent, const QVariantMap &map) const = 0;
virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map) = 0;

4
src/plugins/projectexplorer/buildsteplist.cpp
View File

@@ -63,7 +63,7 @@ const char STEPS_PREFIX[] = "ProjectExplorer.BuildStepList.Step.";
} // namespace
BuildStepList::BuildStepList(QObject *parent, const Core::Id id) :
BuildStepList::BuildStepList(QObject *parent, Core::Id id) :
ProjectConfiguration(parent, id),
m_isNull(false)
{
@@ -119,7 +119,7 @@ bool BuildStepList::isEmpty() const
return m_steps.isEmpty();
}
bool BuildStepList::contains(const Core::Id id) const
bool BuildStepList::contains(Core::Id id) const
{
foreach (BuildStep *bs, steps()) {
if (bs->id() == id)

4
src/plugins/projectexplorer/buildsteplist.h
View File

@@ -46,7 +46,7 @@ class PROJECTEXPLORER_EXPORT BuildStepList : public ProjectConfiguration
Q_OBJECT
public:
BuildStepList(QObject *parent, const Core::Id id);
BuildStepList(QObject *parent, Core::Id id);
BuildStepList(QObject *parent, BuildStepList *source);
BuildStepList(QObject *parent, const QVariantMap &data);
virtual ~BuildStepList();
@@ -55,7 +55,7 @@ public:
bool isNull() const;
int count() const;
bool isEmpty() const;
bool contains(const Core::Id id) const;
bool contains(Core::Id id) const;
void insertStep(int position, BuildStep *step);
void appendStep(BuildStep *step) { insertStep(count(), step); }

10
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -42,7 +42,7 @@ using namespace ProjectExplorer;
const char BUILD_STEP_LIST_COUNT[] = "ProjectExplorer.BuildConfiguration.BuildStepListCount";
const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildStepList.";
DeployConfiguration::DeployConfiguration(Target *target, const Core::Id id) :
DeployConfiguration::DeployConfiguration(Target *target, Core::Id id) :
ProjectConfiguration(target, id),
m_stepList(0)
{
@@ -144,7 +144,7 @@ void DeployConfiguration::cloneSteps(DeployConfiguration *source)
///
// DefaultDeployConfiguration
///
DefaultDeployConfiguration::DefaultDeployConfiguration(Target *target, const Core::Id id)
DefaultDeployConfiguration::DefaultDeployConfiguration(Target *target, Core::Id id)
: DeployConfiguration(target, id)
{
@@ -174,7 +174,7 @@ QList<Core::Id> DeployConfigurationFactory::availableCreationIds(Target *parent)
return QList<Core::Id>() << Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
}
QString DeployConfigurationFactory::displayNameForId(const Core::Id id) const
QString DeployConfigurationFactory::displayNameForId(Core::Id id) const
{
if (id == Constants::DEFAULT_DEPLOYCONFIGURATION_ID)
//: Display name of the default deploy configuration
@@ -182,14 +182,14 @@ QString DeployConfigurationFactory::displayNameForId(const Core::Id id) const
return QString();
}
bool DeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
bool DeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
{
if (!canHandle(parent))
return false;
return id == Constants::DEFAULT_DEPLOYCONFIGURATION_ID;
}
DeployConfiguration *DeployConfigurationFactory::create(Target *parent, const Core::Id id)
DeployConfiguration *DeployConfigurationFactory::create(Target *parent, Core::Id id)
{
if (!canCreate(parent, id))
return 0;

10
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -69,7 +69,7 @@ signals:
void enabledChanged();
protected:
DeployConfiguration(Target *target, const Core::Id id);
DeployConfiguration(Target *target, Core::Id id);
DeployConfiguration(Target *target, DeployConfiguration *source);
void cloneSteps(DeployConfiguration *source);
@@ -83,7 +83,7 @@ class PROJECTEXPLORER_EXPORT DefaultDeployConfiguration : public DeployConfigura
Q_OBJECT
friend class DeployConfigurationFactory; // for the ctors
protected:
DefaultDeployConfiguration(Target *target, const Core::Id id);
DefaultDeployConfiguration(Target *target, Core::Id id);
DefaultDeployConfiguration(Target *target, DeployConfiguration *source);
};
@@ -99,10 +99,10 @@ public:
// used to show the list of possible additons to a target, returns a list of types
virtual QList<Core::Id> availableCreationIds(Target *parent) const;
// used to translate the types to names to display to the user
virtual QString displayNameForId(const Core::Id id) const;
virtual QString displayNameForId(Core::Id id) const;
virtual bool canCreate(Target *parent, const Core::Id id) const;
virtual DeployConfiguration *create(Target *parent, const Core::Id id);
virtual bool canCreate(Target *parent, Core::Id id) const;
virtual DeployConfiguration *create(Target *parent, Core::Id id);
// used to recreate the runConfigurations when restoring settings
virtual bool canRestore(Target *parent, const QVariantMap &map) const;
virtual DeployConfiguration *restore(Target *parent, const QVariantMap &map);

2
src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
View File

@@ -68,7 +68,7 @@ void DeviceManagerModel::setFilter(const QList<Core::Id> &filter)
handleDeviceListChanged();
}
void DeviceManagerModel::setTypeFilter(const Core::Id &type)
void DeviceManagerModel::setTypeFilter(Core::Id type)
{
if (d->typeToKeep == type)
return;

2
src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
View File

@@ -47,7 +47,7 @@ public:
~DeviceManagerModel();
void setFilter(const QList<Core::Id> &filter);
void setTypeFilter(const Core::Id &type);
void setTypeFilter(Core::Id type);
IDevice::ConstPtr device(int pos) const;
Core::Id deviceId(int pos) const;

2
src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
View File

@@ -300,7 +300,7 @@ void DeviceSettingsWidget::currentDeviceChanged(int index)
m_ui->buttonsLayout->insertWidget(m_ui->buttonsLayout->count() - 1, button);
}
foreach (const Core::Id actionId, device->actionIds()) {
foreach (Core::Id actionId, device->actionIds()) {
QPushButton * const button = new QPushButton(device->displayNameForActionId(actionId));
m_additionalActionButtons << button;
connect(button, SIGNAL(clicked()), m_additionalActionsMapper, SLOT(map()));

4
src/plugins/projectexplorer/kit.cpp
View File

@@ -459,12 +459,12 @@ QVariantMap Kit::toMap() const
data.insert(QLatin1String(ICON_KEY), d->m_iconPath.toString());
QStringList mutableInfo;
foreach (const Core::Id &id, d->m_mutable)
foreach (Core::Id id, d->m_mutable)
mutableInfo << id.toString();
data.insert(QLatin1String(MUTABLE_INFO_KEY), mutableInfo);
QStringList stickyInfo;
foreach (const Core::Id &id, d->m_sticky)
foreach (Core::Id id, d->m_sticky)
stickyInfo << id.toString();
data.insert(QLatin1String(STICKY_INFO_KEY), stickyInfo);

4
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -410,7 +410,7 @@ void DeviceKitInformation::setDevice(Kit *k, IDevice::ConstPtr dev)
setDeviceId(k, dev ? dev->id() : Core::Id());
}
void DeviceKitInformation::setDeviceId(Kit *k, const Core::Id id)
void DeviceKitInformation::setDeviceId(Kit *k, Core::Id id)
{
k->setValue(DeviceKitInformation::id(), id.toSetting());
}
@@ -432,7 +432,7 @@ void DeviceKitInformation::kitsWereLoaded()
this, SLOT(kitUpdated(ProjectExplorer::Kit*)));
}
void DeviceKitInformation::deviceUpdated(const Core::Id &id)
void DeviceKitInformation::deviceUpdated(Core::Id id)
{
foreach (Kit *k, KitManager::kits()) {
if (deviceId(k) == id)

6
src/plugins/projectexplorer/kitinformation.h
View File

@@ -162,7 +162,7 @@ public:
class PROJECTEXPLORER_EXPORT DeviceTypeMatcher : public KitMatcher
{
public:
DeviceTypeMatcher(const Core::Id t) : m_type(t)
DeviceTypeMatcher(Core::Id t) : m_type(t)
{ }
bool matches(const Kit *k) const
@@ -204,11 +204,11 @@ public:
static IDevice::ConstPtr device(const Kit *k);
static Core::Id deviceId(const Kit *k);
static void setDevice(Kit *k, IDevice::ConstPtr dev);
static void setDeviceId(Kit *k, const Core::Id dataId);
static void setDeviceId(Kit *k, Core::Id dataId);
private slots:
void kitsWereLoaded();
void deviceUpdated(const Core::Id &dataId);
void deviceUpdated(Core::Id dataId);
void devicesChanged();
void kitUpdated(ProjectExplorer::Kit *k);
};

Some files were not shown because too many files have changed in this diff Show More