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

Port QtConcurrent to QMetaMethod-based connectNotify() 

The const char *-based API is deprecated and will be removed in Qt5.

Change-Id: Ica5b2c5020adf972db5005be8c062ddcdae8c0b4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Kent Hansen 2012-04-22 14:23:53 +02:00 committed by Qt by Nokia
parent 243ea09e4c
commit b39c1a32b5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/concurrent/qfuturewatcher.cpp
View File

@ -45,6 +45,7 @@
#include <QtCore/qcoreevent.h>
#include <QtCore/qcoreapplication.h>
#include <QtCore/qmetaobject.h>
#include <QtCore/qthread.h>
#include "qfuturewatcher_p.h"
@ -354,13 +355,15 @@ void QFutureWatcherBase::setPendingResultsLimit(int limit)
d->maximumPendingResultsReady = limit;
}
void QFutureWatcherBase::connectNotify(const char * signal)
void QFutureWatcherBase::connectNotify(const QMetaMethod &signal)
{
Q_D(QFutureWatcherBase);
if (qstrcmp(signal, SIGNAL(resultReadyAt(int))) == 0)
static const QMetaMethod resultReadyAtSignal = QMetaMethod::fromSignal(&QFutureWatcherBase::resultReadyAt);
if (signal == resultReadyAtSignal)
d->resultAtConnected.ref();
#ifndef QT_NO_DEBUG
if (qstrcmp(signal, SIGNAL(finished())) == 0) {
static const QMetaMethod finishedSignal = QMetaMethod::fromSignal(&QFutureWatcherBase::finished);
if (signal == finishedSignal) {
if (futureInterface().isRunning()) {
//connections should be established before calling stFuture to avoid race.
// (The future could finish before the connection is made.)
@ -370,10 +373,11 @@ void QFutureWatcherBase::connectNotify(const char * signal)
#endif
}
void QFutureWatcherBase::disconnectNotify(const char * signal)
void QFutureWatcherBase::disconnectNotify(const QMetaMethod &signal)
{
Q_D(QFutureWatcherBase);
if (qstrcmp(signal, SIGNAL(resultReadyAt(int))) == 0)
static const QMetaMethod resultReadyAtSignal = QMetaMethod::fromSignal(&QFutureWatcherBase::resultReadyAt);
if (signal == resultReadyAtSignal)
d->resultAtConnected.deref();
}

4
src/concurrent/qfuturewatcher.h
View File

@ -102,8 +102,8 @@ public Q_SLOTS:
void togglePaused();
protected:
void connectNotify (const char * signal);
void disconnectNotify (const char * signal);
void connectNotify (const QMetaMethod &signal);
void disconnectNotify (const QMetaMethod &signal);
// called from setFuture() implemented in template sub-classes
void connectOutputInterface();