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

QmakePM: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: Ibcc1bc772c6cc4413ae5834a442f7d270dc4cd75
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-05-24 23:21:57 +03:00
committed by Orgad Shaneh
parent 1d4f0ccd5c
commit 547d18c0b9
23 changed files with 94 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmakeprojectmanager/externaleditors.cpp
View File

@@ -264,7 +264,9 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
// Set up signal mapper to track process termination via socket
if (!m_terminationMapper) {
m_terminationMapper = new QSignalMapper(this);
connect(m_terminationMapper, SIGNAL(mapped(QString)), this, SLOT(processTerminated(QString)));
connect(m_terminationMapper,
static_cast<void (QSignalMapper::*)(const QString &)>(&QSignalMapper::mapped),
this, &DesignerExternalEditor::processTerminated);
}
// Insert into cache if socket is created, else try again next time
if (server.waitForNewConnection(3000)) {
@@ -272,8 +274,11 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
socket->setParent(this);
m_processCache.insert(data.binary, socket);
m_terminationMapper->setMapping(socket, data.binary);
connect(socket, SIGNAL(disconnected()), m_terminationMapper, SLOT(map()));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), m_terminationMapper, SLOT(map()));
auto mapSlot = static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map);
connect(socket, &QAbstractSocket::disconnected, m_terminationMapper, mapSlot);
connect(socket,
static_cast<void (QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error),
m_terminationMapper, mapSlot);
}
return true;
}