Commit 85847309 authored by Ulf Hermann's avatar Ulf Hermann Committed by Tobias Hunger

QmlDebug: Avoid hiding of virtual functions

Change-Id: I1722f5298693b6ed9700dcd65d5e2210500a6206
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 1eaadfa7
...@@ -63,7 +63,7 @@ void QmlEngineControlClient::releaseEngine(int engineId) ...@@ -63,7 +63,7 @@ void QmlEngineControlClient::releaseEngine(int engineId)
EngineState &state = m_blockedEngines[engineId]; EngineState &state = m_blockedEngines[engineId];
if (--state.blockers == 0) { if (--state.blockers == 0) {
QTC_ASSERT(state.releaseCommand != InvalidCommand, return); QTC_ASSERT(state.releaseCommand != InvalidCommand, return);
sendMessage(state.releaseCommand, engineId); sendCommand(state.releaseCommand, engineId);
m_blockedEngines.remove(engineId); m_blockedEngines.remove(engineId);
} }
} }
...@@ -101,12 +101,12 @@ void QmlEngineControlClient::messageReceived(const QByteArray &data) ...@@ -101,12 +101,12 @@ void QmlEngineControlClient::messageReceived(const QByteArray &data)
} }
if (state.blockers == 0 && state.releaseCommand != InvalidCommand) { if (state.blockers == 0 && state.releaseCommand != InvalidCommand) {
sendMessage(state.releaseCommand, id); sendCommand(state.releaseCommand, id);
m_blockedEngines.remove(id); m_blockedEngines.remove(id);
} }
} }
void QmlEngineControlClient::sendMessage(QmlEngineControlClient::CommandType command, int engineId) void QmlEngineControlClient::sendCommand(QmlEngineControlClient::CommandType command, int engineId)
{ {
QByteArray data; QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly); QDataStream stream(&data, QIODevice::WriteOnly);
......
...@@ -65,7 +65,7 @@ signals: ...@@ -65,7 +65,7 @@ signals:
protected: protected:
void messageReceived(const QByteArray &); void messageReceived(const QByteArray &);
void sendMessage(CommandType command, int engineId); void sendCommand(CommandType command, int engineId);
struct EngineState { struct EngineState {
EngineState(CommandType command = InvalidCommand) : releaseCommand(command), blockers(0) {} EngineState(CommandType command = InvalidCommand) : releaseCommand(command), blockers(0) {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment