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

Always pass Core::Id by value.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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