forked from qt-creator/qt-creator
QmlDebug: Use Qt5-style connects
The heavy lifting was done by clazy. Change-Id: I94f5c85388af1b8e06128800090222a6b64f5191 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
d058ca6db9
commit
624c6fe6ee
@@ -385,7 +385,8 @@ void QmlDebugConnection::startLocalServer(const QString &fileName)
|
|||||||
d->server->deleteLater();
|
d->server->deleteLater();
|
||||||
d->server = new QLocalServer(this);
|
d->server = new QLocalServer(this);
|
||||||
// QueuedConnection so that waitForNewConnection() returns true.
|
// QueuedConnection so that waitForNewConnection() returns true.
|
||||||
connect(d->server, SIGNAL(newConnection()), this, SLOT(newConnection()), Qt::QueuedConnection);
|
connect(d->server, &QLocalServer::newConnection,
|
||||||
|
this, &QmlDebugConnection::newConnection, Qt::QueuedConnection);
|
||||||
d->server->listen(fileName);
|
d->server->listen(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,13 +70,12 @@ signals:
|
|||||||
void socketError(QAbstractSocket::SocketError error);
|
void socketError(QAbstractSocket::SocketError error);
|
||||||
void socketStateChanged(QAbstractSocket::SocketState state);
|
void socketStateChanged(QAbstractSocket::SocketState state);
|
||||||
|
|
||||||
private slots:
|
private:
|
||||||
void newConnection();
|
void newConnection();
|
||||||
void socketConnected();
|
void socketConnected();
|
||||||
void socketDisconnected();
|
void socketDisconnected();
|
||||||
void protocolReadyRead();
|
void protocolReadyRead();
|
||||||
|
|
||||||
private:
|
|
||||||
QScopedPointer<QmlDebugConnectionPrivate> d_ptr;
|
QScopedPointer<QmlDebugConnectionPrivate> d_ptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ signals:
|
|||||||
void readyRead();
|
void readyRead();
|
||||||
void invalidPacket();
|
void invalidPacket();
|
||||||
|
|
||||||
public slots:
|
public:
|
||||||
void aboutToClose()
|
void aboutToClose()
|
||||||
{
|
{
|
||||||
inProgress.clear();
|
inProgress.clear();
|
||||||
|
|||||||
Reference in New Issue
Block a user