Commit 83192865 authored by Tobias Hunger's avatar Tobias Hunger

Fix warnings on windows

Fix warnings on windows about overwriting virtual functions

Change-Id: I83e0262627faa4ce23624678de1b69f30624dc6a
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent fd547e4c
......@@ -141,7 +141,7 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const
return result;
}
bool MaemoQtVersion::supportsTargetId(Core::Id id) const
bool MaemoQtVersion::supportsTargetId(const Core::Id id) const
{
return supportedTargetIds().contains(id);
}
......
......@@ -53,7 +53,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
void addToEnvironment(Utils::Environment &env) const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -75,7 +75,7 @@ MaemoRunConfigurationFactory::~MaemoRunConfigurationFactory()
{
}
bool MaemoRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
bool MaemoRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
{
return qobject_cast<Qt4BaseTarget *>(parent)->qt4Project()
->hasApplicationProFile(pathFromId(id));
......@@ -109,13 +109,13 @@ QList<Core::Id> MaemoRunConfigurationFactory::availableCreationIds(Target *paren
return result;
}
QString MaemoRunConfigurationFactory::displayNameForId(Core::Id id) const
QString MaemoRunConfigurationFactory::displayNameForId(const Core::Id id) const
{
return QFileInfo(pathFromId(id)).completeBaseName()
+ QLatin1String(" (on remote Maemo device)");
}
RunConfiguration *MaemoRunConfigurationFactory::create(Target *parent, Core::Id id)
RunConfiguration *MaemoRunConfigurationFactory::create(Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
......
......@@ -57,11 +57,11 @@ public:
explicit MaemoRunConfigurationFactory(QObject *parent = 0);
~MaemoRunConfigurationFactory();
QString displayNameForId(Core::Id id) const;
QString displayNameForId(const Core::Id id) const;
QList<Core::Id> availableCreationIds(Target *parent) const;
bool canCreate(Target *parent, Core::Id id) const;
RunConfiguration *create(Target *parent, Core::Id id);
bool canCreate(Target *parent, const Core::Id id) const;
RunConfiguration *create(Target *parent, const Core::Id id);
bool canRestore(Target *parent, const QVariantMap &map) const;
RunConfiguration *restore(Target *parent, const QVariantMap &map);
......
......@@ -130,7 +130,7 @@ QList<Core::Id> Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target
return ids;
}
QString Qt4MaemoDeployConfigurationFactory::displayNameForId(Core::Id id) const
QString Qt4MaemoDeployConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (id == Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId())
return tr("Copy Files to Maemo5 Device");
......@@ -144,13 +144,13 @@ QString Qt4MaemoDeployConfigurationFactory::displayNameForId(Core::Id id) const
}
bool Qt4MaemoDeployConfigurationFactory::canCreate(Target *parent,
Core::Id id) const
const Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
DeployConfiguration *Qt4MaemoDeployConfigurationFactory::create(Target *parent,
Core::Id id)
const Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
......
......@@ -51,9 +51,9 @@ public:
explicit Qt4MaemoDeployConfigurationFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
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);
bool canRestore(ProjectExplorer::Target *parent,
const QVariantMap &map) const;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
......
......@@ -164,7 +164,7 @@ QList<Core::Id> DeployConfigurationFactory::availableCreationIds(Target *parent)
return QList<Core::Id>() << Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
}
QString DeployConfigurationFactory::displayNameForId(Core::Id id) const
QString DeployConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (id == Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID))
//: Display name of the default deploy configuration
......@@ -172,13 +172,13 @@ QString DeployConfigurationFactory::displayNameForId(Core::Id id) const
return QString();
}
bool DeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
bool DeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
{
Q_UNUSED(parent);
return id == Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
}
DeployConfiguration *DeployConfigurationFactory::create(Target *parent, Core::Id id)
DeployConfiguration *DeployConfigurationFactory::create(Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
......
......@@ -97,10 +97,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(Core::Id id) const;
virtual QString displayNameForId(const Core::Id id) const;
virtual bool canCreate(Target *parent, Core::Id id) const;
virtual DeployConfiguration *create(Target *parent, Core::Id id);
virtual bool canCreate(Target *parent, const Core::Id id) const;
virtual DeployConfiguration *create(Target *parent, const 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);
......
......@@ -90,7 +90,7 @@ private:
class CreateMatcher : public RunConfigurationFactoryMatcher
{
public:
CreateMatcher(Target *target, Core::Id id) :
CreateMatcher(Target *target, const Core::Id id) :
RunConfigurationFactoryMatcher(target),
m_id(id)
{ }
......@@ -101,7 +101,7 @@ public:
}
private:
Core::Id m_id;
const Core::Id m_id;
};
class CloneMatcher : public RunConfigurationFactoryMatcher
......
......@@ -84,7 +84,7 @@ QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const
return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
}
bool DesktopQtVersion::supportsTargetId(Core::Id id) const
bool DesktopQtVersion::supportsTargetId(const Core::Id id) const
{
using namespace ProjectExplorer;
if (id == Core::Id(Constants::DESKTOP_TARGET_ID))
......
......@@ -53,7 +53,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -85,7 +85,7 @@ QList<ProjectExplorer::Abi> SimulatorQtVersion::detectQtAbis() const
return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
}
bool SimulatorQtVersion::supportsTargetId(Core::Id id) const
bool SimulatorQtVersion::supportsTargetId(const Core::Id id) const
{
return id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID);
}
......
......@@ -53,7 +53,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -392,14 +392,14 @@ QList<Core::Id> S60DeployConfigurationFactory::availableCreationIds(Target *pare
return result;
}
QString S60DeployConfigurationFactory::displayNameForId(Core::Id id) const
QString S60DeployConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (!pathFromId(id).isEmpty())
return tr("%1 on Symbian Device").arg(QFileInfo(pathFromId(id)).completeBaseName());
return QString();
}
DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, Core::Id id)
DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, const Core::Id id)
{
if (!canCreate(parent, id))
return 0;
......@@ -413,7 +413,7 @@ DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, Core:
return dc;
}
bool S60DeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
bool S60DeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
{
Qt4SymbianTarget * t = qobject_cast<Qt4SymbianTarget *>(parent);
if (!t || t->id() != Core::Id(Constants::S60_DEVICE_TARGET_ID)
......
......@@ -138,8 +138,8 @@ public:
explicit S60DeployConfigurationFactory(QObject *parent = 0);
~S60DeployConfigurationFactory();
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const 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;
......@@ -147,7 +147,7 @@ public:
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
// used to translate the ids to names to display to the user
QString displayNameForId(Core::Id id) const;
QString displayNameForId(const Core::Id id) const;
};
} // namespace Qt4ProjectManager
......
......@@ -155,7 +155,7 @@ QList<ProjectExplorer::Abi> SymbianQtVersion::detectQtAbis() const
32);
}
bool SymbianQtVersion::supportsTargetId(Core::Id id) const
bool SymbianQtVersion::supportsTargetId(const Core::Id id) const
{
return supportedTargetIds().contains(id);
}
......
......@@ -61,7 +61,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -70,7 +70,7 @@ public:
/// suffix should be unique
virtual QString shadowBuildDirectory(const QString &profilePath, const Core::Id id, const QString &suffix);
/// used by the default implementation of shadowBuildDirectory
virtual QString buildNameForId(Core::Id id) const;
virtual QString buildNameForId(const Core::Id id) const;
/// used by the default implementation of createTargetSetupWidget
/// not needed otherwise
......
......@@ -125,7 +125,7 @@ class Qt4DefaultTargetSetupWidget : public Qt4TargetSetupWidget
public:
enum ShadowBuildOption { DISABLE, ENABLE, USER };
Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *factory,
Core::Id id,
const Core::Id id,
const QString &proFilePath,
const QList<BuildConfigurationInfo> &info,
const QtSupport::QtVersionNumber &minimumQtVersion,
......
......@@ -79,7 +79,7 @@ QList<ProjectExplorer::Abi> WinCeQtVersion::detectQtAbis() const
false);
}
bool WinCeQtVersion::supportsTargetId(Core::Id id) const
bool WinCeQtVersion::supportsTargetId(const Core::Id id) const
{
return id == Core::Id(Constants::DESKTOP_TARGET_ID);
}
......
......@@ -51,7 +51,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -370,7 +370,7 @@ Utils::FileName BaseQtVersion::qmakeCommand() const
return m_qmakeCommand;
}
bool BaseQtVersion::toolChainAvailable(Core::Id id) const
bool BaseQtVersion::toolChainAvailable(const Core::Id id) const
{
Q_UNUSED(id)
if (!isValid())
......
......@@ -121,12 +121,12 @@ public:
virtual QString invalidReason() const;
virtual QString warningReason() const;
virtual bool toolChainAvailable(Core::Id id) const;
virtual bool toolChainAvailable(const Core::Id id) const;
virtual QString description() const = 0;
virtual QString toHtml(bool verbose) const;
virtual bool supportsTargetId(Core::Id id) const = 0;
virtual bool supportsTargetId(const Core::Id id) const = 0;
virtual QSet<Core::Id> supportedTargetIds() const = 0;
QList<ProjectExplorer::Abi> qtAbis() const;
virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0;
......
......@@ -74,7 +74,7 @@ QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
}
bool EmbeddedLinuxQtVersion::supportsTargetId(Core::Id id) const
bool EmbeddedLinuxQtVersion::supportsTargetId(const Core::Id id) const
{
return id == Core::Id(Constants::EMBEDDED_LINUX_TARGET_ID);
}
......
......@@ -52,7 +52,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
bool supportsTargetId(Core::Id id) const;
bool supportsTargetId(const Core::Id id) const;
QSet<Core::Id> supportedTargetIds() const;
QString description() const;
......
......@@ -59,20 +59,20 @@ QList<Core::Id> RemoteLinuxDeployConfigurationFactory::availableCreationIds(Targ
return ids;
}
QString RemoteLinuxDeployConfigurationFactory::displayNameForId(Core::Id id) const
QString RemoteLinuxDeployConfigurationFactory::displayNameForId(const Core::Id id) const
{
if (id == genericDeployConfigurationId())
return genericLinuxDisplayName();
return QString();
}
bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
{
return availableCreationIds(parent).contains(id);
}
DeployConfiguration *RemoteLinuxDeployConfigurationFactory::create(Target *parent,
Core::Id id)
const Core::Id id)
{
Q_ASSERT(canCreate(parent, id));
......
......@@ -45,9 +45,9 @@ public:
explicit RemoteLinuxDeployConfigurationFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
QString displayNameForId(Core::Id id) const;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
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);
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment