summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDirk Mueller <dmueller@suse.de>2010-02-17 22:04:34 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-17 22:04:34 (GMT)
commit884ea10d037d855b91ea5ef947b5c23d2f09aead (patch)
tree1f9b58d4a190e73ed1f8d291d3887cf2d88b2bc3 /src/gui
parent01cf14ef278f564936eff9a392679526fe14e530 (diff)
downloadQt-884ea10d037d855b91ea5ef947b5c23d2f09aead.zip
Qt-884ea10d037d855b91ea5ef947b5c23d2f09aead.tar.gz
Qt-884ea10d037d855b91ea5ef947b5c23d2f09aead.tar.bz2
Fix undefined sequence point compiler warning
level = ++level is not guaranteed to work, as the increment is not required to happen before the assignment. Change this code to be less obscure and use standard defined behavior. Merge-request: 471 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 6d108b0..d89276f 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -215,7 +215,7 @@ bool QSoftKeyManager::handleUpdateSoftKeys()
if (source) {
bool added = appendSoftkeys(*source, level);
source = softkeySource(source, recursiveMerging);
- level = added ? ++level : level;
+ level = added ? level + 1 : level;
}
} while (source);