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

QmlAdapter: Move isConnected() to private

Browse Source 
Change-Id: I0b8bd76af6492bf85c5dfdef3863d8ebc9babab3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-05-10 10:35:42 +02:00
parent 4884200b5a
commit a0f7d6b5ec
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/qml/qmladapter.cpp
View File

@@ -192,6 +192,11 @@ void QmlAdapter::checkConnectionState()
} }
} }
bool QmlAdapter::isConnected() const
{
return m_conn && m_qmlClient && m_conn->state() == QAbstractSocket::ConnectedState;
}
void QmlAdapter::createDebuggerClients() void QmlAdapter::createDebuggerClients()
{ {
QScriptDebuggerClient *debugClient1 = new QScriptDebuggerClient(m_conn); QScriptDebuggerClient *debugClient1 = new QScriptDebuggerClient(m_conn);
@@ -213,11 +218,6 @@ void QmlAdapter::createDebuggerClients()
debugClient2->setEngine((QmlEngine*)(m_engine.data())); debugClient2->setEngine((QmlEngine*)(m_engine.data()));
} }
bool QmlAdapter::isConnected() const
{
return m_conn && m_qmlClient && m_conn->state() == QAbstractSocket::ConnectedState;
}
QmlDebugConnection *QmlAdapter::connection() const QmlDebugConnection *QmlAdapter::connection() const
{ {
return m_conn; return m_conn;

3
src/plugins/debugger/qml/qmladapter.h
View File

@@ -68,8 +68,6 @@ public:
void beginConnectionOst(const QString &port); void beginConnectionOst(const QString &port);
void closeConnection(); void closeConnection();
bool isConnected() const;
QmlDebug::QmlDebugConnection *connection() const; QmlDebug::QmlDebugConnection *connection() const;
DebuggerEngine *debuggerEngine() const; DebuggerEngine *debuggerEngine() const;
@@ -98,6 +96,7 @@ private slots:
void checkConnectionState(); void checkConnectionState();
private: private:
bool isConnected() const;
void createDebuggerClients(); void createDebuggerClients();
void showConnectionStatusMessage(const QString &message); void showConnectionStatusMessage(const QString &message);
void showConnectionErrorMessage(const QString &message); void showConnectionErrorMessage(const QString &message);