Fix some logical-not-parentheses warnings thrown by clang 5.1

qgis · Apr 5, 2014 · 3a43380 · 3a43380
1 parent 8bd80f4
commit 3a43380
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -175,7 +175,7 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureCheckBox_stateChanged( int s
 void QgsAtlasCompositionWidget::updateAtlasFeatures()
 {
   //only do this if composer mode is preview
-  if ( !mComposition->atlasMode() == QgsComposition::PreviewAtlas )
+  if ( !( mComposition->atlasMode() == QgsComposition::PreviewAtlas ) )
   {
     return;
   }

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -3114,7 +3114,7 @@ void QgsComposer::setAtlasFeature( QgsMapLayer* layer, QgsFeature * feat )
 
   //check if composition has atlas preview
   QgsAtlasComposition& atlas = mComposition->atlasComposition();
-  if ( ! atlas.enabled() || ! mComposition->atlasMode() == QgsComposition::PreviewAtlas || atlas.coverageLayer() != layer )
+  if ( ! atlas.enabled() || !( mComposition->atlasMode() == QgsComposition::PreviewAtlas ) || atlas.coverageLayer() != layer )
   {
     //either atlas preview isn't enabled, or layer doesn't match
     return;

diff --git a/src/astyle/ASBeautifier.cpp b/src/astyle/ASBeautifier.cpp
@@ -1032,7 +1032,7 @@ string ASBeautifier::beautify(const string &originalLine)
 			outBuffer.append(1, '*');
 			i++;
 			size_t j = line.find_first_not_of(" \t");
-			if (!line.compare(j, 2, "/*") == 0)	// does line start with comment?
+      if (!(line.compare(j, 2, "/*") == 0))	// does line start with comment?
 				blockCommentNoIndent = true;		// if no, cannot indent continuation lines
 			continue;
 		}

diff --git a/src/astyle/ASFormatter.cpp b/src/astyle/ASFormatter.cpp
@@ -2212,7 +2212,7 @@ void ASFormatter::formatBrackets(BracketType bracketType)
 		else
 		{
 			if (!isCharImmediatelyPostComment
-			        && !bracketFormatMode == NONE_MODE
+              && !(bracketFormatMode == NONE_MODE)
 			        && !isImmediatelyPostEmptyBlock)
 				isInLineBreak = false;
 

diff --git a/src/core/qgsnetworkreplyparser.cpp b/src/core/qgsnetworkreplyparser.cpp
@@ -53,7 +53,7 @@ QgsNetworkReplyParser::QgsNetworkReplyParser( QNetworkReply *reply )
 
     QRegExp re( ".*boundary=\"?([^\"]+)\"?\\s?", Qt::CaseInsensitive );
 
-    if ( !re.indexIn( contentType ) == 0 )
+    if ( !( re.indexIn( contentType ) == 0 ) )
     {
       mError = tr( "Cannot find boundary in multipart content type" );
       return;

diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
@@ -46,7 +46,7 @@ class TreeFilterProxyModel : public QSortFilterProxyModel
     bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const
     {
       QgsCptCityDataItem* item = mModel->dataItem( mModel->index( sourceRow, 0, sourceParent ) );
-      return ( item && ! item->type() == QgsCptCityDataItem::ColorRamp );
+      return ( item && !( item->type() == QgsCptCityDataItem::ColorRamp ) );
     }
     // bool lessThan(const QModelIndex &left, const QModelIndex &right) const;