From: <nn...@us...> - 2008-07-30 14:21:25
|
Revision: 2918 http://tora.svn.sourceforge.net/tora/?rev=2918&view=rev Author: nneul Date: 2008-07-30 14:21:33 +0000 (Wed, 30 Jul 2008) Log Message: ----------- silence a couple of ambiguous precedence related warnings Modified Paths: -------------- trunk/tora/src/tohelp.cpp trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/toresultmodel.cpp trunk/tora/src/tosqlparse.cpp Modified: trunk/tora/src/tohelp.cpp =================================================================== --- trunk/tora/src/tohelp.cpp 2008-07-30 14:14:04 UTC (rev 2917) +++ trunk/tora/src/tohelp.cpp 2008-07-30 14:21:33 UTC (rev 2918) @@ -172,7 +172,7 @@ dsc = QString::null; } } - else if (file.open() && file.tag() == "dd" || file.tag() == "book") + else if ((file.open() && file.tag() == "dd") || file.tag() == "book") { dsc = QString::null; inDsc = true; Modified: trunk/tora/src/tohighlightedtext.cpp =================================================================== --- trunk/tora/src/tohighlightedtext.cpp 2008-07-30 14:14:04 UTC (rev 2917) +++ trunk/tora/src/tohighlightedtext.cpp 2008-07-30 14:21:33 UTC (rev 2918) @@ -792,7 +792,7 @@ tokens.setLine(curline); tokens.setOffset(curcol); token = tokens.getToken(); - while ((invalidToken(tokens.line(), tokens.offset()) || UpperIdent(token) != cmp && lastToken != ".") && token != ";" && !token.isEmpty()) + while ((invalidToken(tokens.line(), tokens.offset()) || (UpperIdent(token) != cmp && lastToken != ".")) && token != ";" && !token.isEmpty()) token = tokens.getToken(); lastToken = token; tokens.getToken(false); Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-07-30 14:14:04 UTC (rev 2917) +++ trunk/tora/src/toresultmodel.cpp 2008-07-30 14:21:33 UTC (rev 2918) @@ -527,8 +527,8 @@ for (int i = left; i < right; i++) { - if (order == Qt::AscendingOrder && (Rows.at(i).at(column) < key) || - order == Qt::DescendingOrder && (Rows.at(i).at(column) > key)) + if ((order == Qt::AscendingOrder && (Rows.at(i).at(column) < key)) || + (order == Qt::DescendingOrder && (Rows.at(i).at(column) > key))) Rows.swap(i, store++); } Modified: trunk/tora/src/tosqlparse.cpp =================================================================== --- trunk/tora/src/tosqlparse.cpp 2008-07-30 14:14:04 UTC (rev 2917) +++ trunk/tora/src/tosqlparse.cpp 2008-07-30 14:21:33 UTC (rev 2918) @@ -885,7 +885,7 @@ return ret; } else if (upp == (",") || - (syntax.reservedWord(upp) && + ((syntax.reservedWord(upp) && upp != ("NOT") && upp != ("IS") && upp != ("LIKE") && @@ -896,7 +896,7 @@ upp != ("BETWEEN") && upp != ("ASC") && upp != ("DESC") && - upp != ("NULL")) && !nokey) + upp != ("NULL")) && !nokey)) { ret.subTokens().insert(ret.subTokens().end(), statement(statement::Keyword, token, tokens.line())); nokey = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |