fix typo

jef-n · jef-n · commit 3390f23fd6a5 · 2015-07-10T21:51:41.000+02:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1733,15 +1733,15 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
 
   const GEOSGeometry* geos_geom = 0;
   const QgsGeometry* preparedGeom = geom;
-  QScopedPointer<QgsGeometry> scpoedPreparedGeom;
+  QScopedPointer<QgsGeometry> scopedPreparedGeom;
 
   if ( QgsPalLabeling::geometryRequiresPreparation( geom, context, ct, doClip ? extentGeom : 0 ) )
   {
-    scpoedPreparedGeom.reset( QgsPalLabeling::prepareGeometry( geom, context, ct, doClip ? extentGeom : 0 ) );
-    if ( !scpoedPreparedGeom.data() )
+    scopedPreparedGeom.reset( QgsPalLabeling::prepareGeometry( geom, context, ct, doClip ? extentGeom : 0 ) );
+    if ( !scopedPreparedGeom.data() )
       return;
-    preparedGeom = scpoedPreparedGeom.data();
-    geos_geom = scpoedPreparedGeom.data()->asGeos();
+    preparedGeom = scopedPreparedGeom.data();
+    geos_geom = scopedPreparedGeom.data()->asGeos();
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -1733,15 +1733,15 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1733`	`1733`
`1734`	`1734`	`const GEOSGeometry* geos_geom = 0;`
`1735`	`1735`	`const QgsGeometry* preparedGeom = geom;`
`1736`		`- QScopedPointer<QgsGeometry> scpoedPreparedGeom;`
	`1736`	`+ QScopedPointer<QgsGeometry> scopedPreparedGeom;`
`1737`	`1737`
`1738`	`1738`	`if ( QgsPalLabeling::geometryRequiresPreparation( geom, context, ct, doClip ? extentGeom : 0 ) )`
`1739`	`1739`	`{`
`1740`		`- scpoedPreparedGeom.reset( QgsPalLabeling::prepareGeometry( geom, context, ct, doClip ? extentGeom : 0 ) );`
`1741`		`- if ( !scpoedPreparedGeom.data() )`
	`1740`	`+ scopedPreparedGeom.reset( QgsPalLabeling::prepareGeometry( geom, context, ct, doClip ? extentGeom : 0 ) );`
	`1741`	`+ if ( !scopedPreparedGeom.data() )`
`1742`	`1742`	`return;`
`1743`		`- preparedGeom = scpoedPreparedGeom.data();`
`1744`		`- geos_geom = scpoedPreparedGeom.data()->asGeos();`
	`1743`	`+ preparedGeom = scopedPreparedGeom.data();`
	`1744`	`+ geos_geom = scopedPreparedGeom.data()->asGeos();`
`1745`	`1745`	`}`
`1746`	`1746`	`else`
`1747`	`1747`	`{`