diff options
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index bf6a164..27a847d 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. @@ -138,6 +138,11 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces() result.append(info); } + std::sort(result.begin(), result.end(), + [](const QCanBusDeviceInfo &a, const QCanBusDeviceInfo &b) { + return a.name() < b.name(); + }); + return result; } @@ -631,7 +636,7 @@ void SocketCanBackend::readSocket() { QVector<QCanBusFrame> newFrames; - while (true) { + for (;;) { struct canfd_frame frame; int bytesReceived; |