Skip to content
Permalink
Browse files

Fix some errors/typos

  • Loading branch information
sikmir authored and m-kuhn committed Jan 19, 2017
1 parent ff8d912 commit b45469f1375e65fd1f372069f6114b396763f8a4
@@ -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;
}
@@ -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
{
@@ -228,7 +228,7 @@ QString QgsAuthMethodRegistry::pluginList( bool asHtml ) const

if ( asHtml )
{
list + "<br></li>";
list += "<br></li>";
}
else
{
@@ -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 )
@@ -508,6 +508,7 @@ bool QgsComposerAttributeTableV2::getTableContents( QgsComposerTableContents &co
expression->prepare( &context );
QVariant value = expression->evaluate( &context );
currentRow << value;
delete expression;
}
}

@@ -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 );
@@ -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() ) );
}
@@ -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';

@@ -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 )
{
@@ -71,7 +71,7 @@ void QgsGCPCanvasItem::paint( QPainter* p )
}
else if ( showIDs )
{
msg = msg = QString::number( id );
msg = QString::number( id );
}
else if ( showCoords )
{
@@ -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 )
{

0 comments on commit b45469f

Please sign in to comment.
You can’t perform that action at this time.