From: Bradley T. Hughes Date: Tue, 25 Oct 2011 11:29:09 +0000 (+0200) Subject: Silence warning from clang X-Git-Tag: qt-v5.0.0-alpha1~3052 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87b1ca756c589bbc679ac7e31f7d0d9704a0b064;p=profile%2Fivi%2Fqtbase.git Silence warning from clang ../../corelib/tools/qlocale_mac.mm:78:13: warning: '&&' within '||' [-Wlogical-op-parentheses] ...&& !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)... ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../corelib/tools/qlocale_mac.mm:78:13: note: place parentheses around the '&&' expression to silence this warning && !qt_splitLocaleName(QString::fromLocal8Bit(result), ... ^ Change-Id: I64f745e7dfa64f28f264667372ed64f9e34ca3b7 Reviewed-by: Robin Burchell Reviewed-by: Thiago Macieira (Intel) --- diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 8919141..82b6b00 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -74,8 +74,8 @@ static QByteArray getMacLocaleName() QByteArray result = envVarLocale(); QString lang, script, cntry; - if (result.isEmpty() || result != "C" - && !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) { + if (result.isEmpty() + || (result != "C" && !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry))) { QCFType l = CFLocaleCopyCurrent(); CFStringRef locale = CFLocaleGetIdentifier(l); result = QCFString::toQString(locale).toUtf8();