From d83fda1c38e44ac79dbb4082f1d0b85dbc0fd554 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 13 Jul 2012 12:44:01 +0200 Subject: [PATCH] remote linux: fix mem leak Change-Id: I0b421ae53f7651baa2d7c804379c012c6b78201f Reviewed-by: Laszlo Papp Reviewed-by: Daniel Teske --- src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp | 5 +++++ src/plugins/remotelinux/abstractremotelinuxdeploystep.h | 2 +- src/plugins/remotelinux/genericdirectuploadservice.cpp | 5 +++++ src/plugins/remotelinux/genericdirectuploadservice.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index 4acbe663f53..450a525a4bf 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -66,6 +66,11 @@ AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, { } +AbstractRemoteLinuxDeployStep::~AbstractRemoteLinuxDeployStep() +{ + delete d; +} + bool AbstractRemoteLinuxDeployStep::fromMap(const QVariantMap &map) { if (!BuildStep::fromMap(map)) diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 5339c6a8340..5240c0ec23e 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -51,6 +51,7 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer: Q_OBJECT public: + ~AbstractRemoteLinuxDeployStep(); bool fromMap(const QVariantMap &map); QVariantMap toMap() const; bool init(); @@ -66,7 +67,6 @@ protected: AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id); AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, AbstractRemoteLinuxDeployStep *other); - virtual bool initInternal(QString *error = 0) = 0; private slots: diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index aad7652f873..31745b46a6d 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -76,6 +76,11 @@ GenericDirectUploadService::GenericDirectUploadService(QObject *parent) { } +GenericDirectUploadService::~GenericDirectUploadService() +{ + delete d; +} + void GenericDirectUploadService::setDeployableFiles(const QList &deployableFiles) { d->deployableFiles = deployableFiles; diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h index 1f697ca98a4..3ed16e48ef5 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.h +++ b/src/plugins/remotelinux/genericdirectuploadservice.h @@ -50,6 +50,7 @@ class REMOTELINUX_EXPORT GenericDirectUploadService : public AbstractRemoteLinux Q_OBJECT public: GenericDirectUploadService(QObject *parent = 0); + ~GenericDirectUploadService(); void setDeployableFiles(const QList &deployableFiles); void setIncrementalDeployment(bool incremental);