feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LinuxDeviceProcess: Remove unused setRcFilesToSource()

Browse Source 
Change-Id: Ica834cbecfa481a3a6c94519a9799c4b917d49a1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-01-31 10:19:30 +01:00
parent f7c9dac3a7
commit 74ea443ebf
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/remotelinux/linuxdeviceprocess.cpp
View File

@@ -49,11 +49,6 @@ LinuxDeviceProcess::LinuxDeviceProcess(const QSharedPointer<const ProjectExplore
}); });
} }
void LinuxDeviceProcess::setRcFilesToSource(const QStringList &filePaths)
{
m_rcFilesToSource = filePaths;
}
QByteArray LinuxDeviceProcess::readAllStandardOutput() QByteArray LinuxDeviceProcess::readAllStandardOutput()
{ {
QByteArray output = SshDeviceProcess::readAllStandardOutput(); QByteArray output = SshDeviceProcess::readAllStandardOutput();
@@ -88,7 +83,8 @@ QString LinuxDeviceProcess::fullCommandLine(const Runnable &runnable) const
{ {
CommandLine cmd; CommandLine cmd;
for (const QString &filePath : rcFilesToSource()) { const QStringList rcFilesToSource = {"/etc/profile", "$HOME/.profile"};
for (const QString &filePath : rcFilesToSource) {
cmd.addArgs({"test", "-f", filePath}); cmd.addArgs({"test", "-f", filePath});
cmd.addArgs("&&", CommandLine::Raw); cmd.addArgs("&&", CommandLine::Raw);
cmd.addArgs({".", filePath}); cmd.addArgs({".", filePath});
@@ -116,11 +112,4 @@ QString LinuxDeviceProcess::fullCommandLine(const Runnable &runnable) const
return cmd.arguments(); return cmd.arguments();
} }
const QStringList LinuxDeviceProcess::rcFilesToSource() const
{
if (!m_rcFilesToSource.isEmpty())
return m_rcFilesToSource;
return {"/etc/profile", "$HOME/.profile"};
}
} // namespace RemoteLinux } // namespace RemoteLinux

6
src/plugins/remotelinux/linuxdeviceprocess.h
View File

@@ -40,18 +40,12 @@ public:
explicit LinuxDeviceProcess(const QSharedPointer<const ProjectExplorer::IDevice> &device, explicit LinuxDeviceProcess(const QSharedPointer<const ProjectExplorer::IDevice> &device,
QObject *parent = nullptr); QObject *parent = nullptr);
// Files to source before executing the command (if they exist). Overrides the default.
void setRcFilesToSource(const QStringList &filePaths);
QByteArray readAllStandardOutput() override; QByteArray readAllStandardOutput() override;
private: private:
QString fullCommandLine(const ProjectExplorer::Runnable &) const override; QString fullCommandLine(const ProjectExplorer::Runnable &) const override;
qint64 processId() const override; qint64 processId() const override;
const QStringList rcFilesToSource() const;
QStringList m_rcFilesToSource;
QByteArray m_output; QByteArray m_output;
qint64 m_processId = 0; qint64 m_processId = 0;
bool m_pidParsed = false; bool m_pidParsed = false;