[QGIS Commit] r12546 - in trunk/qgis: resources/context_help scripts src/analysis/vector src/core/composer src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-20 13:15:07 -0500 (Sun, 20 Dec 2009)
New Revision: 12546

Modified:
   trunk/qgis/resources/context_help/QgsWMSSourceSelect-de_DE
   trunk/qgis/scripts/chkspelling.sh
   trunk/qgis/scripts/spelling.dat
   trunk/qgis/src/analysis/vector/qgsgeometryanalyzer.cpp
   trunk/qgis/src/core/composer/qgscomposerarrow.cpp
   trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
Log:
missed some warnings and other minor updates

Modified: trunk/qgis/resources/context_help/QgsWMSSourceSelect-de_DE
===================================================================
--- trunk/qgis/resources/context_help/QgsWMSSourceSelect-de_DE	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/resources/context_help/QgsWMSSourceSelect-de_DE	2009-12-20 18:15:07 UTC (rev 12546)
@@ -32,6 +32,6 @@
 <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.

Modified: trunk/qgis/scripts/chkspelling.sh
===================================================================
--- trunk/qgis/scripts/chkspelling.sh	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/scripts/chkspelling.sh	2009-12-20 18:15:07 UTC (rev 12546)
@@ -5,3 +5,4 @@
 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

Modified: trunk/qgis/scripts/spelling.dat
===================================================================
--- trunk/qgis/scripts/spelling.dat	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/scripts/spelling.dat	2009-12-20 18:15:07 UTC (rev 12546)
@@ -426,3 +426,5 @@
 determin:determine
 immediatelly:immediately
 actully:actually
+disolve:dissolve
+furter:further

Modified: trunk/qgis/src/analysis/vector/qgsgeometryanalyzer.cpp
===================================================================
--- trunk/qgis/src/analysis/vector/qgsgeometryanalyzer.cpp	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/src/analysis/vector/qgsgeometryanalyzer.cpp	2009-12-20 18:15:07 UTC (rev 12546)
@@ -493,10 +493,10 @@
         ++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 @@
       }
       QList<double> values;
       // QgsGeometry* tmpGeometry = 0;
-      if( !dissolveGeometry )
+      if ( !dissolveGeometry )
       {
         QgsDebugMsg( "no dissolved geometry - should not happen" );
         return false;
@@ -767,7 +767,7 @@
 
   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 @@
   if ( dissolve )
   {
     QgsFeature dissolveFeature;
+    if ( !dissolveGeometry )
+    {
+      QgsDebugMsg( "no dissolved geometry - should not happen" );
+      return false;
+    }
     dissolveFeature.setGeometry( dissolveGeometry );
     vWriter.addFeature( dissolveFeature );
   }

Modified: trunk/qgis/src/core/composer/qgscomposerarrow.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerarrow.cpp	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/src/core/composer/qgscomposerarrow.cpp	2009-12-20 18:15:07 UTC (rev 12546)
@@ -253,7 +253,7 @@
   if ( !r.load( svgPath ) )
   {
     return;
-    mStartArrowHeadHeight = 0;
+    // mStartArrowHeadHeight = 0;
   }
   mStartMarkerFile = svgPath;
 
@@ -269,7 +269,7 @@
   if ( !r.load( svgPath ) )
   {
     return;
-    mStopArrowHeadHeight = 0;
+    // mStopArrowHeadHeight = 0;
   }
   mEndMarkerFile = svgPath;
 

Modified: trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2009-12-20 18:13:22 UTC (rev 12545)
+++ trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2009-12-20 18:15:07 UTC (rev 12546)
@@ -292,7 +292,7 @@
 bool QgsGrassProvider::nextFeature( QgsFeature& feature )
 {
   feature.setValid( false );
-  int cat, type, id;
+  int cat = -1, type = -1, id = -1;
   unsigned char *wkb;
   int wkbsize;