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

Maemo: Style stuff.

Browse Source
This commit is contained in:
Christian Kandeler
2011-01-13 15:01:46 +01:00
parent a8bea59d88
commit 85df1a325f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -212,7 +212,7 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QString &name, DeviceType devType,
} }
MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings, MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
Id &nextId) Id &nextId)
: m_sshParameters(Core::SshConnectionParameters::NoProxy), : m_sshParameters(Core::SshConnectionParameters::NoProxy),
m_name(settings.value(NameKey).toString()), m_name(settings.value(NameKey).toString()),
m_type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())), m_type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())),
@@ -348,13 +348,13 @@ void MaemoDeviceConfigurations::initShadowDevConfs()
m_shadowDevConfigs.push_back(MaemoDeviceConfig::Ptr()); m_shadowDevConfigs.push_back(MaemoDeviceConfig::Ptr());
} }
void MaemoDeviceConfigurations::setupShadowDevConf(int i) void MaemoDeviceConfigurations::setupShadowDevConf(int idx)
{ {
MaemoDeviceConfig::Ptr shadowConf = m_shadowDevConfigs.at(i); MaemoDeviceConfig::Ptr shadowConf = m_shadowDevConfigs.at(idx);
if (shadowConf) if (shadowConf)
return; return;
const MaemoDeviceConfig::Ptr devConf = m_devConfigs.at(i); const MaemoDeviceConfig::Ptr devConf = m_devConfigs.at(idx);
const MaemoDeviceConfig::DeviceType shadowType const MaemoDeviceConfig::DeviceType shadowType
= devConf->type() == MaemoDeviceConfig::Physical = devConf->type() == MaemoDeviceConfig::Physical
? MaemoDeviceConfig::Simulator : MaemoDeviceConfig::Physical; ? MaemoDeviceConfig::Simulator : MaemoDeviceConfig::Physical;
@@ -366,7 +366,7 @@ void MaemoDeviceConfigurations::setupShadowDevConf(int i)
= devConf->m_sshParameters.privateKeyFile; = devConf->m_sshParameters.privateKeyFile;
shadowConf->m_isDefault = devConf->m_isDefault; shadowConf->m_isDefault = devConf->m_isDefault;
shadowConf->m_internalId = devConf->m_internalId; shadowConf->m_internalId = devConf->m_internalId;
m_shadowDevConfigs[i] = shadowConf; m_shadowDevConfigs[idx] = shadowConf;
} }
void MaemoDeviceConfigurations::addConfiguration(const QString &name, void MaemoDeviceConfigurations::addConfiguration(const QString &name,
@@ -382,13 +382,13 @@ void MaemoDeviceConfigurations::addConfiguration(const QString &name,
endInsertRows(); endInsertRows();
} }
void MaemoDeviceConfigurations::removeConfiguration(int i) void MaemoDeviceConfigurations::removeConfiguration(int idx)
{ {
Q_ASSERT(i >= 0 && i < rowCount()); Q_ASSERT(idx >= 0 && idx < rowCount());
beginRemoveRows(QModelIndex(), i, i); beginRemoveRows(QModelIndex(), idx, idx);
const bool wasDefault = deviceAt(i)->m_isDefault; const bool wasDefault = deviceAt(idx)->m_isDefault;
m_devConfigs.removeAt(i); m_devConfigs.removeAt(idx);
m_shadowDevConfigs.removeAt(i); m_shadowDevConfigs.removeAt(idx);
endRemoveRows(); endRemoveRows();
if (wasDefault && !m_devConfigs.isEmpty()) { if (wasDefault && !m_devConfigs.isEmpty()) {
m_devConfigs.first()->m_isDefault = true; m_devConfigs.first()->m_isDefault = true;
@@ -481,10 +481,10 @@ void MaemoDeviceConfigurations::load()
m_devConfigs.first()->m_isDefault = true; m_devConfigs.first()->m_isDefault = true;
} }
MaemoDeviceConfig::ConstPtr MaemoDeviceConfigurations::deviceAt(int i) const MaemoDeviceConfig::ConstPtr MaemoDeviceConfigurations::deviceAt(int idx) const
{ {
Q_ASSERT(i >= 0 && i < rowCount()); Q_ASSERT(idx >= 0 && idx < rowCount());
return m_devConfigs.at(i); return m_devConfigs.at(idx);
} }
bool MaemoDeviceConfigurations::hasConfig(const QString &name) const bool MaemoDeviceConfigurations::hasConfig(const QString &name) const

6
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
View File

@@ -148,7 +148,7 @@ public:
static void replaceInstance(const MaemoDeviceConfigurations *other); static void replaceInstance(const MaemoDeviceConfigurations *other);
static MaemoDeviceConfigurations *cloneInstance(); static MaemoDeviceConfigurations *cloneInstance();
MaemoDeviceConfig::ConstPtr deviceAt(int i) const; MaemoDeviceConfig::ConstPtr deviceAt(int index) const;
MaemoDeviceConfig::ConstPtr find(MaemoDeviceConfig::Id id) const; MaemoDeviceConfig::ConstPtr find(MaemoDeviceConfig::Id id) const;
MaemoDeviceConfig::ConstPtr defaultDeviceConfig() const; MaemoDeviceConfig::ConstPtr defaultDeviceConfig() const;
bool hasConfig(const QString &name) const; bool hasConfig(const QString &name) const;
@@ -160,7 +160,7 @@ public:
void addConfiguration(const QString &name, void addConfiguration(const QString &name,
MaemoDeviceConfig::DeviceType type); MaemoDeviceConfig::DeviceType type);
void removeConfiguration(int i); void removeConfiguration(int index);
void setConfigurationName(int i, const QString &name); void setConfigurationName(int i, const QString &name);
void setDeviceType(int i, const MaemoDeviceConfig::DeviceType type); void setDeviceType(int i, const MaemoDeviceConfig::DeviceType type);
void setSshParameters(int i, const Core::SshConnectionParameters &params); void setSshParameters(int i, const Core::SshConnectionParameters &params);
@@ -181,7 +181,7 @@ private:
void initShadowDevConfs(); void initShadowDevConfs();
static void copy(const MaemoDeviceConfigurations *source, static void copy(const MaemoDeviceConfigurations *source,
MaemoDeviceConfigurations *target, bool deep); MaemoDeviceConfigurations *target, bool deep);
void setupShadowDevConf(int i); void setupShadowDevConf(int index);
static MaemoDeviceConfigurations *m_instance; static MaemoDeviceConfigurations *m_instance;
MaemoDeviceConfig::Id m_nextId; MaemoDeviceConfig::Id m_nextId;