aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <[email protected]>2016-03-22 09:33:43 +0100
committerhjk <[email protected]>2016-03-22 13:41:39 +0000
commit75bbd73b843b01c64314bbdc058ed7e366e2408d (patch)
tree0bebba306e0fc0134328d5919d7175ef50e62b9f
parent47f5c1357328ff906a14affffa19def9f59eed6a (diff)
RemoteLinux: Modernize remotelinuxsignaloperation.{h,cpp}
Qt 5 connects and override. Change-Id: I9675f7e6592fe5679da341a5b23d1b80b551e736 Reviewed-by: Christian Kandeler <[email protected]>
-rw-r--r--src/plugins/remotelinux/remotelinuxsignaloperation.cpp6
-rw-r--r--src/plugins/remotelinux/remotelinuxsignaloperation.h17
2 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
index 3191ca96f32..446a83448e3 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
@@ -58,8 +58,10 @@ void RemoteLinuxSignalOperation::run(const QString &command)
{
QTC_ASSERT(!m_runner, return);
m_runner = new QSsh::SshRemoteProcessRunner();
- connect(m_runner, SIGNAL(processClosed(int)), SLOT(runnerProcessFinished()));
- connect(m_runner, SIGNAL(connectionError()), SLOT(runnerConnectionError()));
+ connect(m_runner, &QSsh::SshRemoteProcessRunner::processClosed,
+ this, &RemoteLinuxSignalOperation::runnerProcessFinished);
+ connect(m_runner, &QSsh::SshRemoteProcessRunner::connectionError,
+ this, &RemoteLinuxSignalOperation::runnerConnectionError);
m_runner->run(command.toLatin1(), m_sshParameters);
}
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.h b/src/plugins/remotelinux/remotelinuxsignaloperation.h
index 342fa101d43..5bd32df8360 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.h
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.h
@@ -42,23 +42,22 @@ class REMOTELINUX_EXPORT RemoteLinuxSignalOperation
{
Q_OBJECT
public:
- virtual ~RemoteLinuxSignalOperation();
+ ~RemoteLinuxSignalOperation() override;
- void killProcess(qint64 pid);
- void killProcess(const QString &filePath);
- void interruptProcess(qint64 pid);
- void interruptProcess(const QString &filePath);
+ 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 QSsh::SshConnectionParameters &sshParameters);
-private slots:
- void runnerProcessFinished();
- void runnerConnectionError();
-
private:
virtual QString killProcessByNameCommandLine(const QString &filePath) const;
virtual QString interruptProcessByNameCommandLine(const QString &filePath) const;
+
+ void runnerProcessFinished();
+ void runnerConnectionError();
void run(const QString &command);
void finish();