[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Juergen E. Fischer]

The following commit has been merged in the master branch:
commit c6b99909dbe89c98e9557c6bbf9447e98e549f6d
Author: Juergen E. Fischer <jef at norbit.de>
Date:   Fri Mar 9 17:09:50 2012 +0100

    fix typos

diff --git a/python/core/qgscomposeritem.sip b/python/core/qgscomposeritem.sip
index 06e746d..8e1bea7 100644
--- a/python/core/qgscomposeritem.sip
+++ b/python/core/qgscomposeritem.sip
@@ -207,7 +207,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
     /** Whether this item has a frame or not.
      * @param none
      * @return boolean - true if there is a frame around this item, otherwise false.
-     * @note deprecated since 1.8 dont use!
+     * @note deprecated since 1.8 don't use!
      * @see hasFrame
      */
     bool frame();
@@ -221,7 +221,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
     /** Set whether this item has a frame drawn around it or not.
      * @param none
      * @return void
-     * @note deprecated since 1.8 dont use!
+     * @note deprecated since 1.8 don't use!
      * @see hasFrame
      */
     void setFrame( bool drawFrame );
@@ -243,7 +243,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
     //painter down by the same factor for drawing
 
     /**Draws Text. Takes care about all the composer specific issues (calculation to pixel, scaling of font and painter
-     to work arount the Qt font bug)*/
+     to work around the Qt font bug)*/
     void drawText( QPainter* p, int x, int y, const QString& text, const QFont& font ) const;
 
     /**Like the above, but with a rectangle for multiline text*/
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
index c442eaa..b554b09 100644
--- a/scripts/spelling.dat
+++ b/scripts/spelling.dat
@@ -454,3 +454,5 @@ intersectons:intersections
 secific:specific
 writeable:writable
 vaild:valid
+opps:oops
+arount:around
diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
index 015ad96..a79814e 100644
--- a/src/core/composer/qgscomposeritem.h
+++ b/src/core/composer/qgscomposeritem.h
@@ -160,7 +160,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
 
     /** Whether this item has a frame or not.
      * @return boolean - true if there is a frame around this item, otherwise false.
-     * @note deprecated since 1.8 dont use!
+     * @note deprecated since 1.8 don't use!
      * @see hasFrame
      */
     Q_DECL_DEPRECATED bool frame() const {return hasFrame();}
@@ -172,7 +172,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
     bool hasFrame() const {return mFrame;}
     /** Set whether this item has a frame drawn around it or not.
      * @returns void
-     * @note deprecated since 1.8 dont use!
+     * @note deprecated since 1.8 don't use!
      * @see hasFrame
      */
     Q_DECL_DEPRECATED void setFrame( bool drawFrame ) { setFrameEnabled( drawFrame );}
@@ -202,7 +202,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
     //painter down by the same factor for drawing
 
     /**Draws Text. Takes care about all the composer specific issues (calculation to pixel, scaling of font and painter
-     to work arount the Qt font bug)*/
+     to work around the Qt font bug)*/
     void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;
 
     /**Like the above, but with a rectangle for multiline text*/

-- 
The Quantum GIS in Debian project