diff options
author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-09-15 09:10:10 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2011-09-15 10:33:56 +0200 |
commit | 8801c76a8e223b6f41a8369e75c71b67237d8d25 (patch) | |
tree | 813d0922e56bb1dbf13a4bb14a3be19dbf295619 /src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp | |
parent | 63e8b9075b3a1d502cdcbb63cb2b19e0e6208263 (diff) | |
download | qt-creator-8801c76a8e223b6f41a8369e75c71b67237d8d25.tar.gz |
Coding style: Pure virtual functions, private implementation pointers.
Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp')
-rw-r--r-- | src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 083b1fe540..d16a9a5fc9 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -62,9 +62,9 @@ using namespace Internal; RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, const QString &id, const QString &defaultDisplayName, const QString &supportedOsType) - : DeployConfiguration(target, id), m_d(new RemoteLinuxDeployConfigurationPrivate) + : DeployConfiguration(target, id), d(new RemoteLinuxDeployConfigurationPrivate) { - m_d->supportedOsType = supportedOsType; + d->supportedOsType = supportedOsType; setDefaultDisplayName(defaultDisplayName); // A DeploymentInfo object is only dependent on the active build @@ -77,14 +77,14 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer:: const RemoteLinuxDeployConfiguration * const mdc = qobject_cast<const RemoteLinuxDeployConfiguration *>(dc); if (mdc) { - m_d->deploymentInfo = mdc->deploymentInfo(); - m_d->devConfModel = mdc->m_d->devConfModel; + d->deploymentInfo = mdc->deploymentInfo(); + d->devConfModel = mdc->d->devConfModel; break; } } - if (!m_d->deploymentInfo) { - m_d->deploymentInfo = QSharedPointer<DeploymentInfo>(new DeploymentInfo(qobject_cast<Qt4BaseTarget *>(target))); - m_d->devConfModel = QSharedPointer<TypeSpecificDeviceConfigurationListModel> + if (!d->deploymentInfo) { + d->deploymentInfo = QSharedPointer<DeploymentInfo>(new DeploymentInfo(qobject_cast<Qt4BaseTarget *>(target))); + d->devConfModel = QSharedPointer<TypeSpecificDeviceConfigurationListModel> (new TypeSpecificDeviceConfigurationListModel(supportedOsType)); } @@ -93,34 +93,34 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer:: RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration *source) - : DeployConfiguration(target, source), m_d(new RemoteLinuxDeployConfigurationPrivate) + : DeployConfiguration(target, source), d(new RemoteLinuxDeployConfigurationPrivate) { - m_d->supportedOsType = source->supportedOsType(); - m_d->deploymentInfo = source->deploymentInfo(); - m_d->devConfModel = source->deviceConfigModel(); + d->supportedOsType = source->supportedOsType(); + d->deploymentInfo = source->deploymentInfo(); + d->devConfModel = source->deviceConfigModel(); initialize(); } RemoteLinuxDeployConfiguration::~RemoteLinuxDeployConfiguration() { - delete m_d; + delete d; } void RemoteLinuxDeployConfiguration::initialize() { - m_d->deviceConfiguration = deviceConfigModel()->defaultDeviceConfig(); + d->deviceConfiguration = deviceConfigModel()->defaultDeviceConfig(); connect(deviceConfigModel().data(), SIGNAL(updated()), SLOT(handleDeviceConfigurationListUpdated())); } void RemoteLinuxDeployConfiguration::handleDeviceConfigurationListUpdated() { - setDeviceConfig(LinuxDeviceConfigurations::instance()->internalId(m_d->deviceConfiguration)); + setDeviceConfig(LinuxDeviceConfigurations::instance()->internalId(d->deviceConfiguration)); } void RemoteLinuxDeployConfiguration::setDeviceConfig(LinuxDeviceConfiguration::Id internalId) { - m_d->deviceConfiguration = deviceConfigModel()->find(internalId); + d->deviceConfiguration = deviceConfigModel()->find(internalId); emit deviceConfigurationListChanged(); emit currentDeviceConfigurationChanged(); } @@ -138,15 +138,15 @@ QVariantMap RemoteLinuxDeployConfiguration::toMap() const { QVariantMap map = DeployConfiguration::toMap(); map.insert(QLatin1String(DeviceIdKey), - LinuxDeviceConfigurations::instance()->internalId(m_d->deviceConfiguration)); + LinuxDeviceConfigurations::instance()->internalId(d->deviceConfiguration)); return map; } void RemoteLinuxDeployConfiguration::setDeviceConfiguration(int index) { const LinuxDeviceConfiguration::ConstPtr &newDevConf = deviceConfigModel()->deviceAt(index); - if (m_d->deviceConfiguration != newDevConf) { - m_d->deviceConfiguration = newDevConf; + if (d->deviceConfiguration != newDevConf) { + d->deviceConfiguration = newDevConf; emit currentDeviceConfigurationChanged(); } } @@ -158,22 +158,22 @@ DeployConfigurationWidget *RemoteLinuxDeployConfiguration::configurationWidget() QSharedPointer<DeploymentInfo> RemoteLinuxDeployConfiguration::deploymentInfo() const { - return m_d->deploymentInfo; + return d->deploymentInfo; } QSharedPointer<TypeSpecificDeviceConfigurationListModel> RemoteLinuxDeployConfiguration::deviceConfigModel() const { - return m_d->devConfModel; + return d->devConfModel; } LinuxDeviceConfiguration::ConstPtr RemoteLinuxDeployConfiguration::deviceConfiguration() const { - return m_d->deviceConfiguration; + return d->deviceConfiguration; } QString RemoteLinuxDeployConfiguration::supportedOsType() const { - return m_d->supportedOsType; + return d->supportedOsType; } } // namespace RemoteLinux |