fix typos and some warnings

qgis · Aug 23, 2012 · 15b46e6 · 15b46e6
1 parent 4be392a
commit 15b46e6
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -456,3 +456,4 @@ writeable:writable
 vaild:valid
 opps:oops
 arount:around
+acheive:achieve
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2409,7 +2409,7 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
 
   }
 
-  // make sure at least one layer was succesfully added
+  // make sure at least one layer was successfully added
   if ( myList.count() == 0 )
   {
     return false;
@@ -7360,7 +7360,7 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
     else
     {
       // Issue message box warning unless we are loading from cmd line since
-      // non-rasters are passed to this function first and then sucessfully
+      // non-rasters are passed to this function first and then successfully
       // loaded afterwards (see main.cpp)
 
       if ( guiWarning )

diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -504,7 +504,6 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale )
         mRenderContext.painter()->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
       }
 
-
       if ( !ml->draw( mRenderContext ) )
       {
         emit drawError( ml );

diff --git a/src/core/qgsrasterdataprovider.h b/src/core/qgsrasterdataprovider.h
@@ -526,7 +526,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     }
 
     /** Set no data value on created dataset */
-    virtual bool setNoDataValue( int bandNo, double noDataValue ) { return false; }
+    virtual bool setNoDataValue( int, double ) { return false; }
 
     /**Returns the formats supported by create()*/
     virtual QStringList createFormats() const { return QStringList(); }

diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
@@ -261,6 +261,8 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster(
   QgsRasterDataProvider* destProvider,
   QProgressDialog* progressDialog )
 {
+  Q_UNUSED( pipe );
+  Q_UNUSED( destHasNoDataValueList );
   QgsDebugMsg( "Entered" );
 
   const QgsRasterInterface* iface = iter->input();

diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h
@@ -44,7 +44,7 @@ class CORE_EXPORT QgsRasterFileWriter
     ~QgsRasterFileWriter();
 
     /**Write raster file
-        @param iter raster iterator
+        @param pipe raster pipe
         @param nCols number of output columns
         @param nRows number of output rows (or -1 to automatically calculate row number to have square pixels)
         @param outputExtent extent to output

diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstylev2.h
@@ -106,7 +106,7 @@ class CORE_EXPORT QgsStyleV2
     //! adds a new tag and returns the tag's id
     int addTag( QString tagName );
 
-    //! applies the specifed group to the symbol or colorramp specified by StyleEntity
+    //! applies the specified group to the symbol or colorramp specified by StyleEntity
     bool group( StyleEntity type, QString name, int groupid );
 
     //! rename the given entity with the specified id

diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp
@@ -84,7 +84,7 @@ void QgsMapCanvasMap::render()
 
     paint.end();
 
-    // convert QImage to QPixmap to acheive faster drawing on screen
+    // convert QImage to QPixmap to achieve faster drawing on screen
     mPixmap = QPixmap::fromImage( mImage );
   }
   else

diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp
@@ -177,7 +177,7 @@ void QgsOWSSourceSelect::populateFormats()
   formatsMap.insert( "jpg", "jpeg" );
   formatsMap.insert( "png", "png" );
 
-  int prefered = -1;
+  int preferred = -1;
   int firstEnabled = -1;
   QStringList layersFormats = selectedLayersFormats();
   for ( int i = 0; i < layersFormats.size(); i++ )
@@ -213,9 +213,9 @@ void QgsOWSSourceSelect::populateFormats()
       if ( firstEnabled < 0 ) { firstEnabled = i; }
       if ( simpleFormat.contains( "tif" ) ) // prefer *tif*
       {
-        if ( prefered < 0 || simpleFormat.startsWith( "g" ) ) // prefere geotiff
+        if ( preferred < 0 || simpleFormat.startsWith( "g" ) ) // prefer geotiff
         {
-          prefered = i;
+          preferred = i;
         }
       }
     }
@@ -230,12 +230,12 @@ void QgsOWSSourceSelect::populateFormats()
     btn->setText( label );
     btn->setToolTip( tip );
   }
-  // Set prefered
+  // Set preferred
   // TODO: all enabled for now, see above
-  prefered = prefered >= 0 ? prefered : firstEnabled;
+  preferred = preferred >= 0 ? preferred : firstEnabled;
-  if ( prefered >= 0 )
+  if ( preferred >= 0 )
   {
-    mImageFormatGroup->button( prefered )->setChecked( true );
+    mImageFormatGroup->button( preferred )->setChecked( true );
   }
 
   mImageFormatsGroupBox->setEnabled( true );