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

Ssh: Remove indirection in AbstractSshChannel::m_timeoutTimer

Browse Source 
... and connect it using Qt5-style connects.

Change-Id: Ic7f36949b38d4773f5ac0f04853abf93bebcf467
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
hjk
2014-11-26 15:29:42 +01:00
committed by Christian Kandeler
parent 13c7d1c2ce
commit 3431a24fee
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/ssh/sshremoteprocess.cpp
View File

@@ -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();
}