diff options
author | Jarek Kobus <[email protected]> | 2024-09-20 10:41:45 +0200 |
---|---|---|
committer | Jarek Kobus <[email protected]> | 2024-09-20 12:46:22 +0000 |
commit | 829e5fe8963933636cd80fc7a57a599d87dfbd43 (patch) | |
tree | 3b6531a30fe8d373a4d162441879f292ed2cb750 | |
parent | eaaebb4dbdc2f2d6e001150455a1120eb327b663 (diff) |
DeviceProcessSignalOperation: Remove unused interruptProcess() overload
Change-Id: I62f18ea61559c008951f2cca169bfe250432a745
Reviewed-by: hjk <[email protected]>
Reviewed-by: Christian Kandeler <[email protected]>
8 files changed, 1 insertions, 39 deletions
diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp index 9e92e860b4d..0b44f3d5f60 100644 --- a/src/plugins/android/androidsignaloperation.cpp +++ b/src/plugins/android/androidsignaloperation.cpp @@ -114,13 +114,5 @@ void AndroidSignalOperation::interruptProcess(qint64 pid) signalOperationViaADB(pid, 2); } -void AndroidSignalOperation::interruptProcess(const QString &filePath) -{ - Q_UNUSED(filePath) - m_errorMessage = QLatin1String("The android signal operation does " - "not support interrupting by filepath."); - emit finished(m_errorMessage); -} - } // Internal } // Android diff --git a/src/plugins/android/androidsignaloperation.h b/src/plugins/android/androidsignaloperation.h index 2a6e3ddb6cf..53c1d61a899 100644 --- a/src/plugins/android/androidsignaloperation.h +++ b/src/plugins/android/androidsignaloperation.h @@ -18,7 +18,6 @@ public: void killProcess(qint64 pid) override; void killProcess(const QString &filePath) override; void interruptProcess(qint64 pid) override; - void interruptProcess(const QString &filePath) override; protected: explicit AndroidSignalOperation(); diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp index 70412124462..206f32aee8a 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.cpp @@ -51,17 +51,6 @@ void DesktopProcessSignalOperation::interruptProcess(qint64 pid) emit finished(m_errorMessage); } -void DesktopProcessSignalOperation::interruptProcess(const QString &filePath) -{ - m_errorMessage.clear(); - const QList<ProcessInfo> processInfoList = ProcessInfo::processInfoList(); - for (const ProcessInfo &processInfo : processInfoList) { - if (processInfo.commandLine == filePath) - interruptProcessSilently(processInfo.processId); - } - emit finished(m_errorMessage); -} - void DesktopProcessSignalOperation::appendMsgCannotKill(qint64 pid, const QString &why) { if (!m_errorMessage.isEmpty()) diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h index df9d313e638..f3d7e1b52d8 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h +++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h @@ -16,7 +16,6 @@ public: void killProcess(qint64 pid) override; void killProcess(const QString &filePath) override; void interruptProcess(qint64 pid) override; - void interruptProcess(const QString &filePath) override; private: void killProcessSilently(qint64 pid); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 323abfd340f..ccc844d6a37 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -61,7 +61,6 @@ public: virtual void killProcess(qint64 pid) = 0; virtual void killProcess(const QString &filePath) = 0; virtual void interruptProcess(qint64 pid) = 0; - virtual void interruptProcess(const QString &filePath) = 0; void setDebuggerCommand(const Utils::FilePath &cmd); diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index bcef9fc51bc..47c5d9ecc4c 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/src/plugins/qnx/qnxdevice.cpp @@ -51,11 +51,6 @@ public: return QString::fromLatin1("%1; %2").arg(signalProcessByNameQnxCommandLine(filePath, 15), signalProcessByNameQnxCommandLine(filePath, 9)); } - - QString interruptProcessByNameCommandLine(const QString &filePath) const override - { - return signalProcessByNameQnxCommandLine(filePath, 2); - } }; class QnxDevice final : public LinuxDevice diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index 9eaa1471d22..36c2991f8ff 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -38,6 +38,7 @@ void RemoteLinuxSignalOperation::run(const QString &command) m_process->start(); } +// TODO: check if used? static QString signalProcessGroupByNameCommandLine(const QString &filePath, int signal) { return QString::fromLatin1( @@ -57,11 +58,6 @@ QString RemoteLinuxSignalOperation::killProcessByNameCommandLine(const QString & .arg(signalProcessGroupByNameCommandLine(filePath, 9)); } -QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const -{ - return signalProcessGroupByNameCommandLine(filePath, 2); -} - void RemoteLinuxSignalOperation::killProcess(qint64 pid) { run(QString::fromLatin1("%1 && %2") @@ -79,11 +75,6 @@ void RemoteLinuxSignalOperation::interruptProcess(qint64 pid) run(signalProcessGroupByPidCommandLine(pid, 2)); } -void RemoteLinuxSignalOperation::interruptProcess(const QString &filePath) -{ - run(interruptProcessByNameCommandLine(filePath)); -} - void RemoteLinuxSignalOperation::runnerDone() { m_errorMessage.clear(); diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.h b/src/plugins/remotelinux/remotelinuxsignaloperation.h index 00967c9414c..56cb68b9f53 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.h +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.h @@ -19,14 +19,12 @@ public: void killProcess(qint64 pid) override; void killProcess(const QString &filePath) override; void interruptProcess(qint64 pid) override; - void interruptProcess(const QString &filePath) override; protected: RemoteLinuxSignalOperation(const ProjectExplorer::IDeviceConstPtr &device); private: virtual QString killProcessByNameCommandLine(const QString &filePath) const; - virtual QString interruptProcessByNameCommandLine(const QString &filePath) const; void runnerDone(); void run(const QString &command); |