diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-23 15:18:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-23 15:35:47 +0200 |
| commit | dea0a877f8905517b64c92ad0ea3f9f40d3859a3 (patch) | |
| tree | 4c36bf40f62909649470d5cb43aa757f21f4f369 | |
| parent | c8b53127b15f45c6d529bff7438a56f81a4ea032 (diff) | |
| download | qtserialport-dea0a877f8905517b64c92ad0ea3f9f40d3859a3.tar.gz | |
Remove qFind usage from QSerialPortPrivate
qFind is deprecated by now. See discussion at
http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I18f5be8e803af645df21d47c41d820b8f7fecfa7
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index f042ee8..cc731d0 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -51,6 +51,7 @@ #endif #include <QtCore/qwineventnotifier.h> +#include <algorithm> #ifndef CTL_CODE # define CTL_CODE(DeviceType, Function, Method, Access) ( \ @@ -1099,7 +1100,8 @@ static const QList<qint32> standardBaudRatePairList() qint32 QSerialPortPrivate::baudRateFromSetting(qint32 setting) { const QList<qint32> baudRatePairs = standardBaudRatePairList(); - const QList<qint32>::const_iterator baudRatePairListConstIterator = qFind(baudRatePairs, setting); + const QList<qint32>::const_iterator baudRatePairListConstIterator + = std::find(baudRatePairs.constBegin(), baudRatePairs.constEnd(), setting); return (baudRatePairListConstIterator != baudRatePairs.constEnd()) ? *baudRatePairListConstIterator : 0; } @@ -1107,7 +1109,8 @@ qint32 QSerialPortPrivate::baudRateFromSetting(qint32 setting) qint32 QSerialPortPrivate::settingFromBaudRate(qint32 baudRate) { const QList<qint32> baudRatePairList = standardBaudRatePairList(); - const QList<qint32>::const_iterator baudRatePairListConstIterator = qFind(baudRatePairList, baudRate); + const QList<qint32>::const_iterator baudRatePairListConstIterator + = std::find(baudRatePairList.constBegin(), baudRatePairList.constEnd(), baudRate); return (baudRatePairListConstIterator != baudRatePairList.constEnd()) ? *baudRatePairListConstIterator : 0; } |