diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-01 11:08:26 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-07-01 11:52:08 +0200 |
| commit | 93304df0381cbeabf4c8435aec0ad55fbc7f8fe7 (patch) | |
| tree | 7cbe348b1e3f88041b7e159aa335031e2c41bfc8 /src | |
| parent | 139449239c7cd63ab933d13e20b37cd717a45fe7 (diff) | |
| download | qt-creator-93304df0381cbeabf4c8435aec0ad55fbc7f8fe7.tar.gz | |
Always pass Core::Id by value.
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>
Diffstat (limited to 'src')
208 files changed, 472 insertions, 472 deletions
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp index 635ac2e10d..b58cd48c0b 100644 --- a/src/plugins/android/androiddeployconfiguration.cpp +++ b/src/plugins/android/androiddeployconfiguration.cpp @@ -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)) diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index 11c90d96d6..2d31fb2285 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -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; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 85e41fe8e7..c755cd515e 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -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); diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index 194dd256eb..0760429f46 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -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); diff --git a/src/plugins/android/androiddeploystepfactory.cpp b/src/plugins/android/androiddeploystepfactory.cpp index b0203235ee..b91c886e31 100644 --- a/src/plugins/android/androiddeploystepfactory.cpp +++ b/src/plugins/android/androiddeploystepfactory.cpp @@ -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); diff --git a/src/plugins/android/androiddeploystepfactory.h b/src/plugins/android/androiddeploystepfactory.h index 798f8e5e94..f8a25fb8fc 100644 --- a/src/plugins/android/androiddeploystepfactory.h +++ b/src/plugins/android/androiddeploystepfactory.h @@ -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); diff --git a/src/plugins/android/androidpackagecreationfactory.cpp b/src/plugins/android/androidpackagecreationfactory.cpp index a44274fc47..0eab6b29b6 100644 --- a/src/plugins/android/androidpackagecreationfactory.cpp +++ b/src/plugins/android/androidpackagecreationfactory.cpp @@ -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); diff --git a/src/plugins/android/androidpackagecreationfactory.h b/src/plugins/android/androidpackagecreationfactory.h index 3e86428dbd..6b3f47c770 100644 --- a/src/plugins/android/androidpackagecreationfactory.h +++ b/src/plugins/android/androidpackagecreationfactory.h @@ -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; diff --git a/src/plugins/android/androidpackageinstallationfactory.cpp b/src/plugins/android/androidpackageinstallationfactory.cpp index bc3db96617..791f9a7bea 100644 --- a/src/plugins/android/androidpackageinstallationfactory.cpp +++ b/src/plugins/android/androidpackageinstallationfactory.cpp @@ -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); diff --git a/src/plugins/android/androidpackageinstallationfactory.h b/src/plugins/android/androidpackageinstallationfactory.h index 758cfe1000..22918421b7 100644 --- a/src/plugins/android/androidpackageinstallationfactory.h +++ b/src/plugins/android/androidpackageinstallationfactory.h @@ -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; diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp index 0ac87f3f52..13e46e0a7e 100644 --- a/src/plugins/android/androidrunfactories.cpp +++ b/src/plugins/android/androidrunfactories.cpp @@ -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)); } diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index a2628114aa..06e87d37b5 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -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); }; diff --git a/src/plugins/android/javacompletionassistprovider.cpp b/src/plugins/android/javacompletionassistprovider.cpp index 142c999e90..7ceff0dc99 100644 --- a/src/plugins/android/javacompletionassistprovider.cpp +++ b/src/plugins/android/javacompletionassistprovider.cpp @@ -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; } diff --git a/src/plugins/android/javacompletionassistprovider.h b/src/plugins/android/javacompletionassistprovider.h index 92b68f389e..e592928fcf 100644 --- a/src/plugins/android/javacompletionassistprovider.h +++ b/src/plugins/android/javacompletionassistprovider.h @@ -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: diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index db11c97475..33a4e132f0 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -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(); diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index 333d3b961b..021a99bdf5 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/src/plugins/autotoolsprojectmanager/autogenstep.h @@ -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); diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 593f7eb3c3..f046b26b94 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -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(); diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 1a3eaaf3e0..c90384ad70 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h @@ -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); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 121f72e8ce..76acb72041 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -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) { } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h index 3bee5f7116..b0ef03decd 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h @@ -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; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index 7d83f36ffd..2f518632b5 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -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(); diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index e6845d8477..40ae1d0a12 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/src/plugins/autotoolsprojectmanager/configurestep.h @@ -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); diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 04a5888664..40fee97b98 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -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) { diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index 2fae1fff69..91b0db407b 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/src/plugins/autotoolsprojectmanager/makestep.h @@ -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); diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index 46129b43bd..883e156c2e 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -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(); diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h index 7469a1220d..c86b87dc0d 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.h +++ b/src/plugins/baremetal/baremetalrunconfiguration.h @@ -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; diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp index 3de3c607ed..53c537b96a 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp @@ -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)); diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.h b/src/plugins/baremetal/baremetalrunconfigurationfactory.h index 63f925f6cc..9913a8efa9 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.h +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.h @@ -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); }; diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp index 8da3cb82fd..62aa754e77 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp @@ -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; } diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h index d6614d5d9d..c6dfad1e72 100644 --- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h +++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h @@ -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: diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index feece04f65..436aa7f62f 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -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)); diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index 53d530362f..367dfc3f8e 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -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); }; diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index afd387cace..b81d8889a8 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -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."); diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index 0ded1ee158..bb3ca067fc 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -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 diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index a28e357292..92d8207aee 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -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() diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index 345bf818f3..f8f99a3464 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -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 * }; diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index fcf6a15be9..4a7a6e0f4b 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -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; diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index 3dafb60271..1fc72b24b7 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -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(); diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 932a1d72b6..c7894db8b9 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -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; diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h index c956890bf2..4845aef826 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.h +++ b/src/plugins/coreplugin/editormanager/documentmodel.h @@ -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); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 3b98fa3763..441efa5032 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -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) diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index 274badcd5c..27a408068b 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -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); diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp index 43adc068eb..088d485eea 100644 --- a/src/plugins/coreplugin/generatedfile.cpp +++ b/src/plugins/coreplugin/generatedfile.cpp @@ -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; } diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h index 1b751b6fc7..0e5464cfde 100644 --- a/src/plugins/coreplugin/generatedfile.h +++ b/src/plugins/coreplugin/generatedfile.h @@ -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; diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp index f67c108f9a..a607c9314f 100644 --- a/src/plugins/coreplugin/id.cpp +++ b/src/plugins/coreplugin/id.cpp @@ -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(); } diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h index d131d12173..2f5bc2ec2d 100644 --- a/src/plugins/coreplugin/id.h +++ b/src/plugins/coreplugin/id.h @@ -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 diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 7baa227001..ac7a0a34ff 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -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) diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index ac6ebf931a..aa352dde12 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -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; }; diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 10401ccb5a..6a496e5e5f 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -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); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 6894f43ea7..529a2847ab 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -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); diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp index 6e0c253f62..f656250d37 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.cpp +++ b/src/plugins/cppeditor/cppquickfixassistant.cpp @@ -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; } diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h index f7e097c319..daad9dc503 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.h +++ b/src/plugins/cppeditor/cppquickfixassistant.h @@ -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; diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index 5e3ffac4e7..ec76a966b4 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp @@ -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; } diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h index 2841799334..c07a2f71fa 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h @@ -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: diff --git a/src/plugins/cpptools/cppcompletionassistprovider.cpp b/src/plugins/cpptools/cppcompletionassistprovider.cpp index c6a5dacfe4..69c3b05709 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.cpp +++ b/src/plugins/cpptools/cppcompletionassistprovider.cpp @@ -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; } diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index aaf2cdde41..8873fd3518 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -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; diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index c8e4e175c5..e367e2891c 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -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); } diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index 3fe1cc1b51..12f09ac0c3 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -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; diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index 06682a16f9..30f33bcf4d 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -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); } diff --git a/src/plugins/debugger/loadcoredialog.h b/src/plugins/debugger/loadcoredialog.h index bdcfe73584..143f1d3d19 100644 --- a/src/plugins/debugger/loadcoredialog.h +++ b/src/plugins/debugger/loadcoredialog.h @@ -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: diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 80361c55d9..f91ae1cae5 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -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) { diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index c0cf95bf22..94bc2b1cb9 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -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; diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp index 8793fe8710..fa55ecbaac 100644 --- a/src/plugins/emacskeys/emacskeysplugin.cpp +++ b/src/plugins/emacskeys/emacskeysplugin.cpp @@ -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); diff --git a/src/plugins/emacskeys/emacskeysplugin.h b/src/plugins/emacskeys/emacskeysplugin.h index 716f70cf32..6eb8f2c963 100644 --- a/src/plugins/emacskeys/emacskeysplugin.h +++ b/src/plugins/emacskeys/emacskeysplugin.h @@ -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); diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 1440f17fc5..a9457a9a33 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -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); diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index f53f41aa74..6c920411bd 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -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) { } diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index 524a9eaa68..4af936defa 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -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; }; diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index 4e7b0e3e74..ce40e1ae5d 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -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 diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 699e1325b8..3d4aaf0372 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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, diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 1972852cb8..d2d24541d5 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -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, diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index d93c9ecd81..ce36dab836 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -180,7 +180,7 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = { ParameterActionCommandPair GitPlugin::createParameterAction(Core::ActionContainer *ac, const QString &defaultText, const QString ¶meterText, - 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 ¶meterText, - 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 ¶meterText, - 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) { diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index 307f6a7a5b..843f9b1e1c 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -158,35 +158,35 @@ private: inline ParameterActionCommandPair createParameterAction(Core::ActionContainer *ac, const QString &defaultText, const QString ¶meterText, - 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 ¶meterText, - 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 ¶meterText, - 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 ¶meterText, - 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); diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp index 8b2f048e7a..df91e51a2d 100644 --- a/src/plugins/glsleditor/glslcompletionassist.cpp +++ b/src/plugins/glsleditor/glslcompletionassist.cpp @@ -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; } diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index 2c7e214281..840d2347ca 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -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; diff --git a/src/plugins/imageviewer/imagevieweractionhandler.cpp b/src/plugins/imageviewer/imagevieweractionhandler.cpp index ad256483b5..2b9e29e12f 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.cpp +++ b/src/plugins/imageviewer/imagevieweractionhandler.cpp @@ -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); diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h index 28266c2fab..9a41e3c23a 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.h +++ b/src/plugins/imageviewer/imagevieweractionhandler.h @@ -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: diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index f0015abd6a..7081e6212d 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -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 diff --git a/src/plugins/ios/iosdeployconfiguration.cpp b/src/plugins/ios/iosdeployconfiguration.cpp index df35812a6d..1d08ed9f9a 100644 --- a/src/plugins/ios/iosdeployconfiguration.cpp +++ b/src/plugins/ios/iosdeployconfiguration.cpp @@ -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"); diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h index c3a4541667..e3f90a9283 100644 --- a/src/plugins/ios/iosdeployconfiguration.h +++ b/src/plugins/ios/iosdeployconfiguration.h @@ -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; diff --git a/src/plugins/ios/iosdeploystepfactory.cpp b/src/plugins/ios/iosdeploystepfactory.cpp index f1d1f2fa5d..00455c5b2d 100644 --- a/src/plugins/ios/iosdeploystepfactory.cpp +++ b/src/plugins/ios/iosdeploystepfactory.cpp @@ -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); diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h index f68f2eed8e..503cd82be8 100644 --- a/src/plugins/ios/iosdeploystepfactory.h +++ b/src/plugins/ios/iosdeploystepfactory.h @@ -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; diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 12484c86c8..33e6114066 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -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; }; diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp index 456ead3217..0132cb3d9a 100644 --- a/src/plugins/ios/iosrunfactories.cpp +++ b/src/plugins/ios/iosrunfactories.cpp @@ -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)); } diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h index 1ecedd108f..fceea1f181 100644 --- a/src/plugins/ios/iosrunfactories.h +++ b/src/plugins/ios/iosrunfactories.h @@ -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; diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index d97e598f9c..17846cc87d 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -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) diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 26ad21cbe3..78ac0ce457 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -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(); diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index b764d8b043..9c4522e187 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -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) diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index a2911fb120..94894bb230 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -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); diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index cec7d4cfa0..b76ac1968d 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -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); diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index ca9b536b50..366e4528dc 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -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; diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp index 82a0c236f3..3b48de0c75 100644 --- a/src/plugins/projectexplorer/buildsteplist.cpp +++ b/src/plugins/projectexplorer/buildsteplist.cpp @@ -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) diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index dbf1268d54..410db3312a 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -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); } diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index a6259f0acd..1dd7ce490e 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -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; diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 0811a2c813..7ea2b39700 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -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); diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp index 384a81fecf..6a714f7335 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp @@ -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; diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h index 6ccf269ded..fd568123c7 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h @@ -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; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index 4015fca851..aec30a2290 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -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())); diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index 6dc7a182de..763f81aa9c 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -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); diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 2dc56c18c4..c2062daed9 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -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) diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index 4bd140e813..54d978b9f3 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -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); }; diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index f93eef1e03..d9e93655ce 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -395,7 +395,7 @@ QList<Kit *> KitManager::matchingKits(const KitMatcher &matcher) return result; } -Kit *KitManager::find(const Core::Id &id) +Kit *KitManager::find(Core::Id id) { if (!id.isValid()) return 0; diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index 4c5f66b78a..fafc20d79b 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -117,7 +117,7 @@ public: static QList<Kit *> kits(); static QList<Kit *> matchingKits(const KitMatcher &matcher); - static Kit *find(const Core::Id &id); + static Kit *find(Core::Id id); static Kit *find(const KitMatcher &matcher); static Kit *defaultKit(); diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp index e1230f0dc7..2cc4ae4d62 100644 --- a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp +++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp @@ -63,7 +63,7 @@ bool FallBackMacroExpander::resolveMacro(const QString &name, QString *ret) /// LocalApplicationRunConfiguration -LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *target, const Core::Id id) : +LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *target, Core::Id id) : RunConfiguration(target, id), m_macroExpander(0) { } diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.h b/src/plugins/projectexplorer/localapplicationrunconfiguration.h index 8f5e4116ee..55aa1f56aa 100644 --- a/src/plugins/projectexplorer/localapplicationrunconfiguration.h +++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.h @@ -54,7 +54,7 @@ public: virtual void addToBaseEnvironment(Utils::Environment &env) const; protected: - explicit LocalApplicationRunConfiguration(Target *target, const Core::Id id); + explicit LocalApplicationRunConfiguration(Target *target, Core::Id id); explicit LocalApplicationRunConfiguration(Target *target, LocalApplicationRunConfiguration *rc); Utils::AbstractMacroExpander *macroExpander() const; diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index 3d5376675b..94f453b6d3 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -172,13 +172,13 @@ ProcessStepFactory::~ProcessStepFactory() { } -bool ProcessStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool ProcessStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { Q_UNUSED(parent); return id == PROCESS_STEP_ID; } -BuildStep *ProcessStepFactory::create(BuildStepList *parent, const Core::Id id) +BuildStep *ProcessStepFactory::create(BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -220,7 +220,7 @@ QList<Core::Id> ProcessStepFactory::availableCreationIds(BuildStepList *parent) Q_UNUSED(parent); return QList<Core::Id>() << Core::Id(PROCESS_STEP_ID); } -QString ProcessStepFactory::displayNameForId(const Core::Id id) const +QString ProcessStepFactory::displayNameForId(Core::Id id) const { if (id == PROCESS_STEP_ID) return ProcessStep::tr("Custom Process Step", "item in combobox"); diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 212b6a1133..2fb280dcfb 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -46,10 +46,10 @@ public: ~ProcessStepFactory(); virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const; - virtual QString displayNameForId(const Core::Id id) const; + virtual QString displayNameForId(Core::Id id) const; - virtual bool canCreate(BuildStepList *parent, const Core::Id id) const; - virtual BuildStep *create(BuildStepList *parent, const Core::Id id); + virtual bool canCreate(BuildStepList *parent, Core::Id id) const; + virtual BuildStep *create(BuildStepList *parent, Core::Id id); virtual bool canRestore(BuildStepList *parent, const QVariantMap &map) const; virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map); virtual bool canClone(BuildStepList *parent, BuildStep *product) const; diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index d9cd54e462..f0c27eb80a 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -225,7 +225,7 @@ void Project::setActiveTarget(Target *target) } } -Target *Project::target(const Core::Id id) const +Target *Project::target(Core::Id id) const { return Utils::findOr(d->m_targets, 0, [&id](Target *target) { return target->id() == id; diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index e64d275965..6f8f896335 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -94,7 +94,7 @@ public: // Note: activeTarget can be 0 (if no targets are defined). Target *activeTarget() const; void setActiveTarget(Target *target); - Target *target(const Core::Id id) const; + Target *target(Core::Id id) const; Target *target(Kit *k) const; virtual bool supportsKit(Kit *k, QString *errorMessage = 0) const; diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp index 51312d9870..b5d3fa75d8 100644 --- a/src/plugins/projectexplorer/projectconfiguration.cpp +++ b/src/plugins/projectexplorer/projectconfiguration.cpp @@ -35,7 +35,7 @@ const char CONFIGURATION_ID_KEY[] = "ProjectExplorer.ProjectConfiguration.Id"; const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ProjectConfiguration.DisplayName"; const char DEFAULT_DISPLAY_NAME_KEY[] = "ProjectExplorer.ProjectConfiguration.DefaultDisplayName"; -ProjectConfiguration::ProjectConfiguration(QObject *parent, const Core::Id &id) : +ProjectConfiguration::ProjectConfiguration(QObject *parent, Core::Id id) : QObject(parent), m_id(id) { setObjectName(id.toString()); } diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 8527b223fe..d991443396 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -67,7 +67,7 @@ signals: void displayNameChanged(); protected: - ProjectConfiguration(QObject *parent, const Core::Id &id); + ProjectConfiguration(QObject *parent, Core::Id id); ProjectConfiguration(QObject *parent, const ProjectConfiguration *source); private: diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 238489d510..4c848bd9f1 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -207,7 +207,7 @@ void IRunConfigurationAspect::resetProjectToGlobalSettings() for a target, but still be runnable via the output tab. */ -RunConfiguration::RunConfiguration(Target *target, const Core::Id id) : +RunConfiguration::RunConfiguration(Target *target, Core::Id id) : ProjectConfiguration(target, id), m_aspectsInitialized(false) { @@ -391,7 +391,7 @@ Utils::OutputFormatter *RunConfiguration::createOutputFormatter() const */ /*! - \fn QString ProjectExplorer::IRunConfigurationFactory::displayNameForId(const Core::Id id) const + \fn QString ProjectExplorer::IRunConfigurationFactory::displayNameForId(Core::Id id) const Translates the types to names to display to the user. */ @@ -404,7 +404,7 @@ IRunConfigurationFactory::~IRunConfigurationFactory() { } -RunConfiguration *IRunConfigurationFactory::create(Target *parent, const Core::Id id) +RunConfiguration *IRunConfigurationFactory::create(Target *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 9a67fbe8cd..eb74613f6b 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -196,7 +196,7 @@ signals: void requestRunActionsUpdate(); protected: - RunConfiguration(Target *parent, const Core::Id id); + RunConfiguration(Target *parent, Core::Id id); RunConfiguration(Target *parent, RunConfiguration *source); /// convenience function to get current build configuration. @@ -219,10 +219,10 @@ public: enum CreationMode {UserCreate, AutoCreate}; virtual QList<Core::Id> availableCreationIds(Target *parent, CreationMode mode = UserCreate) const = 0; - virtual QString displayNameForId(const Core::Id id) const = 0; + virtual QString displayNameForId(Core::Id id) const = 0; - virtual bool canCreate(Target *parent, const Core::Id id) const = 0; - RunConfiguration *create(Target *parent, const Core::Id id); + virtual bool canCreate(Target *parent, Core::Id id) const = 0; + RunConfiguration *create(Target *parent, Core::Id id); virtual bool canRestore(Target *parent, const QVariantMap &map) const = 0; RunConfiguration *restore(Target *parent, const QVariantMap &map); virtual bool canClone(Target *parent, RunConfiguration *product) const = 0; @@ -236,7 +236,7 @@ signals: void availableCreationIdsChanged(); private: - virtual RunConfiguration *doCreate(Target *parent, const Core::Id id) = 0; + virtual RunConfiguration *doCreate(Target *parent, Core::Id id) = 0; virtual RunConfiguration *doRestore(Target *parent, const QVariantMap &map) = 0; }; diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index d02cce80db..78e2e643ba 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -171,7 +171,7 @@ void TaskHub::showTaskInEditor(unsigned int id) emit m_instance->openTask(id); } -void TaskHub::setCategoryVisibility(const Core::Id &categoryId, bool visible) +void TaskHub::setCategoryVisibility(Core::Id categoryId, bool visible) { QTC_ASSERT(m_registeredCategories.contains(categoryId), return); emit m_instance->categoryVisibilityChanged(categoryId, visible); diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h index e8b03ecfc2..e03c243b8e 100644 --- a/src/plugins/projectexplorer/taskhub.h +++ b/src/plugins/projectexplorer/taskhub.h @@ -62,7 +62,7 @@ public: static void updateTaskLineNumber(unsigned int id, int line); static void taskMarkClicked(unsigned int id); static void showTaskInEditor(unsigned int id); - static void setCategoryVisibility(const Core::Id &categoryId, bool visible); + static void setCategoryVisibility(Core::Id categoryId, bool visible); static void requestPopup(); @@ -73,7 +73,7 @@ signals: void tasksCleared(Core::Id categoryId); void taskFileNameUpdated(unsigned int id, const QString &fileName); void taskLineNumberUpdated(unsigned int id, int line); - void categoryVisibilityChanged(const Core::Id &categoryId, bool visible); + void categoryVisibilityChanged(Core::Id categoryId, bool visible); void popupRequested(int); void showTask(unsigned int id); void openTask(unsigned int id); diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp index 7d5ed714fa..8ab188b6c8 100644 --- a/src/plugins/projectexplorer/taskmodel.cpp +++ b/src/plugins/projectexplorer/taskmodel.cpp @@ -52,22 +52,22 @@ TaskModel::TaskModel(QObject *parent) : m_categories.insert(Core::Id(), CategoryData()); } -int TaskModel::taskCount(const Core::Id &categoryId) +int TaskModel::taskCount(Core::Id categoryId) { return m_categories.value(categoryId).count; } -int TaskModel::errorTaskCount(const Core::Id &categoryId) +int TaskModel::errorTaskCount(Core::Id categoryId) { return m_categories.value(categoryId).errors; } -int TaskModel::warningTaskCount(const Core::Id &categoryId) +int TaskModel::warningTaskCount(Core::Id categoryId) { return m_categories.value(categoryId).warnings; } -int TaskModel::unknownTaskCount(const Core::Id &categoryId) +int TaskModel::unknownTaskCount(Core::Id categoryId) { return m_categories.value(categoryId).count - m_categories.value(categoryId).errors @@ -82,7 +82,7 @@ bool TaskModel::hasFile(const QModelIndex &index) const return !m_tasks.at(row).file.isEmpty(); } -void TaskModel::addCategory(const Core::Id &categoryId, const QString &categoryName) +void TaskModel::addCategory(Core::Id categoryId, const QString &categoryName) { QTC_ASSERT(categoryId.uniqueIdentifier(), return); CategoryData data; @@ -90,7 +90,7 @@ void TaskModel::addCategory(const Core::Id &categoryId, const QString &categoryN m_categories.insert(categoryId, data); } -QList<Task> TaskModel::tasks(const Core::Id &categoryId) const +QList<Task> TaskModel::tasks(Core::Id categoryId) const { if (categoryId.uniqueIdentifier() == 0) return m_tasks; @@ -165,7 +165,7 @@ void TaskModel::updateTaskLineNumber(unsigned int id, int line) } } -void TaskModel::clearTasks(const Core::Id &categoryId) +void TaskModel::clearTasks(Core::Id categoryId) { typedef QHash<Core::Id,CategoryData>::ConstIterator IdCategoryConstIt; @@ -275,7 +275,7 @@ QList<Core::Id> TaskModel::categoryIds() const return categories; } -QString TaskModel::categoryDisplayName(const Core::Id &categoryId) const +QString TaskModel::categoryDisplayName(Core::Id categoryId) const { return m_categories.value(categoryId).displayName; } diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h index e352d04fcc..509d4e2bac 100644 --- a/src/plugins/projectexplorer/taskmodel.h +++ b/src/plugins/projectexplorer/taskmodel.h @@ -55,13 +55,13 @@ public: Task task(const QModelIndex &index) const; QList<Core::Id> categoryIds() const; - QString categoryDisplayName(const Core::Id &categoryId) const; - void addCategory(const Core::Id &categoryId, const QString &categoryName); + QString categoryDisplayName(Core::Id categoryId) const; + void addCategory(Core::Id categoryId, const QString &categoryName); - QList<Task> tasks(const Core::Id &categoryId = Core::Id()) const; + QList<Task> tasks(Core::Id categoryId = Core::Id()) const; void addTask(const Task &task); void removeTask(const Task &task); - void clearTasks(const Core::Id &categoryId = Core::Id()); + void clearTasks(Core::Id categoryId = Core::Id()); void updateTaskFileName(unsigned int id, const QString &fileName); void updateTaskLineNumber(unsigned int id, int line); @@ -71,10 +71,10 @@ public: enum Roles { File = Qt::UserRole, Line, MovedLine, Description, FileNotFound, Type, Category, Icon, Task_t }; - int taskCount(const Core::Id &categoryId); - int errorTaskCount(const Core::Id &categoryId); - int warningTaskCount(const Core::Id &categoryId); - int unknownTaskCount(const Core::Id &categoryId); + int taskCount(Core::Id categoryId); + int errorTaskCount(Core::Id categoryId); + int warningTaskCount(Core::Id categoryId); + int unknownTaskCount(Core::Id categoryId); bool hasFile(const QModelIndex &index) const; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 0bc1c088bb..dcd064af6d 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -361,7 +361,7 @@ QWidget *TaskWindow::outputWidget(QWidget *) return d->m_listview; } -void TaskWindow::clearTasks(const Core::Id &categoryId) +void TaskWindow::clearTasks(Core::Id categoryId) { if (categoryId.uniqueIdentifier() != 0 && !d->m_filter->filteredCategories().contains(categoryId)) { if (d->m_filter->filterIncludesErrors()) @@ -383,7 +383,7 @@ void TaskWindow::clearTasks(const Core::Id &categoryId) setBadgeNumber(d->m_badgeCount); } -void TaskWindow::setCategoryVisibility(const Core::Id &categoryId, bool visible) +void TaskWindow::setCategoryVisibility(Core::Id categoryId, bool visible) { if (categoryId.uniqueIdentifier() == 0) return; @@ -424,7 +424,7 @@ void TaskWindow::visibilityChanged(bool visible) delayedInitialization(); } -void TaskWindow::addCategory(const Core::Id &categoryId, const QString &displayName, bool visible) +void TaskWindow::addCategory(Core::Id categoryId, const QString &displayName, bool visible) { d->m_model->addCategory(categoryId, displayName); if (!visible) { @@ -557,7 +557,7 @@ void TaskWindow::updateCategoriesMenu() const QList<Core::Id> filteredCategories = d->m_filter->filteredCategories(); QMap<QString, Core::Id> nameToIds; - foreach (const Core::Id &categoryId, d->m_model->categoryIds()) + foreach (Core::Id categoryId, d->m_model->categoryIds()) nameToIds.insert(d->m_model->categoryDisplayName(categoryId), categoryId); const NameToIdsConstIt cend = nameToIds.constEnd(); @@ -581,17 +581,17 @@ void TaskWindow::filterCategoryTriggered(QAction *action) setCategoryVisibility(categoryId, action->isChecked()); } -int TaskWindow::taskCount(const Core::Id &category) const +int TaskWindow::taskCount(Core::Id category) const { return d->m_model->taskCount(category); } -int TaskWindow::errorTaskCount(const Core::Id &category) const +int TaskWindow::errorTaskCount(Core::Id category) const { return d->m_model->errorTaskCount(category); } -int TaskWindow::warningTaskCount(const Core::Id &category) const +int TaskWindow::warningTaskCount(Core::Id category) const { return d->m_model->warningTaskCount(category); } diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index fe1e8a254f..a28ce72974 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -57,9 +57,9 @@ public: void delayedInitialization(); - int taskCount(const Core::Id &category = Core::Id()) const; - int warningTaskCount(const Core::Id &category = Core::Id()) const; - int errorTaskCount(const Core::Id &category = Core::Id()) const; + int taskCount(Core::Id category = Core::Id()) const; + int warningTaskCount(Core::Id category = Core::Id()) const; + int errorTaskCount(Core::Id category = Core::Id()) const; // IOutputPane QWidget *outputWidget(QWidget *); @@ -85,15 +85,15 @@ signals: void tasksCleared(); private slots: - void addCategory(const Core::Id &categoryId, const QString &displayName, bool visible); + void addCategory(Core::Id categoryId, const QString &displayName, bool visible); void addTask(const ProjectExplorer::Task &task); void removeTask(const ProjectExplorer::Task &task); void updatedTaskFileName(unsigned int id, const QString &fileName); void updatedTaskLineNumber(unsigned int id, int line); void showTask(unsigned int id); void openTask(unsigned int id); - void clearTasks(const Core::Id &categoryId); - void setCategoryVisibility(const Core::Id &categoryId, bool visible); + void clearTasks(Core::Id categoryId); + void setCategoryVisibility(Core::Id categoryId, bool visible); void currentChanged(const QModelIndex &index); void triggerDefaultHandler(const QModelIndex &index); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 31eaa722b5..65fded9055 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -70,7 +70,7 @@ QbsBuildConfiguration::QbsBuildConfiguration(ProjectExplorer::Target *target) : connect(bsl, SIGNAL(stepInserted(int)), this, SLOT(buildStepInserted(int))); } -QbsBuildConfiguration::QbsBuildConfiguration(ProjectExplorer::Target *target, const Core::Id id) : +QbsBuildConfiguration::QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id) : BuildConfiguration(target, id) { } diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index 3531c181fd..b9360c6b14 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -81,7 +81,7 @@ signals: protected: QbsBuildConfiguration(ProjectExplorer::Target *target, QbsBuildConfiguration *source); - QbsBuildConfiguration(ProjectExplorer::Target *target, const Core::Id id); + QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); bool fromMap(const QVariantMap &map); private slots: diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 6b81a870a1..a67e7a5418 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -593,14 +593,14 @@ QList<Core::Id> QbsBuildStepFactory::availableCreationIds(ProjectExplorer::Build return QList<Core::Id>(); } -QString QbsBuildStepFactory::displayNameForId(const Core::Id id) const +QString QbsBuildStepFactory::displayNameForId(Core::Id id) const { if (id == Core::Id(Constants::QBS_BUILDSTEP_ID)) return tr("Qbs Build"); return QString(); } -bool QbsBuildStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool QbsBuildStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD) || !qobject_cast<QbsBuildConfiguration *>(parent->parent()) @@ -609,7 +609,7 @@ bool QbsBuildStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, cons return id == Core::Id(Constants::QBS_BUILDSTEP_ID); } -ProjectExplorer::BuildStep *QbsBuildStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *QbsBuildStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index 9c576b7a46..158eaf2041 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -159,10 +159,10 @@ public: // used to show the list of possible additons to a target, returns a list of types QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; // used to translate the types to names to display to the user - 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); // used to recreate the runConfigurations when restoring settings bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 7e884926f0..f684354a23 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -338,14 +338,14 @@ QList<Core::Id> QbsCleanStepFactory::availableCreationIds(ProjectExplorer::Build return QList<Core::Id>(); } -QString QbsCleanStepFactory::displayNameForId(const Core::Id id) const +QString QbsCleanStepFactory::displayNameForId(Core::Id id) const { if (id == Core::Id(Constants::QBS_CLEANSTEP_ID)) return tr("Qbs Clean"); return QString(); } -bool QbsCleanStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool QbsCleanStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN) || !qobject_cast<QbsBuildConfiguration *>(parent->parent())) @@ -353,7 +353,7 @@ bool QbsCleanStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, cons return id == Core::Id(Constants::QBS_CLEANSTEP_ID); } -ProjectExplorer::BuildStep *QbsCleanStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *QbsCleanStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index bde7eea091..2ef3ca7bcb 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -132,10 +132,10 @@ public: // used to show the list of possible additons to a target, returns a list of types QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; // used to translate the types to names to display to the user - 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); // used to recreate the runConfigurations when restoring settings bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); diff --git a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp index 7dc096b73a..3edc8636e2 100644 --- a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp +++ b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp @@ -66,7 +66,7 @@ QbsInstallStep *QbsDeployConfiguration::qbsInstallStep() const return 0; } -QbsDeployConfiguration::QbsDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id) : +QbsDeployConfiguration::QbsDeployConfiguration(ProjectExplorer::Target *target, Core::Id id) : ProjectExplorer::DeployConfiguration(target, id) { } @@ -98,7 +98,7 @@ QList<Core::Id> QbsDeployConfigurationFactory::availableCreationIds(ProjectExplo return ids; } -QString QbsDeployConfigurationFactory::displayNameForId(const Core::Id id) const +QString QbsDeployConfigurationFactory::displayNameForId(Core::Id id) const { if (id == genericQbsDeployConfigurationId()) return genericQbsDisplayName(); @@ -112,7 +112,7 @@ bool QbsDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, } ProjectExplorer::DeployConfiguration -*QbsDeployConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id) +*QbsDeployConfigurationFactory::create(ProjectExplorer::Target *parent, Core::Id id) { Q_ASSERT(canCreate(parent, id)); diff --git a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h index 550bc273d9..fd1647f971 100644 --- a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h +++ b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h @@ -48,7 +48,7 @@ public: QbsInstallStep *qbsInstallStep() const; private: - QbsDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id); + QbsDeployConfiguration(ProjectExplorer::Target *target, Core::Id id); QbsDeployConfiguration(ProjectExplorer::Target *target, ProjectExplorer::DeployConfiguration *source); @@ -63,9 +63,9 @@ public: explicit QbsDeployConfigurationFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(const Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); + QString displayNameForId(Core::Id id) const; + 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); ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index e5ce415681..f68582ed14 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -372,14 +372,14 @@ QList<Core::Id> QbsInstallStepFactory::availableCreationIds(ProjectExplorer::Bui return QList<Core::Id>(); } -QString QbsInstallStepFactory::displayNameForId(const Core::Id id) const +QString QbsInstallStepFactory::displayNameForId(Core::Id id) const { if (id == Core::Id(Constants::QBS_INSTALLSTEP_ID)) return tr("Qbs Install"); return QString(); } -bool QbsInstallStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool QbsInstallStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY) || !qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent()) diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 04c212969c..63a802d819 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -135,10 +135,10 @@ public: // used to show the list of possible additons to a target, returns a list of types QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; // used to translate the types to names to display to the user - 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); // used to recreate the runConfigurations when restoring settings bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index fb28e7a554..1e115e71eb 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -511,7 +511,7 @@ QbsRunConfigurationFactory::QbsRunConfigurationFactory(QObject *parent) : QbsRunConfigurationFactory::~QbsRunConfigurationFactory() { } -bool QbsRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool QbsRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; @@ -520,7 +520,7 @@ bool QbsRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) co return findProduct(project->qbsProjectData(), productFromId(id)).isValid(); } -RunConfiguration *QbsRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +RunConfiguration *QbsRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { return new QbsRunConfiguration(parent, id); } @@ -569,7 +569,7 @@ QList<Core::Id> QbsRunConfigurationFactory::availableCreationIds(Target *parent, return result; } -QString QbsRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString QbsRunConfigurationFactory::displayNameForId(Core::Id id) const { return productFromId(id); } diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 2b234c476b..590319d992 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -176,18 +176,18 @@ public: explicit QbsRunConfigurationFactory(QObject *parent = 0); ~QbsRunConfigurationFactory(); - 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 *source) const; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; 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); }; diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 188b9add4e..7cef5bf6bf 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -623,7 +623,7 @@ DesktopQmakeRunConfigurationFactory::DesktopQmakeRunConfigurationFactory(QObject DesktopQmakeRunConfigurationFactory::~DesktopQmakeRunConfigurationFactory() { } -bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; @@ -631,7 +631,7 @@ bool DesktopQmakeRunConfigurationFactory::canCreate(Target *parent, const Core:: return project->hasApplicationProFile(pathFromId(id)); } -RunConfiguration *DesktopQmakeRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +RunConfiguration *DesktopQmakeRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { DesktopQmakeRunConfiguration *rc = new DesktopQmakeRunConfiguration(parent, id); const QmakeProFileNode *node = static_cast<QmakeProject *>(parent->project())->rootQmakeProjectNode()->findProFileFor(rc->proFilePath()); @@ -679,7 +679,7 @@ QList<Core::Id> DesktopQmakeRunConfigurationFactory::availableCreationIds(Target return QmakeProject::idsForNodes(Core::Id(QMAKE_RC_PREFIX), nodes); } -QString DesktopQmakeRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString DesktopQmakeRunConfigurationFactory::displayNameForId(Core::Id id) const { return QFileInfo(pathFromId(id)).completeBaseName(); } diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index ffba1c09bc..c7c30cb669 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -188,13 +188,13 @@ public: explicit DesktopQmakeRunConfigurationFactory(QObject *parent = 0); ~DesktopQmakeRunConfigurationFactory(); - 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 *source) const; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t, const ProjectExplorer::Node *n); @@ -202,7 +202,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); }; diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 14923acf33..316b0726e2 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -77,7 +77,7 @@ MakeStep::MakeStep(BuildStepList *bsl, MakeStep *bs) : ctor(); } -MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) : +MakeStep::MakeStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id), m_clean(false) { @@ -483,14 +483,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::QMAKEPROJECT_ID) return id == MAKESTEP_BS_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; @@ -537,7 +537,7 @@ 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 == MAKESTEP_BS_ID) return tr("Make"); diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 1b68a7e9cd..47e1ffa54c 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -57,15 +57,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 *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; }; } //namespace Internal @@ -101,7 +101,7 @@ signals: protected: MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); - MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); virtual bool fromMap(const QVariantMap &map); private: diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp index ce684b2472..736a187bb1 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp @@ -279,7 +279,7 @@ ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider() { } -bool ProFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const +bool ProFileCompletionAssistProvider::supportsEditor(Core::Id editorId) const { return editorId == QmakeProjectManager::Constants::PROFILE_EDITOR_ID; } diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.h b/src/plugins/qmakeprojectmanager/profilecompletionassist.h index 9611819171..459552512c 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.h +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.h @@ -47,7 +47,7 @@ public: void init(); ~ProFileCompletionAssistProvider(); - bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE; + bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE; QStringList variables() const; QStringList functions() const; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index dcf5b7edda..c97e2b80c3 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -93,7 +93,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target) : ctor(); } -QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, const Core::Id id) : +QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) : BuildConfiguration(target, id), m_shadowBuild(true), m_isEnabled(false), diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index e07795afe9..76c472b517 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -120,7 +120,7 @@ private slots: protected: QmakeBuildConfiguration(ProjectExplorer::Target *target, QmakeBuildConfiguration *source); - QmakeBuildConfiguration(ProjectExplorer::Target *target, const Core::Id id); + QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); virtual bool fromMap(const QVariantMap &map); private: diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 4b8e2d4302..17d86a2fd9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1105,7 +1105,7 @@ QList<QmakeProFileNode *> QmakeProject::nodesWithQtcRunnable(QList<QmakeProFileN return nodes; } -QList<Core::Id> QmakeProject::idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes) +QList<Core::Id> QmakeProject::idsForNodes(Core::Id base, const QList<QmakeProFileNode *> &nodes) { return Utils::transform(nodes, [&base](QmakeProFileNode *node) { return base.withSuffix(node->path()); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 1575b2f1f7..0c19acb408 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -93,7 +93,7 @@ public: bool hasApplicationProFile(const QString &path) const; static QList<QmakeProFileNode *> nodesWithQtcRunnable(QList<QmakeProFileNode *> nodes); - static QList<Core::Id> idsForNodes(const Core::Id base, const QList<QmakeProFileNode *> &nodes); + static QList<Core::Id> idsForNodes(Core::Id base, const QList<QmakeProFileNode *> &nodes); void notifyChanged(const QString &name); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index bb1e173bd5..c210d25b3a 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -78,7 +78,7 @@ QMakeStep::QMakeStep(BuildStepList *bsl) : ctor(); } -QMakeStep::QMakeStep(BuildStepList *bsl, const Core::Id id) : +QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id), m_forced(false), m_linkQmlDebuggingLibrary(DebugLink) @@ -661,7 +661,7 @@ QMakeStepFactory::~QMakeStepFactory() { } -bool QMakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool QMakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD) return false; @@ -670,7 +670,7 @@ bool QMakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const return id == QMAKE_BS_ID; } -ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *QMakeStepFactory::create(BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -714,7 +714,7 @@ QList<Core::Id> QMakeStepFactory::availableCreationIds(ProjectExplorer::BuildSte return QList<Core::Id>(); } -QString QMakeStepFactory::displayNameForId(const Core::Id id) const +QString QMakeStepFactory::displayNameForId(Core::Id id) const { if (id == QMAKE_BS_ID) return tr("qmake"); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index e382ba234b..ea5a5a3d64 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -58,14 +58,14 @@ class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit QMakeStepFactory(QObject *parent = 0); virtual ~QMakeStepFactory(); - 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 *bs) const; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs); bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; }; } // namespace Internal @@ -120,7 +120,7 @@ signals: protected: QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source); - QMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id); + QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); virtual bool fromMap(const QVariantMap &map); virtual void processStartupFailed(); diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index f51e8f5638..015ee485a2 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -473,7 +473,7 @@ int FunctionHintProposalModel::activeArgument(const QString &prefix) const // ----------------------------- // QmlJSCompletionAssistProvider // ----------------------------- -bool QmlJSCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const +bool QmlJSCompletionAssistProvider::supportsEditor(Core::Id editorId) const { return editorId == Constants::C_QMLJSEDITOR_ID; } diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h index b68d794410..7703f4f525 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.h +++ b/src/plugins/qmljseditor/qmljscompletionassist.h @@ -80,7 +80,7 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide 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; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 0e3442c6c0..af934da57d 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -299,7 +299,7 @@ void QmlJSEditorPlugin::showContextPane() } Core::Command *QmlJSEditorPlugin::addToolAction(QAction *a, - Core::Context &context, const Core::Id &id, + Core::Context &context, Core::Id id, Core::ActionContainer *c1, const QString &keySequence) { Core::Command *command = Core::ActionManager::registerAction(a, id, context); diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h index ec5e9845f8..6caebaba77 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.h +++ b/src/plugins/qmljseditor/qmljseditorplugin.h @@ -96,7 +96,7 @@ private Q_SLOTS: void checkCurrentEditorSemanticInfoUpToDate(); private: - Core::Command *addToolAction(QAction *a, Core::Context &context, const Core::Id &id, + Core::Command *addToolAction(QAction *a, Core::Context &context, Core::Id id, Core::ActionContainer *c1, const QString &keySequence); static QmlJSEditorPlugin *m_instance; diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp index d678f9924f..8e9135a9ea 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp @@ -96,7 +96,7 @@ bool QmlJSQuickFixAssistProvider::isAsynchronous() const return false; } -bool QmlJSQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const +bool QmlJSQuickFixAssistProvider::supportsEditor(Core::Id editorId) const { return editorId == Constants::C_QMLJSEDITOR_ID; } diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h index 21424c8449..901883c8f3 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.h +++ b/src/plugins/qmljseditor/qmljsquickfixassist.h @@ -78,7 +78,7 @@ public: ~QmlJSQuickFixAssistProvider(); 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; diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index 47bfe93760..cf3e35ead3 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -65,7 +65,7 @@ QmlTaskManager::QmlTaskManager(QObject *parent) : SLOT(updateMessagesNow())); } -static QList<ProjectExplorer::Task> convertToTasks(const QList<DiagnosticMessage> &messages, const Utils::FileName &fileName, const Core::Id &category) +static QList<ProjectExplorer::Task> convertToTasks(const QList<DiagnosticMessage> &messages, const Utils::FileName &fileName, Core::Id category) { QList<ProjectExplorer::Task> result; foreach (const DiagnosticMessage &msg, messages) { @@ -81,7 +81,7 @@ static QList<ProjectExplorer::Task> convertToTasks(const QList<DiagnosticMessage return result; } -static QList<ProjectExplorer::Task> convertToTasks(const QList<StaticAnalysis::Message> &messages, const Utils::FileName &fileName, const Core::Id &category) +static QList<ProjectExplorer::Task> convertToTasks(const QList<StaticAnalysis::Message> &messages, const Utils::FileName &fileName, Core::Id category) { QList<DiagnosticMessage> diagnostics; foreach (const StaticAnalysis::Message &msg, messages) diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp index 9727d12d40..459acd91d9 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -100,7 +100,7 @@ ProjectExplorer::Kit *QmlProfilerAttachDialog::kit() const return d->kitChooser->currentKit(); } -void QmlProfilerAttachDialog::setKitId(const Core::Id &id) +void QmlProfilerAttachDialog::setKitId(Core::Id id) { d->kitChooser->setCurrentKitId(id); } diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h index ebb0795041..1f80b4240f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h @@ -51,7 +51,7 @@ public: void setPort(const int port); ProjectExplorer::Kit *kit() const; - void setKitId(const Core::Id &id); + void setKitId(Core::Id id); private: QmlProfilerAttachDialogPrivate *d; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index c6aba0a902..aac433b884 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -83,7 +83,7 @@ QList<Core::Id> QmlProjectRunConfigurationFactory::availableCreationIds(ProjectE return list; } -QString QmlProjectRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString QmlProjectRunConfigurationFactory::displayNameForId(Core::Id id) const { if (id == Constants::QML_VIEWER_RC_ID) return tr("QML Viewer"); @@ -110,7 +110,7 @@ bool QmlProjectRunConfigurationFactory::canCreate(ProjectExplorer::Target *paren return false; } -ProjectExplorer::RunConfiguration *QmlProjectRunConfigurationFactory::doCreate(ProjectExplorer::Target *parent, const Core::Id id) +ProjectExplorer::RunConfiguration *QmlProjectRunConfigurationFactory::doCreate(ProjectExplorer::Target *parent, Core::Id id) { return new QmlProjectRunConfiguration(parent, id); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h index b43738cbaa..b3825d2353 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h @@ -44,9 +44,9 @@ public: ~QmlProjectRunConfigurationFactory(); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) 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; bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); @@ -54,7 +54,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); }; diff --git a/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.cpp b/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.cpp index 8e8da5bfb0..a4a5830516 100644 --- a/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.cpp +++ b/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.cpp @@ -61,14 +61,14 @@ QList<Core::Id> BlackBerryCheckDeviceStatusStepFactory::availableCreationIds( return QList<Core::Id>() << Core::Id(Constants::QNX_CHECK_DEVICE_STATUS_BS_ID); } -QString BlackBerryCheckDeviceStatusStepFactory::displayNameForId(const Core::Id id) const +QString BlackBerryCheckDeviceStatusStepFactory::displayNameForId(Core::Id id) const { if (id == Constants::QNX_CHECK_DEVICE_STATUS_BS_ID) return tr("Check Device Status"); return QString(); } -bool BlackBerryCheckDeviceStatusStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool BlackBerryCheckDeviceStatusStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } diff --git a/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.h b/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.h index 25ccdbf52e..1b3c9a6374 100644 --- a/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.h +++ b/src/plugins/qnx/blackberrycheckdevicestatusstepfactory.h @@ -44,10 +44,10 @@ public: explicit BlackBerryCheckDeviceStatusStepFactory(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); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, diff --git a/src/plugins/qnx/blackberrycreatepackagestepfactory.cpp b/src/plugins/qnx/blackberrycreatepackagestepfactory.cpp index 2f4f1d5d13..b44dcdbae0 100644 --- a/src/plugins/qnx/blackberrycreatepackagestepfactory.cpp +++ b/src/plugins/qnx/blackberrycreatepackagestepfactory.cpp @@ -65,7 +65,7 @@ QList<Core::Id> BlackBerryCreatePackageStepFactory::availableCreationIds( return QList<Core::Id>() << Core::Id(Constants::QNX_CREATE_PACKAGE_BS_ID); } -QString BlackBerryCreatePackageStepFactory::displayNameForId(const Core::Id id) const +QString BlackBerryCreatePackageStepFactory::displayNameForId(Core::Id id) const { if (id == Constants::QNX_CREATE_PACKAGE_BS_ID) return tr("Create BAR Packages"); @@ -78,7 +78,7 @@ bool BlackBerryCreatePackageStepFactory::canCreate(ProjectExplorer::BuildStepLis return availableCreationIds(parent).contains(id); } -ProjectExplorer::BuildStep *BlackBerryCreatePackageStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *BlackBerryCreatePackageStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/qnx/blackberrycreatepackagestepfactory.h b/src/plugins/qnx/blackberrycreatepackagestepfactory.h index ae133c9a7d..daba09f0af 100644 --- a/src/plugins/qnx/blackberrycreatepackagestepfactory.h +++ b/src/plugins/qnx/blackberrycreatepackagestepfactory.h @@ -45,10 +45,10 @@ public: ~BlackBerryCreatePackageStepFactory(); 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); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp index e4bbabee14..be3fd7ee7d 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp +++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp @@ -72,7 +72,7 @@ QList<Core::Id> BlackBerryDeployConfigurationFactory::availableCreationIds(Proje return result; } -QString BlackBerryDeployConfigurationFactory::displayNameForId(const Core::Id id) const +QString BlackBerryDeployConfigurationFactory::displayNameForId(Core::Id id) const { if (id == Constants::QNX_BB_DEPLOYCONFIGURATION_ID) return tr("Deploy to BlackBerry Device"); diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.h b/src/plugins/qnx/blackberrydeployconfigurationfactory.h index 42b335e6dc..58869902e8 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationfactory.h +++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.h @@ -47,9 +47,9 @@ public: ~BlackBerryDeployConfigurationFactory(); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); diff --git a/src/plugins/qnx/blackberrydeploystepfactory.cpp b/src/plugins/qnx/blackberrydeploystepfactory.cpp index 48acb8ea1a..fa8c9353de 100644 --- a/src/plugins/qnx/blackberrydeploystepfactory.cpp +++ b/src/plugins/qnx/blackberrydeploystepfactory.cpp @@ -58,14 +58,14 @@ QList<Core::Id> BlackBerryDeployStepFactory::availableCreationIds(ProjectExplore return QList<Core::Id>() << Core::Id(Constants::QNX_DEPLOY_PACKAGE_BS_ID); } -QString BlackBerryDeployStepFactory::displayNameForId(const Core::Id id) const +QString BlackBerryDeployStepFactory::displayNameForId(Core::Id id) const { if (id == Constants::QNX_DEPLOY_PACKAGE_BS_ID) return tr("Deploy Package"); return QString(); } -bool BlackBerryDeployStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool BlackBerryDeployStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } diff --git a/src/plugins/qnx/blackberrydeploystepfactory.h b/src/plugins/qnx/blackberrydeploystepfactory.h index 91c1576704..962605a31d 100644 --- a/src/plugins/qnx/blackberrydeploystepfactory.h +++ b/src/plugins/qnx/blackberrydeploystepfactory.h @@ -44,9 +44,9 @@ public: BlackBerryDeployStepFactory(); 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; + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id); diff --git a/src/plugins/qnx/blackberryrunconfiguration.cpp b/src/plugins/qnx/blackberryrunconfiguration.cpp index 853f97659f..664cbdb7d0 100644 --- a/src/plugins/qnx/blackberryrunconfiguration.cpp +++ b/src/plugins/qnx/blackberryrunconfiguration.cpp @@ -45,7 +45,7 @@ using namespace Qnx; using namespace Qnx::Internal; using namespace ProjectExplorer; -BlackBerryRunConfiguration::BlackBerryRunConfiguration(Target *parent, const Core::Id id, const QString &path) +BlackBerryRunConfiguration::BlackBerryRunConfiguration(Target *parent, Core::Id id, const QString &path) : RunConfiguration(parent, id) , m_proFilePath(path) { diff --git a/src/plugins/qnx/blackberryrunconfiguration.h b/src/plugins/qnx/blackberryrunconfiguration.h index 9c30cc08e8..8425261f92 100644 --- a/src/plugins/qnx/blackberryrunconfiguration.h +++ b/src/plugins/qnx/blackberryrunconfiguration.h @@ -52,7 +52,7 @@ class BlackBerryRunConfiguration : public ProjectExplorer::RunConfiguration friend class BlackBerryRunConfigurationFactory; public: - explicit BlackBerryRunConfiguration(ProjectExplorer::Target *parent, const Core::Id id, const QString &path); + explicit BlackBerryRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); QWidget *createConfigurationWidget(); diff --git a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp index ce5aa07a55..25dde64e0f 100644 --- a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp +++ b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp @@ -42,7 +42,7 @@ using namespace Qnx; using namespace Qnx::Internal; -static QString pathFromId(const Core::Id id) +static QString pathFromId(Core::Id id) { return id.suffixAfter(Constants::QNX_BB_RUNCONFIGURATION_PREFIX); } @@ -69,7 +69,7 @@ QList<Core::Id> BlackBerryRunConfigurationFactory::availableCreationIds(ProjectE nodes); } -QString BlackBerryRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString BlackBerryRunConfigurationFactory::displayNameForId(Core::Id id) const { const QString path = pathFromId(id); if (path.isEmpty()) @@ -81,7 +81,7 @@ QString BlackBerryRunConfigurationFactory::displayNameForId(const Core::Id id) c return QString(); } -bool BlackBerryRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const +bool BlackBerryRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; diff --git a/src/plugins/qnx/blackberryrunconfigurationfactory.h b/src/plugins/qnx/blackberryrunconfigurationfactory.h index 890360ee01..afd0ca35cb 100644 --- a/src/plugins/qnx/blackberryrunconfigurationfactory.h +++ b/src/plugins/qnx/blackberryrunconfigurationfactory.h @@ -46,10 +46,10 @@ public: explicit BlackBerryRunConfigurationFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id); + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; diff --git a/src/plugins/qnx/qnxdeployconfiguration.cpp b/src/plugins/qnx/qnxdeployconfiguration.cpp index 0a72c5d653..ad52cb6f4c 100644 --- a/src/plugins/qnx/qnxdeployconfiguration.cpp +++ b/src/plugins/qnx/qnxdeployconfiguration.cpp @@ -34,7 +34,7 @@ using namespace Qnx; using namespace Qnx::Internal; -QnxDeployConfiguration::QnxDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id, const QString &defaultDisplayName) +QnxDeployConfiguration::QnxDeployConfiguration(ProjectExplorer::Target *target, Core::Id id, const QString &defaultDisplayName) : RemoteLinux::RemoteLinuxDeployConfiguration(target, id, defaultDisplayName) { } diff --git a/src/plugins/qnx/qnxdeployconfiguration.h b/src/plugins/qnx/qnxdeployconfiguration.h index 7697c61429..6d51018ea5 100644 --- a/src/plugins/qnx/qnxdeployconfiguration.h +++ b/src/plugins/qnx/qnxdeployconfiguration.h @@ -41,7 +41,7 @@ class QnxDeployConfiguration : public RemoteLinux::RemoteLinuxDeployConfiguratio { Q_OBJECT public: - QnxDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id, + QnxDeployConfiguration(ProjectExplorer::Target *target, Core::Id id, const QString &defaultDisplayName); QnxDeployConfiguration(ProjectExplorer::Target *target, diff --git a/src/plugins/qnx/qnxdeployconfigurationfactory.cpp b/src/plugins/qnx/qnxdeployconfigurationfactory.cpp index 265cb389bc..88d0993d4b 100644 --- a/src/plugins/qnx/qnxdeployconfigurationfactory.cpp +++ b/src/plugins/qnx/qnxdeployconfigurationfactory.cpp @@ -58,7 +58,7 @@ QList<Core::Id> QnxDeployConfigurationFactory::availableCreationIds(ProjectExplo return ids; } -QString QnxDeployConfigurationFactory::displayNameForId(const Core::Id id) const +QString QnxDeployConfigurationFactory::displayNameForId(Core::Id id) const { if (id.name().startsWith(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID)) return tr("Deploy to QNX Device"); @@ -66,12 +66,12 @@ QString QnxDeployConfigurationFactory::displayNameForId(const Core::Id id) const return QString(); } -bool QnxDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const +bool QnxDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, Core::Id id) const { return canHandle(parent) && id.name().startsWith(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID); } -ProjectExplorer::DeployConfiguration *QnxDeployConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id) +ProjectExplorer::DeployConfiguration *QnxDeployConfigurationFactory::create(ProjectExplorer::Target *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/qnx/qnxdeployconfigurationfactory.h b/src/plugins/qnx/qnxdeployconfigurationfactory.h index dc9fd95a42..2972e7e1cd 100644 --- a/src/plugins/qnx/qnxdeployconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeployconfigurationfactory.h @@ -44,9 +44,9 @@ public: explicit QnxDeployConfigurationFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); diff --git a/src/plugins/qnx/qnxdeploystepfactory.cpp b/src/plugins/qnx/qnxdeploystepfactory.cpp index 8a3c76fb10..f57252efeb 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.cpp +++ b/src/plugins/qnx/qnxdeploystepfactory.cpp @@ -61,7 +61,7 @@ QList<Core::Id> QnxDeployStepFactory::availableCreationIds(ProjectExplorer::Buil << ProjectExplorer::DeviceCheckBuildStep::stepId(); } -QString QnxDeployStepFactory::displayNameForId(const Core::Id id) const +QString QnxDeployStepFactory::displayNameForId(Core::Id id) const { if (id == RemoteLinux::GenericDirectUploadStep::stepId()) return RemoteLinux::GenericDirectUploadStep::displayName(); @@ -71,12 +71,12 @@ QString QnxDeployStepFactory::displayNameForId(const Core::Id id) const return QString(); } -bool QnxDeployStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const +bool QnxDeployStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } -ProjectExplorer::BuildStep *QnxDeployStepFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id) +ProjectExplorer::BuildStep *QnxDeployStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id) { if (!canCreate(parent, id)) return 0; diff --git a/src/plugins/qnx/qnxdeploystepfactory.h b/src/plugins/qnx/qnxdeploystepfactory.h index 51812b19a9..46323553ff 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.h +++ b/src/plugins/qnx/qnxdeploystepfactory.h @@ -44,9 +44,9 @@ public: explicit QnxDeployStepFactory(); 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; + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id); diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index d6700fe202..c52ef1720c 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -45,7 +45,7 @@ namespace { const char QtLibPathKey[] = "Qt4ProjectManager.QnxRunConfiguration.QtLibPath"; } -QnxRunConfiguration::QnxRunConfiguration(ProjectExplorer::Target *parent, const Core::Id id, const QString &proFilePath) +QnxRunConfiguration::QnxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &proFilePath) : RemoteLinux::RemoteLinuxRunConfiguration(parent, id, proFilePath) { } diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h index f69e0ac45d..127af4c4ef 100644 --- a/src/plugins/qnx/qnxrunconfiguration.h +++ b/src/plugins/qnx/qnxrunconfiguration.h @@ -43,7 +43,7 @@ class QnxRunConfiguration : public RemoteLinux::RemoteLinuxRunConfiguration { Q_OBJECT public: - QnxRunConfiguration(ProjectExplorer::Target *parent, const Core::Id id, + QnxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &projectFilePath); Utils::Environment environment() const; diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.cpp b/src/plugins/qnx/qnxrunconfigurationfactory.cpp index 553cc5d612..f05c0cf40b 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.cpp +++ b/src/plugins/qnx/qnxrunconfigurationfactory.cpp @@ -43,7 +43,7 @@ using namespace Qnx; using namespace Qnx::Internal; -static QString pathFromId(const Core::Id id) +static QString pathFromId(Core::Id id) { return id.suffixAfter(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX); } @@ -71,7 +71,7 @@ QList<Core::Id> QnxRunConfigurationFactory::availableCreationIds(ProjectExplorer nodes); } -QString QnxRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString QnxRunConfigurationFactory::displayNameForId(Core::Id id) const { const QString path = pathFromId(id); if (path.isEmpty()) @@ -83,7 +83,7 @@ QString QnxRunConfigurationFactory::displayNameForId(const Core::Id id) const return QString(); } -bool QnxRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const +bool QnxRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, Core::Id id) const { if (!canHandle(parent) || !id.name().startsWith(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX)) return false; @@ -95,7 +95,7 @@ bool QnxRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, cons return qt4Project->hasApplicationProFile(pathFromId(id)); } -ProjectExplorer::RunConfiguration *QnxRunConfigurationFactory::doCreate(ProjectExplorer::Target *parent, const Core::Id id) +ProjectExplorer::RunConfiguration *QnxRunConfigurationFactory::doCreate(ProjectExplorer::Target *parent, Core::Id id) { return new QnxRunConfiguration(parent, id, pathFromId(id)); } diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.h b/src/plugins/qnx/qnxrunconfigurationfactory.h index 1117a2ee66..40cd702466 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.h +++ b/src/plugins/qnx/qnxrunconfigurationfactory.h @@ -46,9 +46,9 @@ public: explicit QnxRunConfigurationFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) 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; @@ -59,7 +59,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); }; diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp index 6acd0bf6c0..f6f63034ce 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp @@ -318,7 +318,7 @@ CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory CustomExecutableRunConfigurationFactory::~CustomExecutableRunConfigurationFactory() { } -bool CustomExecutableRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool CustomExecutableRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; @@ -326,7 +326,7 @@ bool CustomExecutableRunConfigurationFactory::canCreate(Target *parent, const Co } RunConfiguration * -CustomExecutableRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +CustomExecutableRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { Q_UNUSED(id); return new CustomExecutableRunConfiguration(parent); @@ -375,7 +375,7 @@ QList<Core::Id> CustomExecutableRunConfigurationFactory::availableCreationIds(Ta return QList<Core::Id>() << Core::Id(CUSTOM_EXECUTABLE_ID); } -QString CustomExecutableRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString CustomExecutableRunConfigurationFactory::displayNameForId(Core::Id id) const { if (id == CUSTOM_EXECUTABLE_ID) return tr("Custom Executable"); diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.h b/src/plugins/qtsupport/customexecutablerunconfiguration.h index 93eddf2683..38c5f2efeb 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.h +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.h @@ -113,9 +113,9 @@ public: ~CustomExecutableRunConfigurationFactory(); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) 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; bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, @@ -124,7 +124,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); }; diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index 77df9edbfb..9de7a4a13c 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -55,7 +55,7 @@ public: } // namespace Internal -AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, const Core::Id id) +AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, Core::Id id) : BuildStep(bsl, id) { ctor(); diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index e4b9d058d8..c28371eec1 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -43,7 +43,7 @@ class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildSt Q_OBJECT public: - AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other); ~AbstractPackagingStep(); diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index 184d28a047..7fd7ca495d 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -49,7 +49,7 @@ public: } // namespace Internal -AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, const Core::Id id) +AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, Core::Id id) : BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate) { } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 732555c315..81c3193519 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -59,7 +59,7 @@ public: virtual AbstractRemoteLinuxDeployService *deployService() const = 0; protected: - AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, AbstractRemoteLinuxDeployStep *other); virtual bool initInternal(QString *error = 0) = 0; diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index f912da88e5..e6bd307054 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -95,7 +95,7 @@ public: } // namespace Internal -GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id) +GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id) : AbstractRemoteLinuxDeployStep(bsl, id) { ctor(); diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index b5df95efec..82034c3875 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/src/plugins/remotelinux/genericdirectuploadstep.h @@ -41,7 +41,7 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep Q_OBJECT public: - GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other); ~GenericDirectUploadStep(); diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp index 585b544eae..267e7fc420 100644 --- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp +++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp @@ -57,7 +57,7 @@ QList<Core::Id> GenericRemoteLinuxDeployStepFactory::availableCreationIds(BuildS return ids; } -QString GenericRemoteLinuxDeployStepFactory::displayNameForId(const Core::Id id) const +QString GenericRemoteLinuxDeployStepFactory::displayNameForId(Core::Id id) const { if (id == TarPackageCreationStep::stepId()) return TarPackageCreationStep::displayName(); @@ -72,12 +72,12 @@ QString GenericRemoteLinuxDeployStepFactory::displayNameForId(const Core::Id id) return QString(); } -bool GenericRemoteLinuxDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool GenericRemoteLinuxDeployStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } -BuildStep *GenericRemoteLinuxDeployStepFactory::create(BuildStepList *parent, const Core::Id id) +BuildStep *GenericRemoteLinuxDeployStepFactory::create(BuildStepList *parent, Core::Id id) { Q_ASSERT(canCreate(parent, id)); diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h index a338de847f..3452a39dcb 100644 --- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h +++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h @@ -41,9 +41,9 @@ public: GenericRemoteLinuxDeployStepFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) 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 canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h index 8ee974450e..3660c4e5d5 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h @@ -53,7 +53,7 @@ public: QString commandLine() const; protected: - AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); + AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, AbstractRemoteLinuxCustomCommandDeploymentStep *other); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index feee34f065..c17ac6c113 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -44,7 +44,7 @@ class REMOTELINUX_EXPORT RemoteLinuxDeployConfiguration Q_OBJECT public: - RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id, + RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, Core::Id id, const QString &defaultDisplayName); RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration *source); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp index c4c039bd32..e771799a71 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp @@ -70,14 +70,14 @@ QList<Core::Id> RemoteLinuxDeployConfigurationFactory::availableCreationIds(Targ return ids; } -QString RemoteLinuxDeployConfigurationFactory::displayNameForId(const Core::Id id) const +QString RemoteLinuxDeployConfigurationFactory::displayNameForId(Core::Id id) const { if (id == genericDeployConfigurationId()) return genericLinuxDisplayName(); return QString(); } -bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h index 798fb80255..08ea5d6a27 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h @@ -42,9 +42,9 @@ public: explicit RemoteLinuxDeployConfigurationFactory(QObject *parent = 0); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(const Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id); + QString displayNameForId(Core::Id id) const; + 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); ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 3a906f7cb1..162c1c4d57 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -81,7 +81,7 @@ public: using namespace Internal; -RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *parent, const Core::Id id, +RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *parent, Core::Id id, const QString &proFilePath) : AbstractRemoteLinuxRunConfiguration(parent, id), d(new RemoteLinuxRunConfigurationPrivate(proFilePath)) diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index 0080d35f10..6829920c00 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -59,7 +59,7 @@ class REMOTELINUX_EXPORT RemoteLinuxRunConfiguration : public AbstractRemoteLinu friend class RemoteLinuxRunConfigurationWidget; public: - RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, const Core::Id id, + RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &projectFilePath); ~RemoteLinuxRunConfiguration(); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 0a0d45bca5..2acb0e12a5 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -67,7 +67,7 @@ RemoteLinuxRunConfigurationFactory::~RemoteLinuxRunConfigurationFactory() { } -bool RemoteLinuxRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool RemoteLinuxRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) return false; @@ -105,7 +105,7 @@ QList<Core::Id> RemoteLinuxRunConfigurationFactory::availableCreationIds(Target return result; } -QString RemoteLinuxRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString RemoteLinuxRunConfigurationFactory::displayNameForId(Core::Id id) const { if (id == RemoteLinuxCustomRunConfiguration::runConfigId()) return RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName(); @@ -113,7 +113,7 @@ QString RemoteLinuxRunConfigurationFactory::displayNameForId(const Core::Id id) + QLatin1Char(' ') + tr("(on Remote Generic Linux Host)"); } -RunConfiguration *RemoteLinuxRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +RunConfiguration *RemoteLinuxRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { if (id == RemoteLinuxCustomRunConfiguration::runConfigId()) return new RemoteLinuxCustomRunConfiguration(parent); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h index 16cfa90d2f..cd1d97d5eb 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h @@ -42,10 +42,10 @@ public: explicit RemoteLinuxRunConfigurationFactory(QObject *parent = 0); ~RemoteLinuxRunConfigurationFactory(); - 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); }; diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 6c6b70b972..7e5671bd87 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -4484,7 +4484,7 @@ void BaseTextEditorWidget::dragEnterEvent(QDragEnterEvent *e) QPlainTextEdit::dragEnterEvent(e); } -static void appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId) +static void appendMenuActionsFromContext(QMenu *menu, Core::Id menuContextId) { Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(menuContextId); QMenu *contextMenu = mcontext->menu(); @@ -4493,7 +4493,7 @@ static void appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContext menu->addAction(action); } -void BaseTextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId) +void BaseTextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId) { QMenu menu; appendMenuActionsFromContext(&menu, menuContextId); diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 18b8bfb250..0fe282b03b 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -454,7 +454,7 @@ protected: void dragEnterEvent(QDragEnterEvent *e); - void showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId); + void showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId); public: struct Link diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 2b3b0a4362..e188f527ab 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -120,7 +120,7 @@ bool ClipboardAssistProvider::isAsynchronous() const return false; } -bool ClipboardAssistProvider::supportsEditor(const Core::Id &/*editorId*/) const +bool ClipboardAssistProvider::supportsEditor(Core::Id /*editorId*/) const { return true; } diff --git a/src/plugins/texteditor/circularclipboardassist.h b/src/plugins/texteditor/circularclipboardassist.h index ac1abfee79..9a997e663b 100644 --- a/src/plugins/texteditor/circularclipboardassist.h +++ b/src/plugins/texteditor/circularclipboardassist.h @@ -41,7 +41,7 @@ class ClipboardAssistProvider: public IAssistProvider { public: bool isAsynchronous() const; - bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE; + bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE; IAssistProcessor *createProcessor() const QTC_OVERRIDE; }; diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index c4b8ac0d07..a7c9d1b21d 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/src/plugins/texteditor/codeassist/codeassistant.cpp @@ -56,7 +56,7 @@ using namespace Internal; namespace { template <class T> -void filterEditorSpecificProviders(QList<T *> *providers, const Core::Id &editorId) +void filterEditorSpecificProviders(QList<T *> *providers, Core::Id editorId) { typename QList<T *>::iterator it = providers->begin(); while (it != providers->end()) { diff --git a/src/plugins/texteditor/codeassist/iassistprovider.cpp b/src/plugins/texteditor/codeassist/iassistprovider.cpp index 5b36f39e85..ca7d6912a4 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.cpp +++ b/src/plugins/texteditor/codeassist/iassistprovider.cpp @@ -56,7 +56,7 @@ using namespace TextEditor; */ /*! - \fn bool TextEditor::IAssistProvider::supportsEditor(const Core::Id &editorId) const + \fn bool TextEditor::IAssistProvider::supportsEditor(Core::Id editorId) const Returns whether this provider supports the editor which has the \a editorId. */ diff --git a/src/plugins/texteditor/codeassist/iassistprovider.h b/src/plugins/texteditor/codeassist/iassistprovider.h index 0a867e2672..e61892a18e 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.h +++ b/src/plugins/texteditor/codeassist/iassistprovider.h @@ -47,7 +47,7 @@ public: IAssistProvider() {} virtual bool isAsynchronous() const = 0; - virtual bool supportsEditor(const Core::Id &editorId) const = 0; + virtual bool supportsEditor(Core::Id editorId) const = 0; virtual IAssistProcessor *createProcessor() const = 0; }; diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 5ea1d31e05..941b87ede0 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -382,7 +382,7 @@ void TextEditorActionHandler::createActions() m_unfoldAllAction->setEnabled(m_optionalActions & UnCollapseAll); } -QAction *TextEditorActionHandler::registerAction(const Core::Id &id, +QAction *TextEditorActionHandler::registerAction(Core::Id id, const char *slot, bool scriptable, const QString &title, diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 5359401811..292eafe068 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -72,7 +72,7 @@ protected: virtual BaseTextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const; private: - QAction *registerAction(const Core::Id &id, + QAction *registerAction(Core::Id id, const char *slot, bool scriptable = false, const QString &title = QString(), diff --git a/src/plugins/winrt/winrtdeployconfiguration.cpp b/src/plugins/winrt/winrtdeployconfiguration.cpp index 8a76634f73..082b435d0c 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.cpp +++ b/src/plugins/winrt/winrtdeployconfiguration.cpp @@ -48,7 +48,7 @@ static const char appxDeployConfigurationC[] = "WinRTAppxDeployConfiguration"; static const char phoneDeployConfigurationC[] = "WinRTPhoneDeployConfiguration"; static const char emulatorDeployConfigurationC[] = "WinRTEmulatorDeployConfiguration"; -static QString msgDeployConfigurationDisplayName(const Core::Id &id) +static QString msgDeployConfigurationDisplayName(Core::Id id) { if (id == appxDeployConfigurationC) { return QCoreApplication::translate("WinRt::Internal::WinRtDeployConfiguration", @@ -70,7 +70,7 @@ WinRtDeployConfigurationFactory::WinRtDeployConfigurationFactory(QObject *parent { } -QString WinRtDeployConfigurationFactory::displayNameForId(const Core::Id id) const +QString WinRtDeployConfigurationFactory::displayNameForId(Core::Id id) const { return msgDeployConfigurationDisplayName(id); } @@ -96,12 +96,12 @@ QList<Core::Id> WinRtDeployConfigurationFactory::availableCreationIds(Target *pa return QList<Core::Id>(); } -bool WinRtDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool WinRtDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } -DeployConfiguration *WinRtDeployConfigurationFactory::create(Target *parent, const Core::Id id) +DeployConfiguration *WinRtDeployConfigurationFactory::create(Target *parent, Core::Id id) { if (id == appxDeployConfigurationC || id == phoneDeployConfigurationC @@ -155,7 +155,7 @@ QList<Core::Id> WinRtDeployStepFactory::availableCreationIds(BuildStepList *pare return ids; } -QString WinRtDeployStepFactory::displayNameForId(const Core::Id id) const +QString WinRtDeployStepFactory::displayNameForId(Core::Id id) const { if (id == Constants::WINRT_BUILD_STEP_DEPLOY) { return QCoreApplication::translate("WinRt::Internal::WinRtDeployStepFactory", @@ -164,12 +164,12 @@ QString WinRtDeployStepFactory::displayNameForId(const Core::Id id) const return QString(); } -bool WinRtDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const +bool WinRtDeployStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { return availableCreationIds(parent).contains(id); } -BuildStep *WinRtDeployStepFactory::create(BuildStepList *parent, const Core::Id id) +BuildStep *WinRtDeployStepFactory::create(BuildStepList *parent, Core::Id id) { if (id == Constants::WINRT_BUILD_STEP_DEPLOY) return new WinRtPackageDeploymentStep(parent); diff --git a/src/plugins/winrt/winrtdeployconfiguration.h b/src/plugins/winrt/winrtdeployconfiguration.h index fbc6d19cb4..4bb1ec34a2 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.h +++ b/src/plugins/winrt/winrtdeployconfiguration.h @@ -40,10 +40,10 @@ class WinRtDeployConfigurationFactory : public ProjectExplorer::DeployConfigurat { public: explicit WinRtDeployConfigurationFactory(QObject *parent = 0); - QString displayNameForId(const Core::Id id) const; + QString displayNameForId(Core::Id id) const; QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - 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; @@ -55,9 +55,9 @@ class WinRtDeployStepFactory : public ProjectExplorer::IBuildStepFactory { public: QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) 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 canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; diff --git a/src/plugins/winrt/winrtrunconfiguration.cpp b/src/plugins/winrt/winrtrunconfiguration.cpp index 5feaaa4133..2fb121ecc7 100644 --- a/src/plugins/winrt/winrtrunconfiguration.cpp +++ b/src/plugins/winrt/winrtrunconfiguration.cpp @@ -40,7 +40,7 @@ namespace Internal { static const char argumentsIdC[] = "WinRtRunConfigurationArgumentsId"; static const char uninstallAfterStopIdC[] = "WinRtRunConfigurationUninstallAfterStopId"; -WinRtRunConfiguration::WinRtRunConfiguration(ProjectExplorer::Target *parent, const Core::Id &id) +WinRtRunConfiguration::WinRtRunConfiguration(ProjectExplorer::Target *parent, Core::Id id) : RunConfiguration(parent, id) , m_uninstallAfterStop(false) { diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h index ce18f5ce29..af2e1850d5 100644 --- a/src/plugins/winrt/winrtrunconfiguration.h +++ b/src/plugins/winrt/winrtrunconfiguration.h @@ -40,7 +40,7 @@ class WinRtRunConfiguration : public ProjectExplorer::RunConfiguration Q_OBJECT public: - explicit WinRtRunConfiguration(ProjectExplorer::Target *parent, const Core::Id &id); + explicit WinRtRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); QWidget *createConfigurationWidget(); bool isEnabled() const { return true; } // Always enabled like DLL run control diff --git a/src/plugins/winrt/winrtrunfactories.cpp b/src/plugins/winrt/winrtrunfactories.cpp index 7f1a33a9f5..c49f41b0b3 100644 --- a/src/plugins/winrt/winrtrunfactories.cpp +++ b/src/plugins/winrt/winrtrunfactories.cpp @@ -81,18 +81,18 @@ QList<Core::Id> WinRtRunConfigurationFactory::availableCreationIds(Target *paren return result; } -QString WinRtRunConfigurationFactory::displayNameForId(const Core::Id id) const +QString WinRtRunConfigurationFactory::displayNameForId(Core::Id id) const { Q_UNUSED(id); return tr("Run App Package"); } -bool WinRtRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const +bool WinRtRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { return id == winrtConfigurationIdC && isKitCompatible(parent->kit()); } -RunConfiguration *WinRtRunConfigurationFactory::doCreate(Target *parent, const Core::Id id) +RunConfiguration *WinRtRunConfigurationFactory::doCreate(Target *parent, Core::Id id) { return new WinRtRunConfiguration(parent, id); } diff --git a/src/plugins/winrt/winrtrunfactories.h b/src/plugins/winrt/winrtrunfactories.h index 4e4fbafa2c..2df07f6e7f 100644 --- a/src/plugins/winrt/winrtrunfactories.h +++ b/src/plugins/winrt/winrtrunfactories.h @@ -44,15 +44,15 @@ public: WinRtRunConfigurationFactory(); QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(const Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const; + QString displayNameForId(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); private: - virtual ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id); + virtual ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); virtual ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, const QVariantMap &map); }; |