From cad3bb8085a1aa5e8454a467991f207682a98908 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 16 Nov 2011 09:37:29 +0000
Subject: [PATCH] Linux device: s/name()/displayName()/
We use displayName for user visible names everywhere, so we should
also do that here.
Change-Id: I3d976c06fa04733ff82ea208efc0a17f86cc0d79
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
.../remotelinux/linuxdeviceconfiguration.cpp | 14 +++++++-------
src/plugins/remotelinux/linuxdeviceconfiguration.h | 4 ++--
.../remotelinux/linuxdeviceconfigurations.cpp | 8 ++++----
.../linuxdeviceconfigurationssettingswidget.cpp | 4 ++--
src/plugins/remotelinux/remotelinuxutils.cpp | 2 +-
.../typespecificdeviceconfigurationlistmodel.cpp | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
index 4405d600f32..1bcb32eb914 100644
--- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
@@ -74,7 +74,7 @@ public:
}
SshConnectionParameters sshParameters;
- QString name;
+ QString displayName;
QString osType;
LinuxDeviceConfiguration::DeviceType deviceType;
PortList freePorts;
@@ -115,7 +115,7 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QS
Origin origin)
: d(new LinuxDeviceConfigurationPrivate(sshParams))
{
- d->name = name;
+ d->displayName = name;
d->osType = osType;
d->deviceType = deviceType;
d->freePorts = freePorts;
@@ -127,7 +127,7 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings, Id
: d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy))
{
d->origin = ManuallyAdded;
- d->name = settings.value(NameKey).toString();
+ d->displayName = settings.value(NameKey).toString();
d->osType = settings.value(OsTypeKey).toString();
d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
d->isDefault = settings.value(IsDefaultKey, false).toBool();
@@ -162,7 +162,7 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings, Id
LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &other)
: d(new LinuxDeviceConfigurationPrivate(other->d->sshParameters))
{
- d->name = other->d->name;
+ d->displayName = other->d->displayName;
d->osType = other->d->osType;
d->deviceType = other->deviceType();
d->freePorts = other->freePorts();
@@ -184,7 +184,7 @@ QString LinuxDeviceConfiguration::defaultPublicKeyFilePath()
void LinuxDeviceConfiguration::save(QSettings &settings) const
{
- settings.setValue(NameKey, d->name);
+ settings.setValue(NameKey, d->displayName);
settings.setValue(OsTypeKey, d->osType);
settings.setValue(TypeKey, d->deviceType);
settings.setValue(HostKey, d->sshParameters.host);
@@ -230,11 +230,11 @@ bool LinuxDeviceConfiguration::isAutoDetected() const
}
PortList LinuxDeviceConfiguration::freePorts() const { return d->freePorts; }
-QString LinuxDeviceConfiguration::name() const { return d->name; }
+QString LinuxDeviceConfiguration::displayName() const { return d->displayName; }
QString LinuxDeviceConfiguration::osType() const { return d->osType; }
bool LinuxDeviceConfiguration::isDefault() const { return d->isDefault; }
-void LinuxDeviceConfiguration::setName(const QString &name) { d->name = name; }
+void LinuxDeviceConfiguration::setDisplayName(const QString &name) { d->displayName = name; }
void LinuxDeviceConfiguration::setInternalId(Id id) { d->internalId = id; }
void LinuxDeviceConfiguration::setDefault(bool isDefault) { d->isDefault = isDefault; }
diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h
index 57c3a6fd327..9283f09efdf 100644
--- a/src/plugins/remotelinux/linuxdeviceconfiguration.h
+++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h
@@ -72,7 +72,7 @@ public:
PortList freePorts() const;
Utils::SshConnectionParameters sshParameters() const;
- QString name() const;
+ QString displayName() const;
QString osType() const;
DeviceType deviceType() const;
Id internalId() const;
@@ -100,7 +100,7 @@ private:
static Ptr create(const QSettings &settings, Id &nextId);
static Ptr create(const ConstPtr &other);
- void setName(const QString &name);
+ void setDisplayName(const QString &name);
void setInternalId(Id id);
void setDefault(bool isDefault);
void setSshParameters(const Utils::SshConnectionParameters &sshParameters);
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
index 51372768c07..79bab393a92 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
@@ -60,7 +60,7 @@ public:
DevConfNameMatcher(const QString &name) : m_name(name) {}
bool operator()(const LinuxDeviceConfiguration::ConstPtr &devConfig)
{
- return devConfig->name() == m_name;
+ return devConfig->displayName() == m_name;
}
private:
const QString m_name;
@@ -151,7 +151,7 @@ void LinuxDeviceConfigurations::addConfiguration(const LinuxDeviceConfiguration:
QTC_ASSERT(this != LinuxDeviceConfigurationsPrivate::instance, return);
// Ensure uniqueness of name.
- QString name = devConfig->name();
+ QString name = devConfig->displayName();
if (hasConfig(name)) {
const QString nameTemplate = name + QLatin1String(" (%1)");
int suffix = 2;
@@ -159,7 +159,7 @@ void LinuxDeviceConfigurations::addConfiguration(const LinuxDeviceConfiguration:
name = nameTemplate.arg(QString::number(suffix++));
while (hasConfig(name));
}
- devConfig->setName(name);
+ devConfig->setDisplayName(name);
devConfig->setInternalId(d->nextId++);
beginInsertRows(QModelIndex(), rowCount(), rowCount());
@@ -374,7 +374,7 @@ QVariant LinuxDeviceConfigurations::data(const QModelIndex &index, int role) con
if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole)
return QVariant();
const LinuxDeviceConfiguration::ConstPtr devConf = deviceAt(index.row());
- QString name = devConf->name();
+ QString name = devConf->displayName();
if (devConf->isDefault()) {
name += QLatin1Char(' ') + tr("(default for %1)")
.arg(RemoteLinuxUtils::osTypeToString(devConf->osType()));
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
index 344d6e8c6e1..6a81f81280d 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
@@ -216,7 +216,7 @@ void LinuxDeviceConfigurationsSettingsWidget::displayCurrent()
m_ui->passwordButton->setChecked(true);
else
m_ui->keyButton->setChecked(true);
- m_nameValidator->setDisplayName(current->name());
+ m_nameValidator->setDisplayName(current->displayName());
m_ui->timeoutSpinBox->setValue(sshParams.timeout);
m_ui->removeConfigButton->setEnabled(!current->isAutoDetected());
m_ui->hostLineEdit->setEnabled(!current->isAutoDetected());
@@ -227,7 +227,7 @@ void LinuxDeviceConfigurationsSettingsWidget::displayCurrent()
void LinuxDeviceConfigurationsSettingsWidget::fillInValues()
{
const LinuxDeviceConfiguration::ConstPtr ¤t = currentConfig();
- m_ui->nameLineEdit->setText(current->name());
+ m_ui->nameLineEdit->setText(current->displayName());
const SshConnectionParameters &sshParams = current->sshParameters();
m_ui->hostLineEdit->setText(sshParams.host);
m_ui->sshPortSpinBox->setValue(sshParams.port);
diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp
index ba12b2137dd..601040330da 100644
--- a/src/plugins/remotelinux/remotelinuxutils.cpp
+++ b/src/plugins/remotelinux/remotelinuxutils.cpp
@@ -91,7 +91,7 @@ QString RemoteLinuxUtils::osTypeToString(const QString &osType)
QString RemoteLinuxUtils::deviceConfigurationName(const LinuxDeviceConfiguration::ConstPtr &devConf)
{
- return devConf ? devConf->name() : QCoreApplication::translate("RemoteLinux", "(No device)");
+ return devConf ? devConf->displayName() : QCoreApplication::translate("RemoteLinux", "(No device)");
}
} // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index 40a76ee1d2c..5493720858e 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -74,7 +74,7 @@ QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index
return QVariant();
const LinuxDeviceConfiguration::ConstPtr &devConf = deviceAt(index.row());
Q_ASSERT(devConf);
- QString displayedName = devConf->name();
+ QString displayedName = devConf->displayName();
if (devConf->isDefault() && devConf->osType() == m_targetOsType)
displayedName += QLatin1Char(' ') + tr("(default)");
return displayedName;
--
GitLab