RemoteLinux: Inline a few more deploy step functions

Change-Id: Ib93562b24de796f570cfa76dd3990ede5ebc6061
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/remotelinux/customcommanddeploystep.cpp

@@ -32,28 +32,21 @@ public:
         commandLine->setHistoryCompleter("RemoteLinuxCustomCommandDeploymentStep.History");
 
         setInternalInitializer([this, commandLine] {
-            setCommandLine(commandLine->value().trimmed());
+            m_commandLine = commandLine->value().trimmed();
             return isDeploymentPossible();
         });
 
         addMacroExpander();
     }
 
-    void setCommandLine(const QString &commandLine);
     CheckResult isDeploymentPossible() const final;
 
-protected:
+private:
     Group deployRecipe() final;
 
-private:
     QString m_commandLine;
 };
 
-void CustomCommandDeployStep::setCommandLine(const QString &commandLine)
-{
-    m_commandLine = commandLine;
-}
-
 CheckResult CustomCommandDeployStep::isDeploymentPossible() const
 {
     if (m_commandLine.isEmpty())

src/plugins/remotelinux/rsyncdeploystep.cpp

@@ -49,25 +49,21 @@ RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Id id)
             return CheckResult::failure(
                 Tr::tr("rsync is only supported for transfers between different devices."));
         }
-        setIgnoreMissingFiles(ignoreMissingFiles->value());
+        m_ignoreMissingFiles = ignoreMissingFiles->value();
-        setFlags(flags->value());
+        m_flags = flags->value();
         return isDeploymentPossible();
     });
 
     setRunPreparer([this] {
-        setDeployableFiles(target()->deploymentData().allFiles());
+        const QList<DeployableFile> files = target()->deploymentData().allFiles();
+        m_files.clear();
+        for (const DeployableFile &f : files)
+            m_files.append({f.localFilePath(), deviceConfiguration()->filePath(f.remoteFilePath())});
     });
 }
 
 RsyncDeployStep::~RsyncDeployStep() = default;
 
-void RsyncDeployStep::setDeployableFiles(const QList<DeployableFile> &files)
-{
-    m_files.clear();
-    for (const DeployableFile &f : files)
-        m_files.append({f.localFilePath(), deviceConfiguration()->filePath(f.remoteFilePath())});
-}
-
 bool RsyncDeployStep::isDeploymentNecessary() const
 {
     if (m_ignoreMissingFiles)

src/plugins/remotelinux/rsyncdeploystep.h

@@ -22,10 +22,6 @@ public:
     static Utils::Id stepId();
     static QString displayName();
 
-    void setDeployableFiles(const QList<ProjectExplorer::DeployableFile> &files);
-    void setIgnoreMissingFiles(bool ignore) { m_ignoreMissingFiles = ignore; }
-    void setFlags(const QString &flags) { m_flags = flags; }
-
 private:
     bool isDeploymentNecessary() const final;
     Utils::Tasking::Group deployRecipe() final;

src/plugins/remotelinux/tarpackagedeploystep.cpp

@@ -45,13 +45,11 @@ public:
             if (!tarCreationStep)
                 return CheckResult::failure(Tr::tr("No tarball creation step found."));
 
-            const FilePath tarFile =
+            m_packageFilePath =
-                    FilePath::fromVariant(tarCreationStep->data(Constants::TarPackageFilePathId));
+                FilePath::fromVariant(tarCreationStep->data(Constants::TarPackageFilePathId));
-            setPackageFilePath(tarFile);
             return isDeploymentPossible();
         });
     }
-    void setPackageFilePath(const FilePath &filePath);
 
 private:
     QString remoteFilePath() const;
@@ -63,11 +61,6 @@ private:
     FilePath m_packageFilePath;
 };
 
-void TarPackageDeployStep::setPackageFilePath(const FilePath &filePath)
-{
-    m_packageFilePath = filePath;
-}
-
 QString TarPackageDeployStep::remoteFilePath() const
 {
     return QLatin1String("/tmp/") + m_packageFilePath.fileName();