whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNonContigByteDevice: Use PMF-style connect 

clang-format and the optimized SIGNAL/SLOT notation are not
good friends.

Change-Id: Id07936b4654e567b59af5a8b1d7baad000484931
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mate Barany <mate.barany@qt.io>
bb10
Mårten Nordheim 2023-10-05 15:53:06 +02:00
parent e44aee9848
commit 06ed67d05c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qnoncontiguousbytedevice.cpp
View File

@ -106,8 +106,10 @@ QNonContiguousByteDeviceBufferImpl::QNonContiguousByteDeviceBufferImpl(QBuffer *
byteArray = QByteArray::fromRawData(buffer->buffer().constData() + buffer->pos(), buffer->size() - buffer->pos());
arrayImpl = new QNonContiguousByteDeviceByteArrayImpl(&byteArray);
arrayImpl->setParent(this);
connect(arrayImpl, SIGNAL(readyRead()), SIGNAL(readyRead()));
connect(arrayImpl, SIGNAL(readProgress(qint64,qint64)), SIGNAL(readProgress(qint64,qint64)));
connect(arrayImpl, &QNonContiguousByteDevice::readyRead, this,
&QNonContiguousByteDevice::readyRead);
connect(arrayImpl, &QNonContiguousByteDevice::readProgress, this,
&QNonContiguousByteDevice::readProgress);
}
QNonContiguousByteDeviceBufferImpl::~QNonContiguousByteDeviceBufferImpl()
@ -251,8 +253,10 @@ QNonContiguousByteDeviceIoDeviceImpl::QNonContiguousByteDeviceIoDeviceImpl(QIODe
{
device = d;
initialPosition = d->pos();
connect(device, SIGNAL(readyRead()), this, SIGNAL(readyRead()), Qt::QueuedConnection);
connect(device, SIGNAL(readChannelFinished()), this, SIGNAL(readyRead()), Qt::QueuedConnection);
connect(device, &QIODevice::readyRead, this,
&QNonContiguousByteDevice::readyRead);
connect(device, &QIODevice::readChannelFinished, this,
&QNonContiguousByteDevice::readyRead);
}
QNonContiguousByteDeviceIoDeviceImpl::~QNonContiguousByteDeviceIoDeviceImpl()