missed some warnings and other minor updates

jef · jef · commit 4351ab5a4f46 · 2009-12-20T18:15:07.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12546 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/resources/context_help/QgsWMSSourceSelect-de_DE b/resources/context_help/QgsWMSSourceSelect-de_DE
@@ -32,6 +32,6 @@ Unter diesem Reiter können Sie die Reihenfolge der geladenen WMS-Layer ändern.
 <a name="search">
 <h4>Serversuche</h4>
 </a>
-Unter diesem Reiter können Sie nach WMS-Servern suchen.  Sie können Suchbegriff in einem Textfeld angeben, nachdem dann über den Knopf <label>Suche</label> gesucht wird.<p>
+Unter diesem Reiter können Sie nach WMS-Servern suchen.  Sie können einen Suchbegriff in einem Textfeld angeben, nachdem dann über den Knopf <label>Suche</label> gesucht wird.<p>
 Um das Ergebnis anzuzeigen, wählen Sie einen Eintrag und klicken auf <label>Gewählte Zeile der WMS-Liste hinzufügen</label> und wechseln wieder zum Reiter <label>Server</label>.<p>
 Sie können dann die Layerliste mit einem Klick auf den Knopf <label>Verbinden</label> erfragen.
diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -5,3 +5,4 @@ RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') |
 EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat"
 
 egrep --color=always "$RE" -r .  | egrep -v "$EX"
+egrep --color=always "$RE" resources/context_help/*-en_US
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -426,3 +426,5 @@ compatibiliy:compatibility
 determin:determine
 immediatelly:immediately
 actully:actually
+disolve:dissolve
+furter:further
diff --git a/src/analysis/vector/qgsgeometryanalyzer.cpp b/src/analysis/vector/qgsgeometryanalyzer.cpp
@@ -493,10 +493,10 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
         ++jt;
       }
       QList<double> values;
-      if( !dissolveGeometry )
+      if ( !dissolveGeometry )
       {
         QgsDebugMsg( "no dissolved geometry - should not happen" );
-	return false;
+        return false;
       }
       dissolveGeometry = dissolveGeometry->convexHull();
       values = simpleMeasure( dissolveGeometry );
@@ -539,7 +539,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
       }
       QList<double> values;
       // QgsGeometry* tmpGeometry = 0;
-      if( !dissolveGeometry )
+      if ( !dissolveGeometry )
       {
         QgsDebugMsg( "no dissolved geometry - should not happen" );
         return false;
@@ -767,7 +767,7 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
 
   QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), dp->fields(), outputType, &crs );
   QgsFeature currentFeature;
-  QgsGeometry* dissolveGeometry; //dissolve geometry (if dissolve enabled)
+  QgsGeometry *dissolveGeometry = 0; //dissolve geometry (if dissolve enabled)
 
   //take only selection
   if ( onlySelectedFeatures )
@@ -840,6 +840,11 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
   if ( dissolve )
   {
     QgsFeature dissolveFeature;
+    if ( !dissolveGeometry )
+    {
+      QgsDebugMsg( "no dissolved geometry - should not happen" );
+      return false;
+    }
     dissolveFeature.setGeometry( dissolveGeometry );
     vWriter.addFeature( dissolveFeature );
   }
diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
@@ -253,7 +253,7 @@ void QgsComposerArrow::setStartMarker( const QString& svgPath )
   if ( !r.load( svgPath ) )
   {
     return;
-    mStartArrowHeadHeight = 0;
+    // mStartArrowHeadHeight = 0;
   }
   mStartMarkerFile = svgPath;
 
@@ -269,7 +269,7 @@ void QgsComposerArrow::setEndMarker( const QString& svgPath )
   if ( !r.load( svgPath ) )
   {
     return;
-    mStopArrowHeadHeight = 0;
+    // mStopArrowHeadHeight = 0;
   }
   mEndMarkerFile = svgPath;
 
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -292,7 +292,7 @@ QString QgsGrassProvider::storageType() const
 bool QgsGrassProvider::nextFeature( QgsFeature& feature )
 {
   feature.setValid( false );
-  int cat, type, id;
+  int cat = -1, type = -1, id = -1;
   unsigned char *wkb;
   int wkbsize;
 

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@ RE=$(echo $(cut -d: -f1 scripts/spelling.dat \| sed -e 's/^/\\</; s/$/\\>\|/;') \|`
`5`	`5`	`EX="\.(svn-base\|tmp\|xpm\|ts)\|context_help\|spelling\.dat"`
`6`	`6`
`7`	`7`	`egrep --color=always "$RE" -r . \| egrep -v "$EX"`
	`8`	`+egrep --color=always "$RE" resources/context_help/*-en_US`
Original file line number	Diff line number	Diff line change
`@@ -493,10 +493,10 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap`
`493`	`493`	`++jt;`
`494`	`494`	`}`
`495`	`495`	`QList<double> values;`
`496`		`- if( !dissolveGeometry )`
	`496`	`+ if ( !dissolveGeometry )`
`497`	`497`	`{`
`498`	`498`	`QgsDebugMsg( "no dissolved geometry - should not happen" );`
`499`		`- return false;`
	`499`	`+ return false;`
`500`	`500`	`}`
`501`	`501`	`dissolveGeometry = dissolveGeometry->convexHull();`
`502`	`502`	`values = simpleMeasure( dissolveGeometry );`
`@@ -539,7 +539,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap`
`539`	`539`	`}`
`540`	`540`	`QList<double> values;`
`541`	`541`	`// QgsGeometry* tmpGeometry = 0;`
`542`		`- if( !dissolveGeometry )`
	`542`	`+ if ( !dissolveGeometry )`
`543`	`543`	`{`
`544`	`544`	`QgsDebugMsg( "no dissolved geometry - should not happen" );`
`545`	`545`	`return false;`
`@@ -767,7 +767,7 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil`
`767`	`767`
`768`	`768`	`QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), dp->fields(), outputType, &crs );`
`769`	`769`	`QgsFeature currentFeature;`
`770`		`- QgsGeometry* dissolveGeometry; //dissolve geometry (if dissolve enabled)`
	`770`	`+ QgsGeometry *dissolveGeometry = 0; //dissolve geometry (if dissolve enabled)`
`771`	`771`
`772`	`772`	`//take only selection`
`773`	`773`	`if ( onlySelectedFeatures )`
`@@ -840,6 +840,11 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil`
`840`	`840`	`if ( dissolve )`
`841`	`841`	`{`
`842`	`842`	`QgsFeature dissolveFeature;`
	`843`	`+ if ( !dissolveGeometry )`
	`844`	`+ {`
	`845`	`+ QgsDebugMsg( "no dissolved geometry - should not happen" );`
	`846`	`+ return false;`
	`847`	`+ }`
`843`	`848`	`dissolveFeature.setGeometry( dissolveGeometry );`
`844`	`849`	`vWriter.addFeature( dissolveFeature );`
`845`	`850`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ void QgsComposerArrow::setStartMarker( const QString& svgPath )`
`253`	`253`	`if ( !r.load( svgPath ) )`
`254`	`254`	`{`
`255`	`255`	`return;`
`256`		`- mStartArrowHeadHeight = 0;`
	`256`	`+ // mStartArrowHeadHeight = 0;`
`257`	`257`	`}`
`258`	`258`	`mStartMarkerFile = svgPath;`
`259`	`259`
`@@ -269,7 +269,7 @@ void QgsComposerArrow::setEndMarker( const QString& svgPath )`
`269`	`269`	`if ( !r.load( svgPath ) )`
`270`	`270`	`{`
`271`	`271`	`return;`
`272`		`- mStopArrowHeadHeight = 0;`
	`272`	`+ // mStopArrowHeadHeight = 0;`
`273`	`273`	`}`
`274`	`274`	`mEndMarkerFile = svgPath;`
`275`	`275`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ QString QgsGrassProvider::storageType() const`
`292`	`292`	`bool QgsGrassProvider::nextFeature( QgsFeature& feature )`
`293`	`293`	`{`
`294`	`294`	`feature.setValid( false );`
`295`		`- int cat, type, id;`
	`295`	`+ int cat = -1, type = -1, id = -1;`
`296`	`296`	`unsigned char *wkb;`
`297`	`297`	`int wkbsize;`
`298`	`298`