diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-05-06 10:49:12 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-05-09 17:46:31 +0000 |
| commit | f932465ff54ff9ab702cf29ffa100279085b3818 (patch) | |
| tree | 21f198c29923eefe6b92c9b04c82ad4b44c71735 | |
| parent | 4084f96052ea1568c847f8cfb52b6ae6d205ec4d (diff) | |
Remove some more register keywords
They're deprecated since C++11 and removed in C++17.
Change-Id: Ia2acd9312707bfee96838743645a04ae1780e5dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b92267cd4c4a7c88aab950ad519943d85add1da2)
| -rw-r--r-- | examples/widgets/graphicsview/boxes/3rdparty/fbm.c | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/common.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c index 98eb87a33b..3eebaabfba 100644 --- a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c +++ b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c @@ -106,7 +106,7 @@ float noise3(float vec[3]) { int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11; float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v; - register int i, j; + int i, j; if (start) { start = 0; diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 31c6530e80..79d16fb4bd 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -1083,7 +1083,7 @@ bool QEventDispatcherWin32::unregisterTimers(QObject *object) Q_D(QEventDispatcherWin32); if (d->timerVec.isEmpty()) return false; - register WinTimerInfo *t; + WinTimerInfo *t; for (int i=0; i<d->timerVec.size(); i++) { t = d->timerVec.at(i); if (t && t->obj == object) { // object found @@ -1184,7 +1184,7 @@ int QEventDispatcherWin32::remainingTime(int timerId) quint64 currentTime = qt_msectime(); - register WinTimerInfo *t; + WinTimerInfo *t; for (int i=0; i<d->timerVec.size(); i++) { t = d->timerVec.at(i); if (t && t->timerId == timerId) { // timer found diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h index 33877e4c9d..c41634d87e 100644 --- a/tests/auto/dbus/qdbusmarshall/common.h +++ b/tests/auto/dbus/qdbusmarshall/common.h @@ -442,7 +442,7 @@ bool compareToArgument(const QDBusArgument &arg, const QVariant &v2) case QVariant::DateTime: return compare<QDateTime>(arg, v2); default: - register int id = v2.userType(); + int id = v2.userType(); if (id == qMetaTypeId<QDBusObjectPath>()) return compare<QDBusObjectPath>(arg, v2); else if (id == qMetaTypeId<QDBusSignature>()) |