summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-02-02 13:45:02 +0100
committerAndré Hartmann <aha_1980@gmx.de>2017-02-02 17:45:05 +0000
commited1942128078a30ea0436c3f2eb6cd9d60a82a4d (patch)
treecee8146064e96b7474d0f1578a62743025accc4b
parent4156b8a637783e6e3d54359275c28ea0c6a493b6 (diff)
Unify endless loopsv5.9.0-alpha1
Replace the macro forever with its expansion "for (;;)", as forever will be deprecated in later Qt versions. Also change the place where another pattern "while (true)" was used, to have them unique (Vector and Systec already use "for (;;)". Change-Id: I3582f7b674c17c35c6954eb359bacf81d2c1faab Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/plugins/canbus/peakcan/peakcanbackend.cpp2
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp2
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 7d4e123..9d8ac5d 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -400,7 +400,7 @@ void PeakCanBackendPrivate::startRead()
QVector<QCanBusFrame> newFrames;
- forever {
+ for (;;) {
TPCANMsg message;
::memset(&message, 0, sizeof(message));
TPCANTimestamp timestamp;
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 509008d..e28c8ab 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -633,7 +633,7 @@ void SocketCanBackend::readSocket()
{
QVector<QCanBusFrame> newFrames;
- while (true) {
+ for (;;) {
struct canfd_frame frame;
int bytesReceived;
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index cea1cd6..e5f6bb8 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -373,7 +373,7 @@ void TinyCanBackendPrivate::startRead()
QVector<QCanBusFrame> newFrames;
- forever {
+ for (;;) {
if (!::CanReceiveGetCount(channelIndex))
break;