Fixes after review

wonder-sk · wonder-sk · commit 1f6cd31fab9b · 2017-12-05T08:58:23.000+01:00
diff --git a/src/3d/qgs3dutils.cpp b/src/3d/qgs3dutils.cpp
@@ -90,8 +90,8 @@ QString Qgs3DUtils::cullingModeToString( Qt3DRender::QCullFace::CullingMode mode
     case Qt3DRender::QCullFace::Front: return QStringLiteral( "front" );
     case Qt3DRender::QCullFace::Back: return QStringLiteral( "back" );
     case Qt3DRender::QCullFace::FrontAndBack: return QStringLiteral( "front-and-back" );
-    default: return QString();
   }
+  return QString();
 }
 
 Qt3DRender::QCullFace::CullingMode Qgs3DUtils::cullingModeFromString( const QString &str )
diff --git a/src/3d/qgstessellator.cpp b/src/3d/qgstessellator.cpp
@@ -420,7 +420,7 @@ void QgsTessellator::addPolygon( const QgsPolygon &polygon, float extrusionHeigh
       polylinesToDelete << holePolyline;
     }
 
-    // run triangulation and write vertices to the ouput data array
+    // run triangulation and write vertices to the output data array
     try
     {
       cdt->Triangulate();
diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -113,7 +113,7 @@ Qt3DExtras::QPhongMaterial *QgsPolygon3DSymbolEntity::material( const QgsPolygon
 
   // front/back side culling
   auto techniques = material->effect()->techniques();
-  for ( auto tit = techniques.begin(); tit != techniques.end(); ++tit )
+  for ( auto tit = techniques.constBegin(); tit != techniques.constEnd(); ++tit )
   {
     auto renderPasses = ( *tit )->renderPasses();
     for ( auto rpit = renderPasses.begin(); rpit != renderPasses.end(); ++rpit )

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ QString Qgs3DUtils::cullingModeToString( Qt3DRender::QCullFace::CullingMode mode`
`90`	`90`	`case Qt3DRender::QCullFace::Front: return QStringLiteral( "front" );`
`91`	`91`	`case Qt3DRender::QCullFace::Back: return QStringLiteral( "back" );`
`92`	`92`	`case Qt3DRender::QCullFace::FrontAndBack: return QStringLiteral( "front-and-back" );`
`93`		`- default: return QString();`
`94`	`93`	`}`
	`94`	`+ return QString();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`Qt3DRender::QCullFace::CullingMode Qgs3DUtils::cullingModeFromString( const QString &str )`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ void QgsTessellator::addPolygon( const QgsPolygon &polygon, float extrusionHeigh`
`420`	`420`	`polylinesToDelete << holePolyline;`
`421`	`421`	`}`
`422`	`422`
`423`		`- // run triangulation and write vertices to the ouput data array`
	`423`	`+ // run triangulation and write vertices to the output data array`
`424`	`424`	`try`
`425`	`425`	`{`
`426`	`426`	`cdt->Triangulate();`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ Qt3DExtras::QPhongMaterial *QgsPolygon3DSymbolEntity::material( const QgsPolygon`
`113`	`113`
`114`	`114`	`// front/back side culling`
`115`	`115`	`auto techniques = material->effect()->techniques();`
`116`		`- for ( auto tit = techniques.begin(); tit != techniques.end(); ++tit )`
	`116`	`+ for ( auto tit = techniques.constBegin(); tit != techniques.constEnd(); ++tit )`
`117`	`117`	`{`
`118`	`118`	`auto renderPasses = ( *tit )->renderPasses();`
`119`	`119`	`for ( auto rpit = renderPasses.begin(); rpit != renderPasses.end(); ++rpit )`