d-ptr style

Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075
Reviewed-by: hjk <qthjk@ovi.com>

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)
+    if (d->currentBuildConfiguration)
-        disconnect(m_d->currentBuildConfiguration, 0, this, 0);
+        disconnect(d->currentBuildConfiguration, 0, this, 0);
-    m_d->currentBuildConfiguration = target()->activeBuildConfiguration();
+    d->currentBuildConfiguration = target()->activeBuildConfiguration();
-    if (m_d->currentBuildConfiguration) {
+    if (d->currentBuildConfiguration) {
-        connect(m_d->currentBuildConfiguration, SIGNAL(buildDirectoryChanged()), this,
+        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)
+    if (d->running)
-        return m_d->cachedPackageDirectory;
+        return d->cachedPackageDirectory;
-    return m_d->currentBuildConfiguration
+    return d->currentBuildConfiguration
-        ? m_d->currentBuildConfiguration->buildDirectory() : QString();
+        ? 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();
 }

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

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<bool> &fi)
     connect(deployService(), SIGNAL(stdErrData(QString)), SLOT(handleStdErrData(QString)));
     connect(deployService(), SIGNAL(finished()), SLOT(handleFinished()));
 
-    m_d->hasError = false;
+    d->hasError = false;
-    m_d->future = fi;
+    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();
 }
 

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

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()

src/plugins/remotelinux/genericdirectuploadstep.h

@@ -66,7 +66,7 @@ private:
 
     void ctor();
 
-    Internal::GenericDirectUploadStepPrivate *m_d;
+    Internal::GenericDirectUploadStepPrivate *d;
 };
 
 } //namespace RemoteLinux

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;
+    d->name = name;
-    m_d->osType = osType;
+    d->osType = osType;
-    m_d->deviceType = deviceType;
+    d->deviceType = deviceType;
-    m_d->freePorts = freePorts;
+    d->freePorts = freePorts;
-    m_d->isDefault = false;
+    d->isDefault = false;
-    m_d->origin = origin;
+    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;
+    d->origin = ManuallyAdded;
-    m_d->name = settings.value(NameKey).toString();
+    d->name = settings.value(NameKey).toString();
-    m_d->osType = settings.value(OsTypeKey).toString();
+    d->osType = settings.value(OsTypeKey).toString();
-    m_d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
+    d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
-    m_d->isDefault = settings.value(IsDefaultKey, false).toBool();
+    d->isDefault = settings.value(IsDefaultKey, false).toBool();
-    m_d->internalId = settings.value(InternalIdKey, nextId).toULongLong();
+    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 0: d->osType = QLatin1String("Maemo5OsType"); break;
-        case 1: m_d->osType = QLatin1String("HarmattanOsType"); break;
+        case 1: d->osType = QLatin1String("HarmattanOsType"); break;
-        case 2: m_d->osType = QLatin1String("MeeGoOsType"); break;
+        case 2: d->osType = QLatin1String("MeeGoOsType"); break;
-        default: m_d->osType = QLatin1String(Constants::GenericLinuxOsType);
+        default: d->osType = QLatin1String(Constants::GenericLinuxOsType);
         }
     }
 
-    m_d->freePorts = PortList::fromString(settings.value(PortsSpecKey, QLatin1String("10000-10100")).toString());
+    d->freePorts = PortList::fromString(settings.value(PortsSpecKey, QLatin1String("10000-10100")).toString());
-    m_d->sshParameters.host = settings.value(HostKey).toString();
+    d->sshParameters.host = settings.value(HostKey).toString();
-    m_d->sshParameters.port = settings.value(SshPortKey, 22).toInt();
+    d->sshParameters.port = settings.value(SshPortKey, 22).toInt();
-    m_d->sshParameters.userName = settings.value(UserNameKey).toString();
+    d->sshParameters.userName = settings.value(UserNameKey).toString();
-    m_d->sshParameters.authenticationType
+    d->sshParameters.authenticationType
         = static_cast<AuthType>(settings.value(AuthKey, DefaultAuthType).toInt());
-    m_d->sshParameters.password = settings.value(PasswordKey).toString();
+    d->sshParameters.password = settings.value(PasswordKey).toString();
-    m_d->sshParameters.privateKeyFile
+    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;
+    d->name = other->d->name;
-    m_d->osType = other->m_d->osType;
+    d->osType = other->d->osType;
-    m_d->deviceType = other->deviceType();
+    d->deviceType = other->deviceType();
-    m_d->freePorts = other->freePorts();
+    d->freePorts = other->freePorts();
-    m_d->isDefault = other->m_d->isDefault;
+    d->isDefault = other->d->isDefault;
-    m_d->origin = other->m_d->origin;
+    d->origin = other->d->origin;
-    m_d->internalId = other->m_d->internalId;
+    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(NameKey, d->name);
-    settings.setValue(OsTypeKey, m_d->osType);
+    settings.setValue(OsTypeKey, d->osType);
-    settings.setValue(TypeKey, m_d->deviceType);
+    settings.setValue(TypeKey, d->deviceType);
-    settings.setValue(HostKey, m_d->sshParameters.host);
+    settings.setValue(HostKey, d->sshParameters.host);
-    settings.setValue(SshPortKey, m_d->sshParameters.port);
+    settings.setValue(SshPortKey, d->sshParameters.port);
-    settings.setValue(PortsSpecKey, m_d->freePorts.toString());
+    settings.setValue(PortsSpecKey, d->freePorts.toString());
-    settings.setValue(UserNameKey, m_d->sshParameters.userName);
+    settings.setValue(UserNameKey, d->sshParameters.userName);
-    settings.setValue(AuthKey, m_d->sshParameters.authenticationType);
+    settings.setValue(AuthKey, d->sshParameters.authenticationType);
-    settings.setValue(PasswordKey, m_d->sshParameters.password);
+    settings.setValue(PasswordKey, d->sshParameters.password);
-    settings.setValue(KeyFileKey, m_d->sshParameters.privateKeyFile);
+    settings.setValue(KeyFileKey, d->sshParameters.privateKeyFile);
-    settings.setValue(TimeoutKey, m_d->sshParameters.timeout);
+    settings.setValue(TimeoutKey, d->sshParameters.timeout);
-    settings.setValue(IsDefaultKey, m_d->isDefault);
+    settings.setValue(IsDefaultKey, d->isDefault);
-    settings.setValue(InternalIdKey, m_d->internalId);
+    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; }
+PortList LinuxDeviceConfiguration::freePorts() const { return d->freePorts; }
-QString LinuxDeviceConfiguration::name() const { return m_d->name; }
+QString LinuxDeviceConfiguration::name() const { return d->name; }
-QString LinuxDeviceConfiguration::osType() const { return m_d->osType; }
+QString LinuxDeviceConfiguration::osType() const { return d->osType; }
-bool LinuxDeviceConfiguration::isDefault() const { return m_d->isDefault; }
+bool LinuxDeviceConfiguration::isDefault() const { return d->isDefault; }
 
-void LinuxDeviceConfiguration::setName(const QString &name) { m_d->name = name; }
+void LinuxDeviceConfiguration::setName(const QString &name) { d->name = name; }
-void LinuxDeviceConfiguration::setInternalId(Id id) { m_d->internalId = id; }
+void LinuxDeviceConfiguration::setInternalId(Id id) { d->internalId = id; }
-void LinuxDeviceConfiguration::setDefault(bool isDefault) { m_d->isDefault = isDefault; }
+void LinuxDeviceConfiguration::setDefault(bool isDefault) { d->isDefault = isDefault; }
 
 const LinuxDeviceConfiguration::Id LinuxDeviceConfiguration::InvalidId = 0;
 

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;
 };