summaryrefslogtreecommitdiff
path: root/src/libs/ssh/sshremoteprocess.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-11-26 15:29:42 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2014-11-27 12:44:29 +0100
commit3431a24feef17cae173590558f83cc5775210197 (patch)
tree1bd0d1e6a78261bf3575b2a7dd44d49e9957c589 /src/libs/ssh/sshremoteprocess.cpp
parent13c7d1c2ce5eb426f17d190e78188f196fcb29dc (diff)
downloadqt-creator-3431a24feef17cae173590558f83cc5775210197.tar.gz
Ssh: Remove indirection in AbstractSshChannel::m_timeoutTimer
... and connect it using Qt5-style connects. Change-Id: Ic7f36949b38d4773f5ac0f04853abf93bebcf467 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/libs/ssh/sshremoteprocess.cpp')
-rw-r--r--src/libs/ssh/sshremoteprocess.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp
index bd8bd6dc9f..f6c9f2def2 100644
--- a/src/libs/ssh/sshremoteprocess.cpp
+++ b/src/libs/ssh/sshremoteprocess.cpp
@@ -304,7 +304,7 @@ void SshRemoteProcessPrivate::handleOpenSuccessInternal()
else
m_sendFacility.sendExecPacket(remoteChannel(), m_command);
setProcState(ExecRequested);
- m_timeoutTimer->start(ReplyTimeout);
+ m_timeoutTimer.start(ReplyTimeout);
}
void SshRemoteProcessPrivate::handleOpenFailureInternal(const QString &reason)
@@ -319,7 +319,7 @@ void SshRemoteProcessPrivate::handleChannelSuccess()
throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
"Unexpected SSH_MSG_CHANNEL_SUCCESS message.");
}
- m_timeoutTimer->stop();
+ m_timeoutTimer.stop();
setProcState(Running);
}
@@ -329,7 +329,7 @@ void SshRemoteProcessPrivate::handleChannelFailure()
throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
"Unexpected SSH_MSG_CHANNEL_FAILURE message.");
}
- m_timeoutTimer->stop();
+ m_timeoutTimer.stop();
setProcState(StartFailed);
closeChannel();
}