Fix some errors/typos

qgis · Jan 19, 2017 · b45469f · b45469f
1 parent ff8d912
commit b45469f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -44,7 +44,7 @@ QgsMapToolMeasureAngle::~QgsMapToolMeasureAngle()
 
 void QgsMapToolMeasureAngle::canvasMoveEvent( QgsMapMouseEvent* e )
 {
-  if ( !mRubberBand || mAnglePoints.size() < 1 || mAnglePoints.size() > 2 || !mRubberBand )
+  if ( !mRubberBand || mAnglePoints.size() < 1 || mAnglePoints.size() > 2 )
   {
     return;
   }

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -418,7 +418,7 @@ QgsGeometry QgsMapToolOffsetCurve::linestringFromPolygon( const QgsGeometry& fea
   else if ( geomType == QgsWkbTypes::MultiPolygon || geomType == QgsWkbTypes::MultiPolygon25D )
   {
     //iterate all polygons / rings
-    QgsMultiPolygon multiPoly = featureGeom.asMultiPolygon();
+    multiPoly = featureGeom.asMultiPolygon();
   }
   else
   {

diff --git a/src/core/auth/qgsauthmethodregistry.cpp b/src/core/auth/qgsauthmethodregistry.cpp
@@ -228,7 +228,7 @@ QString QgsAuthMethodRegistry::pluginList( bool asHtml ) const
 
     if ( asHtml )
     {
-      list + "<br></li>";
+      list += "<br></li>";
     }
     else
     {

diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -683,10 +683,10 @@ bool QgsAtlasComposition::setFilenamePattern( const QString& pattern )
 QgsExpressionContext QgsAtlasComposition::createExpressionContext()
 {
   QgsExpressionContext expressionContext;
-  expressionContext << QgsExpressionContextUtils::globalScope()
-  << QgsExpressionContextUtils::projectScope( mComposition->project() );
+  expressionContext << QgsExpressionContextUtils::globalScope();
   if ( mComposition )
-    expressionContext << QgsExpressionContextUtils::compositionScope( mComposition );
+    expressionContext << QgsExpressionContextUtils::projectScope( mComposition->project() )
+    << QgsExpressionContextUtils::compositionScope( mComposition );
 
   expressionContext.appendScope( QgsExpressionContextUtils::atlasScope( this ) );
   if ( mCoverageLayer )

diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -508,6 +508,7 @@ bool QgsComposerAttributeTableV2::getTableContents( QgsComposerTableContents &co
         expression->prepare( &context );
         QVariant value = expression->evaluate( &context );
         currentRow << value;
+        delete expression;
       }
     }
 

diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -3653,7 +3653,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QgsCoordinateT
 
   QColor penColor;
   QColor brushColor;
-  if ( mSymbologyExport != NoSymbology )
+  if ( mSymbologyExport != NoSymbology && symbolLayer )
   {
     penColor = colorFromSymbolLayer( symbolLayer, ctx );
     brushColor = symbolLayer->dxfBrushColor( ctx );

diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
@@ -272,7 +272,7 @@ void QgsEditFormConfig::readXml( const QDomNode& node )
   }
 
   QDomNode editFormInitCodeSourceNode = node.namedItem( QStringLiteral( "editforminitcodesource" ) );
-  if ( !editFormInitCodeSourceNode.isNull() || ( !editFormInitCodeSourceNode.isNull() && !editFormInitCodeSourceNode.toElement().text().isEmpty() ) )
+  if ( !editFormInitCodeSourceNode.isNull() && !editFormInitCodeSourceNode.toElement().text().isEmpty() )
   {
     setInitCodeSource( static_cast< QgsEditFormConfig::PythonInitCodeSource >( editFormInitCodeSourceNode.toElement().text().toInt() ) );
   }
@@ -297,7 +297,7 @@ void QgsEditFormConfig::readXml( const QDomNode& node )
   }
 
   QDomNode editFormInitFilePathNode = node.namedItem( QStringLiteral( "editforminitfilepath" ) );
-  if ( !editFormInitFilePathNode.isNull() || ( !editFormInitFilePathNode.isNull() && !editFormInitFilePathNode.toElement().text().isEmpty() ) )
+  if ( !editFormInitFilePathNode.isNull() && !editFormInitFilePathNode.toElement().text().isEmpty() )
   {
     setInitFilePath( QgsProject::instance()->readPath( editFormInitFilePathNode.toElement().text() ) );
   }

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -308,7 +308,7 @@ QString QgsProviderRegistry::pluginList( bool asHTML ) const
     list += it->second->description();
 
     if ( asHTML )
-      list + "<br></li>";
+      list += "<br></li>";
     else
       list += '\n';
 

diff --git a/src/core/qgstaskmanager.cpp b/src/core/qgstaskmanager.cpp
@@ -669,7 +669,7 @@ void QgsTaskManager::layersWillBeRemoved( const QStringList& layerIds )
       }
 
       QgsTask* dependentTask = task( it.key() );
-      if ( dependentTask && ( dependentTask->status() != QgsTask::Complete || dependentTask->status() != QgsTask::Terminated ) )
+      if ( dependentTask && ( dependentTask->status() != QgsTask::Complete && dependentTask->status() != QgsTask::Terminated ) )
       {
         // incomplete task is dependent on this layer!
         dependentTask->cancel();
@@ -706,7 +706,7 @@ bool QgsTaskManager::cleanupAndDeleteTask( QgsTask *task )
   mTasks.remove( id );
   mLayerDependencies.remove( id );
 
-  if ( task->status() != QgsTask::Complete || task->status() != QgsTask::Terminated )
+  if ( task->status() != QgsTask::Complete && task->status() != QgsTask::Terminated )
   {
     if ( isParent )
     {

diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
@@ -71,7 +71,7 @@ void QgsGCPCanvasItem::paint( QPainter* p )
   }
   else if ( showIDs )
   {
-    msg = msg = QString::number( id );
+    msg = QString::number( id );
   }
   else if ( showCoords )
   {

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -739,7 +739,7 @@ QStringList QgsOgrProvider::subLayers() const
         fCount.remove( wkbCircularString );
       }
 
-      bool bIs25D = ( wkbHasZ( layerGeomType ) != 0 );
+      bool bIs25D = wkbHasZ( layerGeomType );
       QMap<OGRwkbGeometryType, int>::const_iterator countIt = fCount.constBegin();
       for ( ; countIt != fCount.constEnd(); ++countIt )
       {