From 4351ab5a4f46ba1d415b969e350edfa6c5f72c6f Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sun, 20 Dec 2009 18:15:07 +0000
Subject: [PATCH] missed some warnings and other minor updates

git-svn-id: http://svn.osgeo.org/qgis/trunk@12546 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 resources/context_help/QgsWMSSourceSelect-de_DE |  2 +-
 scripts/chkspelling.sh                          |  1 +
 scripts/spelling.dat                            |  2 ++
 src/analysis/vector/qgsgeometryanalyzer.cpp     | 13 +++++++++----
 src/core/composer/qgscomposerarrow.cpp          |  4 ++--
 src/providers/grass/qgsgrassprovider.cpp        |  2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/context_help/QgsWMSSourceSelect-de_DE b/resources/context_help/QgsWMSSourceSelect-de_DE
index f620001b50e..b00fe733ba3 100644
--- 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
index 469f509f956..7a7c820fa94 100755
--- 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
index f16d394b6a8..11fa313a355 100644
--- 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
index 9b43e7e2d62..e33c8bf62bf 100644
--- 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
index 6b64c36cbd6..5543eeb6a6c 100644
--- 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
index 65530a7cb69..0cdc52cbbd1 100644
--- 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;