diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 14:11:10 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 14:53:59 +0200 |
commit | 59f732d439bb2ad9fabf20be0686cce46700eaae (patch) | |
tree | d58ba07d61c5cd0de4fc238991981ef0f883abb0 /src | |
parent | 63f9461f69dc00ee26e476f754fa0a65e8c63263 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Ibe37e34aec910948ac2f5cdbcc99335c09447d5a
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/serialport/qserialport_win.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_freebsd.cpp | 34 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index c0061fc9..c131641a 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -44,9 +44,9 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qelapsedtimer.h> +#include <QtCore/qlist.h> #include <QtCore/qmutex.h> #include <QtCore/qtimer.h> -#include <QtCore/qvector.h> #include <algorithm> QT_BEGIN_NAMESPACE diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp index f6d6ea67..5514fa45 100644 --- a/src/serialport/qserialportinfo_freebsd.cpp +++ b/src/serialport/qserialportinfo_freebsd.cpp @@ -42,7 +42,7 @@ #include "qserialport_p.h" #include <QtCore/qdatastream.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qdir.h> #include <errno.h> @@ -109,23 +109,23 @@ struct NodeInfo QString value; }; -static QVector<int> mibFromName(const QString &name) +static QList<int> mibFromName(const QString &name) { size_t mibsize = 0; if (::sysctlnametomib(name.toLocal8Bit().constData(), nullptr, &mibsize) < 0 || mibsize == 0) { - return QVector<int>(); + return QList<int>(); } - QVector<int> mib(mibsize); + QList<int> mib(mibsize); if (::sysctlnametomib(name.toLocal8Bit().constData(), &mib[0], &mibsize) < 0) - return QVector<int>(); + return QList<int>(); return mib; } -static QVector<int> nextOid(const QVector<int> &previousOid) +static QList<int> nextOid(const QList<int> &previousOid) { - QVector<int> mib; + QList<int> mib; mib.append(0); // Magic undocumented code (CTL_UNSPEC ?) mib.append(2); // Magic undocumented code for (int code : previousOid) @@ -133,21 +133,21 @@ static QVector<int> nextOid(const QVector<int> &previousOid) size_t requiredLength = 0; if (::sysctl(&mib[0], mib.count(), nullptr, &requiredLength, nullptr, 0) < 0) - return QVector<int>(); + return QList<int>(); const size_t oidLength = requiredLength / sizeof(int); - QVector<int> oid(oidLength, 0); + QList<int> oid(oidLength, 0); if (::sysctl(&mib[0], mib.count(), &oid[0], &requiredLength, nullptr, 0) < 0) - return QVector<int>(); + return QList<int>(); if (previousOid.first() != oid.first()) - return QVector<int>(); + return QList<int>(); return oid; } -static NodeInfo nodeForOid(const QVector<int> &oid) +static NodeInfo nodeForOid(const QList<int> &oid) { - QVector<int> mib; + QList<int> mib; mib.append(0); // Magic undocumented code (CTL_UNSPEC ?) mib.append(1); // Magic undocumented code for (int code : oid) @@ -195,14 +195,14 @@ static NodeInfo nodeForOid(const QVector<int> &oid) return result; } -static QList<NodeInfo> enumerateDesiredNodes(const QVector<int> &mib) +static QList<NodeInfo> enumerateDesiredNodes(const QList<int> &mib) { QList<NodeInfo> nodes; - QVector<int> oid = mib; + QList<int> oid = mib; for (;;) { - const QVector<int> nextoid = nextOid(oid); + const QList<int> nextoid = nextOid(oid); if (nextoid.isEmpty()) break; @@ -222,7 +222,7 @@ static QList<NodeInfo> enumerateDesiredNodes(const QVector<int> &mib) QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { - const QVector<int> mib = mibFromName(QLatin1String("dev")); + const QList<int> mib = mibFromName(QLatin1String("dev")); if (mib.isEmpty()) return QList<QSerialPortInfo>(); |