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

QmlDebug: Avoid hiding of virtual functions

Browse Source 
Change-Id: I1722f5298693b6ed9700dcd65d5e2210500a6206
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Ulf Hermann
2014-09-15 11:44:55 +02:00
committed by Tobias Hunger
parent 1eaadfa7d7
commit 8584730963
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmldebug/qmlenginecontrolclient.cpp
View File

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

2
src/libs/qmldebug/qmlenginecontrolclient.h
View File

@@ -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) {}