diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index e4b92a75957..f1a5fa02fb9 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -74,7 +74,7 @@ AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, AbstractPackagi void AbstractPackagingStep::ctor() { - m_d = new Internal::AbstractPackagingStepPrivate; + d = new Internal::AbstractPackagingStepPrivate; connect(target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), SLOT(handleBuildConfigurationChanged())); handleBuildConfigurationChanged(); @@ -82,16 +82,16 @@ void AbstractPackagingStep::ctor() AbstractPackagingStep::~AbstractPackagingStep() { - delete m_d; + delete d; } void AbstractPackagingStep::handleBuildConfigurationChanged() { - if (m_d->currentBuildConfiguration) - disconnect(m_d->currentBuildConfiguration, 0, this, 0); - m_d->currentBuildConfiguration = target()->activeBuildConfiguration(); - if (m_d->currentBuildConfiguration) { - connect(m_d->currentBuildConfiguration, SIGNAL(buildDirectoryChanged()), this, + if (d->currentBuildConfiguration) + disconnect(d->currentBuildConfiguration, 0, this, 0); + d->currentBuildConfiguration = target()->activeBuildConfiguration(); + if (d->currentBuildConfiguration) { + connect(d->currentBuildConfiguration, SIGNAL(buildDirectoryChanged()), this, SIGNAL(packageFilePathChanged())); } emit packageFilePathChanged(); @@ -106,10 +106,10 @@ QString AbstractPackagingStep::packageFilePath() const QString AbstractPackagingStep::packageDirectory() const { - if (m_d->running) - return m_d->cachedPackageDirectory; - return m_d->currentBuildConfiguration - ? m_d->currentBuildConfiguration->buildDirectory() : QString(); + if (d->running) + return d->cachedPackageDirectory; + return d->currentBuildConfiguration + ? d->currentBuildConfiguration->buildDirectory() : QString(); } RemoteLinuxDeployConfiguration *AbstractPackagingStep::deployConfiguration() const @@ -136,18 +136,18 @@ bool AbstractPackagingStep::isPackagingNeeded() const bool AbstractPackagingStep::init() { - m_d->cachedPackageDirectory = packageDirectory(); + d->cachedPackageDirectory = packageDirectory(); return true; } void AbstractPackagingStep::setPackagingStarted() { - m_d->running = true; + d->running = true; } void AbstractPackagingStep::setPackagingFinished(bool success) { - m_d->running = false; + d->running = false; if (success) deployConfiguration()->deploymentInfo()->setUnmodified(); } diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index d381ba97446..3d00d3a057e 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -45,7 +45,7 @@ class AbstractPackagingStepPrivate; class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildStep { Q_OBJECT - Q_DISABLE_COPY(AbstractPackagingStep) + public: AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, const QString &id); AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other); @@ -75,7 +75,7 @@ private: void ctor(); - Internal::AbstractPackagingStepPrivate *m_d; + Internal::AbstractPackagingStepPrivate *d; }; } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index d9c89759018..9d65932c616 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -53,13 +53,13 @@ public: } // namespace Internal AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, const QString &id) - : BuildStep(bsl, id), m_d(new Internal::AbstractRemoteLinuxDeployStepPrivate) + : BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate) { } AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, AbstractRemoteLinuxDeployStep *other) - : BuildStep(bsl, other), m_d(new Internal::AbstractRemoteLinuxDeployStepPrivate) + : BuildStep(bsl, other), d(new Internal::AbstractRemoteLinuxDeployStepPrivate) { } @@ -96,18 +96,18 @@ void AbstractRemoteLinuxDeployStep::run(QFutureInterface &fi) connect(deployService(), SIGNAL(stdErrData(QString)), SLOT(handleStdErrData(QString))); connect(deployService(), SIGNAL(finished()), SLOT(handleFinished())); - m_d->hasError = false; - m_d->future = fi; + d->hasError = false; + d->future = fi; deployService()->start(); } void AbstractRemoteLinuxDeployStep::cancel() { - if (m_d->hasError) + if (d->hasError) return; emit addOutput(tr("User requests deployment to stop; cleaning up."), MessageOutput); - m_d->hasError = true; + d->hasError = true; deployService()->stop(); } @@ -130,17 +130,17 @@ void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message) { emit addTask(Task(Task::Error, message, QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); - m_d->hasError = true; + d->hasError = true; } void AbstractRemoteLinuxDeployStep::handleFinished() { - if (m_d->hasError) + if (d->hasError) emit addOutput(tr("Deploy step failed."), ErrorMessageOutput); else emit addOutput(tr("Deploy step finished."), MessageOutput); disconnect(deployService(), 0, this, 0); - m_d->future.reportResult(!m_d->hasError); + d->future.reportResult(!d->hasError); emit finished(); } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 38a063814bd..3a6d397c6d0 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -49,7 +49,6 @@ class AbstractRemoteLinuxDeployStepPrivate; class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer::BuildStep { Q_OBJECT - Q_DISABLE_COPY(AbstractRemoteLinuxDeployStep) public: bool fromMap(const QVariantMap &map); @@ -77,7 +76,7 @@ private slots: void handleStdErrData(const QString &data); private: - Internal::AbstractRemoteLinuxDeployStepPrivate *m_d; + Internal::AbstractRemoteLinuxDeployStepPrivate *d; }; } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index c10321351bf..d9cf9768c7d 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -109,7 +109,7 @@ GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList GenericDirectUploadStep::~GenericDirectUploadStep() { - delete m_d; + delete d; } BuildStepConfigWidget *GenericDirectUploadStep::createConfigWidget() @@ -131,7 +131,7 @@ bool GenericDirectUploadStep::isDeploymentPossible(QString *whyNot) const GenericDirectUploadService *GenericDirectUploadStep::deployService() const { - return &m_d->deployService; + return &d->deployService; } bool GenericDirectUploadStep::fromMap(const QVariantMap &map) @@ -152,17 +152,17 @@ QVariantMap GenericDirectUploadStep::toMap() const void GenericDirectUploadStep::ctor() { setDefaultDisplayName(displayName()); - m_d = new Internal::GenericDirectUploadStepPrivate; + d = new Internal::GenericDirectUploadStepPrivate; } void GenericDirectUploadStep::setIncrementalDeployment(bool incremental) { - m_d->incremental = incremental; + d->incremental = incremental; } bool GenericDirectUploadStep::incrementalDeployment() const { - return m_d->incremental; + return d->incremental; } QString GenericDirectUploadStep::stepId() diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index 75604290a1e..e7e09233eed 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/src/plugins/remotelinux/genericdirectuploadstep.h @@ -66,7 +66,7 @@ private: void ctor(); - Internal::GenericDirectUploadStepPrivate *m_d; + Internal::GenericDirectUploadStepPrivate *d; }; } //namespace RemoteLinux diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp index 23afdb92f14..af6dd40bb79 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp @@ -89,7 +89,7 @@ using namespace Internal; LinuxDeviceConfiguration::~LinuxDeviceConfiguration() { - delete m_d; + delete d; } LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QSettings &settings, @@ -113,62 +113,62 @@ LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QString &na LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QString &osType, DeviceType deviceType, const PortList &freePorts, const SshConnectionParameters &sshParams, Origin origin) - : m_d(new LinuxDeviceConfigurationPrivate(sshParams)) + : d(new LinuxDeviceConfigurationPrivate(sshParams)) { - m_d->name = name; - m_d->osType = osType; - m_d->deviceType = deviceType; - m_d->freePorts = freePorts; - m_d->isDefault = false; - m_d->origin = origin; + d->name = name; + d->osType = osType; + d->deviceType = deviceType; + d->freePorts = freePorts; + d->isDefault = false; + d->origin = origin; } LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings, Id &nextId) - : m_d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy)) + : d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy)) { - m_d->origin = ManuallyAdded; - m_d->name = settings.value(NameKey).toString(); - m_d->osType = settings.value(OsTypeKey).toString(); - m_d->deviceType = static_cast(settings.value(TypeKey, DefaultDeviceType).toInt()); - m_d->isDefault = settings.value(IsDefaultKey, false).toBool(); - m_d->internalId = settings.value(InternalIdKey, nextId).toULongLong(); + d->origin = ManuallyAdded; + d->name = settings.value(NameKey).toString(); + d->osType = settings.value(OsTypeKey).toString(); + d->deviceType = static_cast(settings.value(TypeKey, DefaultDeviceType).toInt()); + d->isDefault = settings.value(IsDefaultKey, false).toBool(); + d->internalId = settings.value(InternalIdKey, nextId).toULongLong(); - if (m_d->internalId == nextId) + if (d->internalId == nextId) ++nextId; // Convert from version < 2.3. - if (m_d->osType.isEmpty()) { + if (d->osType.isEmpty()) { const int oldOsType = settings.value(OldOsVersionKey, -1).toInt(); switch (oldOsType) { - case 0: m_d->osType = QLatin1String("Maemo5OsType"); break; - case 1: m_d->osType = QLatin1String("HarmattanOsType"); break; - case 2: m_d->osType = QLatin1String("MeeGoOsType"); break; - default: m_d->osType = QLatin1String(Constants::GenericLinuxOsType); + case 0: d->osType = QLatin1String("Maemo5OsType"); break; + case 1: d->osType = QLatin1String("HarmattanOsType"); break; + case 2: d->osType = QLatin1String("MeeGoOsType"); break; + default: d->osType = QLatin1String(Constants::GenericLinuxOsType); } } - m_d->freePorts = PortList::fromString(settings.value(PortsSpecKey, QLatin1String("10000-10100")).toString()); - m_d->sshParameters.host = settings.value(HostKey).toString(); - m_d->sshParameters.port = settings.value(SshPortKey, 22).toInt(); - m_d->sshParameters.userName = settings.value(UserNameKey).toString(); - m_d->sshParameters.authenticationType + d->freePorts = PortList::fromString(settings.value(PortsSpecKey, QLatin1String("10000-10100")).toString()); + d->sshParameters.host = settings.value(HostKey).toString(); + d->sshParameters.port = settings.value(SshPortKey, 22).toInt(); + d->sshParameters.userName = settings.value(UserNameKey).toString(); + d->sshParameters.authenticationType = static_cast(settings.value(AuthKey, DefaultAuthType).toInt()); - m_d->sshParameters.password = settings.value(PasswordKey).toString(); - m_d->sshParameters.privateKeyFile + d->sshParameters.password = settings.value(PasswordKey).toString(); + d->sshParameters.privateKeyFile = settings.value(KeyFileKey, defaultPrivateKeyFilePath()).toString(); - m_d->sshParameters.timeout = settings.value(TimeoutKey, DefaultTimeout).toInt(); + d->sshParameters.timeout = settings.value(TimeoutKey, DefaultTimeout).toInt(); } LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &other) - : m_d(new LinuxDeviceConfigurationPrivate(other->m_d->sshParameters)) + : d(new LinuxDeviceConfigurationPrivate(other->d->sshParameters)) { - m_d->name = other->m_d->name; - m_d->osType = other->m_d->osType; - m_d->deviceType = other->deviceType(); - m_d->freePorts = other->freePorts(); - m_d->isDefault = other->m_d->isDefault; - m_d->origin = other->m_d->origin; - m_d->internalId = other->m_d->internalId; + d->name = other->d->name; + d->osType = other->d->osType; + d->deviceType = other->deviceType(); + d->freePorts = other->freePorts(); + d->isDefault = other->d->isDefault; + d->origin = other->d->origin; + d->internalId = other->d->internalId; } QString LinuxDeviceConfiguration::defaultPrivateKeyFilePath() @@ -184,59 +184,59 @@ QString LinuxDeviceConfiguration::defaultPublicKeyFilePath() void LinuxDeviceConfiguration::save(QSettings &settings) const { - settings.setValue(NameKey, m_d->name); - settings.setValue(OsTypeKey, m_d->osType); - settings.setValue(TypeKey, m_d->deviceType); - settings.setValue(HostKey, m_d->sshParameters.host); - settings.setValue(SshPortKey, m_d->sshParameters.port); - settings.setValue(PortsSpecKey, m_d->freePorts.toString()); - settings.setValue(UserNameKey, m_d->sshParameters.userName); - settings.setValue(AuthKey, m_d->sshParameters.authenticationType); - settings.setValue(PasswordKey, m_d->sshParameters.password); - settings.setValue(KeyFileKey, m_d->sshParameters.privateKeyFile); - settings.setValue(TimeoutKey, m_d->sshParameters.timeout); - settings.setValue(IsDefaultKey, m_d->isDefault); - settings.setValue(InternalIdKey, m_d->internalId); + settings.setValue(NameKey, d->name); + settings.setValue(OsTypeKey, d->osType); + settings.setValue(TypeKey, d->deviceType); + settings.setValue(HostKey, d->sshParameters.host); + settings.setValue(SshPortKey, d->sshParameters.port); + settings.setValue(PortsSpecKey, d->freePorts.toString()); + settings.setValue(UserNameKey, d->sshParameters.userName); + settings.setValue(AuthKey, d->sshParameters.authenticationType); + settings.setValue(PasswordKey, d->sshParameters.password); + settings.setValue(KeyFileKey, d->sshParameters.privateKeyFile); + settings.setValue(TimeoutKey, d->sshParameters.timeout); + settings.setValue(IsDefaultKey, d->isDefault); + settings.setValue(InternalIdKey, d->internalId); } SshConnectionParameters LinuxDeviceConfiguration::sshParameters() const { - return m_d->sshParameters; + return d->sshParameters; } LinuxDeviceConfiguration::DeviceType LinuxDeviceConfiguration::deviceType() const { - return m_d->deviceType; + return d->deviceType; } LinuxDeviceConfiguration::Id LinuxDeviceConfiguration::internalId() const { - return m_d->internalId; + return d->internalId; } void LinuxDeviceConfiguration::setSshParameters(const SshConnectionParameters &sshParameters) { - m_d->sshParameters = sshParameters; + d->sshParameters = sshParameters; } void LinuxDeviceConfiguration::setFreePorts(const PortList &freePorts) { - m_d->freePorts = freePorts; + d->freePorts = freePorts; } bool LinuxDeviceConfiguration::isAutoDetected() const { - return m_d->origin == AutoDetected; + return d->origin == AutoDetected; } -PortList LinuxDeviceConfiguration::freePorts() const { return m_d->freePorts; } -QString LinuxDeviceConfiguration::name() const { return m_d->name; } -QString LinuxDeviceConfiguration::osType() const { return m_d->osType; } -bool LinuxDeviceConfiguration::isDefault() const { return m_d->isDefault; } +PortList LinuxDeviceConfiguration::freePorts() const { return d->freePorts; } +QString LinuxDeviceConfiguration::name() const { return d->name; } +QString LinuxDeviceConfiguration::osType() const { return d->osType; } +bool LinuxDeviceConfiguration::isDefault() const { return d->isDefault; } -void LinuxDeviceConfiguration::setName(const QString &name) { m_d->name = name; } -void LinuxDeviceConfiguration::setInternalId(Id id) { m_d->internalId = id; } -void LinuxDeviceConfiguration::setDefault(bool isDefault) { m_d->isDefault = isDefault; } +void LinuxDeviceConfiguration::setName(const QString &name) { d->name = name; } +void LinuxDeviceConfiguration::setInternalId(Id id) { d->internalId = id; } +void LinuxDeviceConfiguration::setDefault(bool isDefault) { d->isDefault = isDefault; } const LinuxDeviceConfiguration::Id LinuxDeviceConfiguration::InvalidId = 0; diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h index d633df155c4..b1b2abbb83d 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.h +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h @@ -107,7 +107,7 @@ private: void setFreePorts(const PortList &freePorts); void save(QSettings &settings) const; - Internal::LinuxDeviceConfigurationPrivate *m_d; + Internal::LinuxDeviceConfigurationPrivate *d; };