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

SSH: Replace idiosyncratic state checking with standard macros.

Browse Source 
Change-Id: I1dc92982749b601c803fea033820dcbf5cc75725
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kandeler
2011-11-16 16:54:50 +01:00
committed by hjk
parent a5cb3af274
commit 20520dd073
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libs/utils/ssh/sshremoteprocessrunner.cpp
View File

@@ -35,7 +35,8 @@
#include "sshconnectionmanager.h" #include "sshconnectionmanager.h"
#include "sshpseudoterminal.h" #include "sshpseudoterminal.h"
#define ASSERT_STATE(states) assertState(states, Q_FUNC_INFO) #include <utils/qtcassert.h>
/*! /*!
\class Utils::SshRemoteProcessRunner \class Utils::SshRemoteProcessRunner
@@ -82,8 +83,6 @@ private:
void run(const QByteArray &command, const SshConnectionParameters &sshParams); void run(const QByteArray &command, const SshConnectionParameters &sshParams);
void setState(State state); void setState(State state);
void assertState(const QList<State> &allowedStates, const char *func);
void assertState(State allowedState, const char *func);
SshConnection::Ptr m_connection; SshConnection::Ptr m_connection;
State m_state; State m_state;
@@ -145,7 +144,7 @@ void SshRemoteProcessRunnerPrivate::run(const QByteArray &command,
void SshRemoteProcessRunnerPrivate::handleConnected() void SshRemoteProcessRunnerPrivate::handleConnected()
{ {
ASSERT_STATE(Connecting); QTC_ASSERT(m_state == Connecting, return);
setState(Connected); setState(Connected);
m_process = m_connection->createRemoteProcess(m_command); m_process = m_connection->createRemoteProcess(m_command);
@@ -169,13 +168,13 @@ void SshRemoteProcessRunnerPrivate::handleConnectionError(Utils::SshError error)
void SshRemoteProcessRunnerPrivate::handleDisconnected() void SshRemoteProcessRunnerPrivate::handleDisconnected()
{ {
ASSERT_STATE(QList<State>() << Connecting << Connected << ProcessRunning); QTC_ASSERT(m_state == Connecting || m_state == Connected || m_state == ProcessRunning, return);
setState(Inactive); setState(Inactive);
} }
void SshRemoteProcessRunnerPrivate::handleProcessStarted() void SshRemoteProcessRunnerPrivate::handleProcessStarted()
{ {
ASSERT_STATE(Connected); QTC_ASSERT(m_state == Connected, return);
setState(ProcessRunning); setState(ProcessRunning);
emit processStarted(); emit processStarted();
@@ -185,11 +184,11 @@ void SshRemoteProcessRunnerPrivate::handleProcessFinished(int exitStatus)
{ {
switch (exitStatus) { switch (exitStatus) {
case SshRemoteProcess::FailedToStart: case SshRemoteProcess::FailedToStart:
ASSERT_STATE(Connected); QTC_ASSERT(m_state == Connected, return);
break; break;
case SshRemoteProcess::KilledBySignal: case SshRemoteProcess::KilledBySignal:
case SshRemoteProcess::ExitedNormally: case SshRemoteProcess::ExitedNormally:
ASSERT_STATE(ProcessRunning); QTC_ASSERT(m_state == ProcessRunning, return);
break; break;
default: default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Impossible exit status."); Q_ASSERT_X(false, Q_FUNC_INFO, "Impossible exit status.");
@@ -224,19 +223,6 @@ void SshRemoteProcessRunnerPrivate::setState(State state)
} }
} }
void SshRemoteProcessRunnerPrivate::assertState(const QList<State> &allowedStates,
const char *func)
{
if (!allowedStates.contains(m_state))
qWarning("Unexpected state %d in function %s", m_state, func);
}
void SshRemoteProcessRunnerPrivate::assertState(State allowedState,
const char *func)
{
assertState(QList<State>() << allowedState, func);
}
} // namespace Internal } // namespace Internal
SshRemoteProcessRunner::SshRemoteProcessRunner(QObject *parent) SshRemoteProcessRunner::SshRemoteProcessRunner(QObject *parent)