Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Sep 7, 2012 · 32ea8f9 · 32ea8f9
2 parents d686fbe + 26dc406
commit 32ea8f9
Show file tree

Hide file tree

Showing 67 changed files with 2,710 additions and 1,794 deletions.
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -29,6 +29,7 @@ Giuseppe Sucameli
 Horst Duester
 Hyao (IRC nickname)
 Ivan Lucena
+Jaka Kranjc (lynxlynxlynx)
 Jean-Denis Giguere
 Jeremy Palmer
 Jerrit Collord

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/python/core/qgsrectangle.sip b/python/core/qgsrectangle.sip
@@ -56,7 +56,7 @@ class QgsRectangle
     //! Scale the rectangle around its center point
     void scale(double, const QgsPoint *c =0);
     //! Expand the rectangle to support zoom out scaling
-    // @deprecated use scale instead
+    // @deprecated in 1.9 use scale instead
     void expand(double, const QgsPoint *c = 0) /Deprecated/;
     //! return the intersection with the given rectangle
     QgsRectangle intersect(const QgsRectangle *rect);

diff --git a/resources/function_help/coalesce-en_US b/resources/function_help/coalesce-en_US
@@ -0,0 +1,19 @@
+<h3>coalesce() function</h3>
+Returns the first non-NULL value from the expression list.
+<br>
+This function can take any number of arguments.
+<h4>Syntax</h4>
+<code>coalesce(expression1, expression2 ...)</code><br>
+
+<h4>Arguments</h4>
+<code>expression</code> - any valid expression or value, irregardless of type.
+<br>
+
+<h4>Example</h4>
+<!-- Show example of function.-->
+<code>coalesce(NULL, 2) &rarr; 2</code><br>
+<code>coalesce(NULL, 2, 3) &rarr; 2</code><br>
+<code>coalesce(7, NULL, 3*2) &rarr; 7</code><br><br>
+<code>coalesce("fieldA", "fallbackField", 'ERROR') &rarr; value of fieldA if it is non-NULL
+ else the value of "fallbackField" or the string 'ERROR' if both are NULL</code><br>
+
diff --git a/src/app/gps/qwtpolar-0.1/qwt_polar_canvas.cpp b/src/app/gps/qwtpolar-0.1/qwt_polar_canvas.cpp
@@ -219,7 +219,7 @@ void QwtPolarCanvas::drawContents( QPainter *painter )
 }
 
 /*!
-  Draw the the canvas
+  Draw the canvas
 
   Paints all plot items to the canvasRect, using QwtPolarPlot::drawCanvas
   and updates the paint cache.

diff --git a/src/app/gps/qwtpolar-0.1/qwt_polar_curve.h b/src/app/gps/qwtpolar-0.1/qwt_polar_curve.h
@@ -117,13 +117,13 @@ class QWT_POLAR_EXPORT QwtPolarCurve: public QwtPolarItem
     PrivateData *d_data;
 };
 
-//! \return the the curve data
+//! \return the curve data
 inline QwtData &QwtPolarCurve::data()
 {
   return *d_points;
 }
 
-//! \return the the curve data
+//! \return the curve data
 inline const QwtData &QwtPolarCurve::data() const
 {
   return *d_points;

diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_curve.h b/src/app/gps/qwtpolar-1.0/qwt_polar_curve.h
@@ -143,7 +143,7 @@ class QWT_POLAR_EXPORT QwtPolarCurve: public QwtPolarItem
     PrivateData *d_data;
 };
 
-//! \return the the curve data
+//! \return the curve data
 inline const QwtSeriesData<QwtPointPolar> *QwtPolarCurve::data() const
 {
     return d_series;

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -290,7 +290,7 @@ const int AFTER_RECENT_PATHS = 321;
   if the project file is null then
   set title text to just application name and version
   else
-  set set title text to the the project file name
+  set set title text to the project file name
   else
   set the title text to project title
   */
@@ -511,9 +511,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 
   // create the notification widget for macros
   mMacrosWarn = QgsMessageBar::createMessage( tr( "Security warning:" ),
-                                              tr( "macros have been disabled." ),
-                                              QgsApplication::getThemeIcon( "/mIconWarn.png" ),
-                                              mInfoBar );
+                tr( "macros have been disabled." ),
+                QgsApplication::getThemeIcon( "/mIconWarn.png" ),
+                mInfoBar );
 
   QToolButton *btnEnableMacros = new QToolButton( mMacrosWarn );
   btnEnableMacros->setText( tr( "Enable" ) );

diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -607,7 +607,7 @@ void QgsAttributeTypeDialog::accept()
       mValueRelationData.mAllowNull = valueRelationAllowNull->isChecked();
       mValueRelationData.mOrderByValue = valueRelationOrderByValue->isChecked();
       mValueRelationData.mAllowMulti = valueRelationAllowMulti->isChecked();
-      if( valueRelationFilterColumn->currentIndex() == 0 )
+      if ( valueRelationFilterColumn->currentIndex() == 0 )
       {
         mValueRelationData.mFilterAttributeColumn = QString::null;
         mValueRelationData.mFilterAttributeValue = QString::null;
@@ -655,7 +655,7 @@ void QgsAttributeTypeDialog::updateLayerColumns( int idx )
   valueRelationKeyColumn->setCurrentIndex( valueRelationKeyColumn->findText( mValueRelationData.mKey ) );
   valueRelationValueColumn->setCurrentIndex( valueRelationValueColumn->findText( mValueRelationData.mValue ) );
 
-  if( mValueRelationData.mFilterAttributeColumn.isNull() )
+  if ( mValueRelationData.mFilterAttributeColumn.isNull() )
   {
     valueRelationFilterColumn->setCurrentIndex( 0 );
   }
@@ -683,7 +683,7 @@ void QgsAttributeTypeDialog::updateFilterColumn( int idx )
   QList<QVariant> uniqueValues;
   vl->uniqueValues( fidx, uniqueValues );
 
-  foreach( const QVariant &v, uniqueValues )
+  foreach ( const QVariant &v, uniqueValues )
   {
     valueRelationFilterValue->addItem( v.toString(), v );
   }

diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -376,6 +376,7 @@ void QgsDiagramProperties::on_mAddCategoryPushButton_clicked()
 
 void QgsDiagramProperties::on_mAttributesTreeWidget_itemDoubleClicked( QTreeWidgetItem * item, int column )
 {
+  Q_UNUSED( column );
   addAttribute( item );
 }
 
@@ -480,7 +481,7 @@ void QgsDiagramProperties::apply()
     if ( !mFixedSizeCheckBox->isChecked() && !scaleAttributeValueIsNumeric )
     {
       QMessageBox::warning( this, tr( "No attribute value specified" ),
-                            tr( "You did not specify a maximum value for the diagram size. Please specify the the attribute and a reference value as a base for scaling in the Tab Diagram / Size." ), QMessageBox::Ok );
+                            tr( "You did not specify a maximum value for the diagram size. Please specify the attribute and a reference value as a base for scaling in the Tab Diagram / Size." ), QMessageBox::Ok );
     }
 
     QgsDiagram* diagram = 0;

diff --git a/src/app/qgsmaptoolselectutils.h b/src/app/qgsmaptoolselectutils.h
@@ -39,7 +39,7 @@ namespace QgsMapToolSelectUtils
     must be in terms of the canvas coordinate system.
     @param doContains Features will only be selected if contained within the
     selection rubber band.
-    @param doDifference Take the symmetric difference of the the current selected
+    @param doDifference Take the symmetric difference of the current selected
     features and the new features found within the provided selectGeometry.
     @param singleSelect Only selects the closest feature to the selectGeometry.
   */

diff --git a/src/app/qgsmeasuretool.h b/src/app/qgsmeasuretool.h
@@ -40,7 +40,7 @@ class QgsMeasureTool : public QgsMapTool
     //! returns whether measuring distance or area
     bool measureArea() { return mMeasureArea; }
 
-    //! When we hvae added our last point, and not following 
+    //! When we have added our last point, and not following
     // Added in 2.0
     bool done() { return mDone; }
 

diff --git a/src/app/qgstipfactory.cpp b/src/app/qgstipfactory.cpp
@@ -57,7 +57,7 @@ QgsTipFactory::QgsTipFactory() : QObject()
   myTip.setContent( tr( "If you need help using QGIS"
                         " we have a 'users'  mailing list where users help each other with issues"
                         " related to using our sofware. We also have a 'developers' mailing list."
-                        " for those wanting help and to discuss things relating the the QGIS code base."
+                        " for those wanting help and to discuss things relating to the QGIS code base."
                         " Details on how to subscribe are in the <a href=\"http://www.qgis.org/en/community/mailing-lists.html\">community section</a> of"
                         " the QGIS home page (http://www.qgis.org/en/community/mailing-lists.html)."
                       ) );

diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -180,7 +180,7 @@ class CORE_EXPORT QgsComposerLegend: public QgsComposerItem
     QStringList layerIdList() const;
 
   private:
-    /** Splits a string using the the wrap char taking into account handling empty
+    /** Splits a string using the wrap char taking into account handling empty
       wrap char which means no wrapping */
     QStringList splitStringForWrapping( QString stringToSplt );
 };

diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -242,15 +242,15 @@ void QgsComposerScaleBar::applyDefaultSize()
     int nUnitsPerSegment =  widthMeter / 10.0; //default scalebar width equals half the map width
     setNumUnitsPerSegment( nUnitsPerSegment );
 
-    if( nUnitsPerSegment > 1000 )
+    if ( nUnitsPerSegment > 1000 )
     {
-        setNumUnitsPerSegment( (int)( numUnitsPerSegment() / 1000.0 + 0.5 ) * 1000 );
-        setUnitLabeling( tr("km") );
-        setNumMapUnitsPerScaleBarUnit( 1000 );
+      setNumUnitsPerSegment(( int )( numUnitsPerSegment() / 1000.0 + 0.5 ) * 1000 );
+      setUnitLabeling( tr( "km" ) );
+      setNumMapUnitsPerScaleBarUnit( 1000 );
     }
     else
     {
-        setUnitLabeling( tr("m") );
+      setUnitLabeling( tr( "m" ) );
     }
 
     setNumSegments( 4 );

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -158,7 +158,9 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
 
     /**Load a template document
         @param doc template document
-        @param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )*/
+        @param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )
+        @param addUndoCommands whether or not to add undo commands
+      */
     bool loadFromTemplate( const QDomDocument& doc, QMap<QString, QString>* substitutionMap = 0, bool addUndoCommands = false );
 
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)

diff --git a/src/core/composer/qgsnumericscalebarstyle.cpp b/src/core/composer/qgsnumericscalebarstyle.cpp
@@ -73,7 +73,7 @@ QRectF QgsNumericScaleBarStyle::calculateBoxSize() const
 
   if ( mLastScaleBarWidth != rect.width() && mLastScaleBarWidth > 0 && rect.width() > 0 )
   {
-    //hack to move scale bar the the left / right in order to keep the bar alignment
+    //hack to move scale bar the left / right in order to keep the bar alignment
     const_cast<QgsComposerScaleBar*>( mScaleBar )->correctXPositionAlignment( mLastScaleBarWidth, rect.width() );
   }
   mLastScaleBarWidth = rect.width();

diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
@@ -40,7 +40,7 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
   {
     return QSizeF(); //zero size if attribute is missing
   }
-  
+
   double scaledValue = attIt.value().toDouble();
   double scaledLowerValue = is.lowerValue;
   double scaledUpperValue = is.upperValue;
@@ -77,11 +77,11 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
 }
 
 QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
-{  
+{
   Q_UNUSED( c );
-	Q_UNUSED( attributes );
+  Q_UNUSED( attributes );
 
-	return s.size;
+  return s.size;
 }
 
 void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )
@@ -218,11 +218,11 @@ void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext
     mPen.setColor( s.categoryColors.at( i ) );
     p->setPen( mPen );
     QPointF position = textPositions.at( i );
-    
+
     // Calculate vertical placement
     double xOffset = 0;
 
-    switch( s.labelPlacementMethod )
+    switch ( s.labelPlacementMethod )
     {
       case QgsDiagramSettings::Height:
         xOffset = textHeight / 2.0;

diff --git a/src/core/pal/palgeometry.h b/src/core/pal/palgeometry.h
@@ -47,7 +47,7 @@ namespace pal
        * \brief get the GEOSGeometry of the feature
        * This method is called by Pal each time it needs a geom's coordinates
        *
-       * @return GEOSGeometry * a pointer the the geos geom
+       * @return GEOSGeometry * a pointer the geos geom
        */
       virtual GEOSGeometry* getGeosGeometry() = 0;
 

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -91,10 +91,10 @@ void QgsApplication::init( QString customConfigPath )
 
   // check if QGIS is run from build directory (not the install directory)
   QFile f;
-  foreach( QString path, QStringList() << "" << "/.." << "/bin" )
+  foreach ( QString path, QStringList() << "" << "/.." << "/bin" )
   {
     f.setFileName( prefixPath + path + "/path.txt" );
-    if( f.exists() )
+    if ( f.exists() )
       break;
   }
   if ( f.exists() && f.open( QIODevice::ReadOnly ) )

diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -280,7 +280,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
       return "";
     }
 
-    /**Reloads the data from the the source. Needs to be implemented by providers with data caches to
+    /**Reloads the data from the source. Needs to be implemented by providers with data caches to
       synchronize with changes in the data source*/
     virtual void reloadData() {}