Commit c95d83d6 authored by ck's avatar ck
Browse files

Maemo: Make device configuration id type consistent.

Task-number: QTCREATORBUG-1460
parent b1c9784e
...@@ -116,7 +116,7 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings, ...@@ -116,7 +116,7 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
: name(settings.value(NameKey).toString()), : name(settings.value(NameKey).toString()),
type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())), type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())),
gdbServerPort(settings.value(GdbServerPortKey, defaultGdbServerPort(type)).toInt()), gdbServerPort(settings.value(GdbServerPortKey, defaultGdbServerPort(type)).toInt()),
internalId(settings.value(InternalIdKey, nextId).toInt()) internalId(settings.value(InternalIdKey, nextId).toULongLong())
{ {
if (internalId == nextId) if (internalId == nextId)
++nextId; ++nextId;
...@@ -227,7 +227,7 @@ MaemoDeviceConfig MaemoDeviceConfigurations::find(const QString &name) const ...@@ -227,7 +227,7 @@ MaemoDeviceConfig MaemoDeviceConfigurations::find(const QString &name) const
return resultIt == m_devConfigs.constEnd() ? MaemoDeviceConfig() : *resultIt; return resultIt == m_devConfigs.constEnd() ? MaemoDeviceConfig() : *resultIt;
} }
MaemoDeviceConfig MaemoDeviceConfigurations::find(int id) const MaemoDeviceConfig MaemoDeviceConfigurations::find(quint64 id) const
{ {
QList<MaemoDeviceConfig>::ConstIterator resultIt = QList<MaemoDeviceConfig>::ConstIterator resultIt =
std::find_if(m_devConfigs.constBegin(), m_devConfigs.constEnd(), std::find_if(m_devConfigs.constBegin(), m_devConfigs.constEnd(),
......
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
QList<MaemoDeviceConfig> devConfigs() const { return m_devConfigs; } QList<MaemoDeviceConfig> devConfigs() const { return m_devConfigs; }
void setDevConfigs(const QList<MaemoDeviceConfig> &devConfigs); void setDevConfigs(const QList<MaemoDeviceConfig> &devConfigs);
MaemoDeviceConfig find(const QString &name) const; MaemoDeviceConfig find(const QString &name) const;
MaemoDeviceConfig find(int id) const; MaemoDeviceConfig find(quint64 id) const;
signals: signals:
void updated(); void updated();
......
...@@ -155,7 +155,7 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map) ...@@ -155,7 +155,7 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
return false; return false;
setDeviceConfig(MaemoDeviceConfigurations::instance(). setDeviceConfig(MaemoDeviceConfigurations::instance().
find(map.value(DeviceIdKey, 0).toInt())); find(map.value(DeviceIdKey, 0).toULongLong()));
m_arguments = map.value(ArgumentsKey).toStringList(); m_arguments = map.value(ArgumentsKey).toStringList();
getDeployTimesFromMap(map); getDeployTimesFromMap(map);
const QDir dir = QDir(target()->project()->projectDirectory()); const QDir dir = QDir(target()->project()->projectDirectory());
......
Supports Markdown
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