more fixes

git-svn-id: http://svn.osgeo.org/qgis/trunk@12696 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/app/qgisapp.h

@@ -595,6 +595,8 @@ class QgisApp : public QMainWindow
     void measure();
     //! Measure area
     void measureArea();
+    //! Measure angle
+    void measureAngle();
 
     //! show the attribute table for the currently selected layer
     void attributeTable();
@@ -712,8 +714,8 @@ class QgisApp : public QMainWindow
     //! check to see if file is dirty and if so, prompt the user th save it
     bool saveDirty();
     /** Helper function to union several geometries together (used in function mergeSelectedFeatures)
-      @return 0 in case of error*/
-    QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList );
+      @return 0 in case of error or if canceled */
+    QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList, bool &canceled );
 
     /**Deletes all the composer objects and clears mPrintComposers*/
     void deletePrintComposers();
@@ -802,6 +804,7 @@ class QgisApp : public QMainWindow
     QAction *mActionDeselectAll;
     QAction *mActionIdentify;
     QAction *mActionMeasure;
+    QAction *mActionMeasureAngle;
     QAction *mActionMeasureArea;
     QAction *mActionViewSeparator1;
     QAction *mActionZoomFullExtent;
@@ -906,6 +909,7 @@ class QgisApp : public QMainWindow
         QgsMapTool* mIdentify;
         QgsMapTool* mMeasureDist;
         QgsMapTool* mMeasureArea;
+        QgsMapTool* mMeasureAngle;
         QgsMapTool* mCapturePoint;
         QgsMapTool* mCaptureLine;
         QgsMapTool* mCapturePolygon;

src/app/qgsmaptooladdfeature.cpp

@@ -31,7 +31,7 @@
 #include <QMouseEvent>
 #include <QSettings>
 
-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, enum CaptureTool tool ): QgsMapToolCapture( canvas, tool )
+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureTool tool ): QgsMapToolCapture( canvas, tool )
 {
 
 }

src/app/qgsmaptoolcapture.h

@@ -39,7 +39,7 @@ class QgsMapToolCapture : public QgsMapToolEdit
     };
 
     //! constructor
-    QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureTool tool );
+    QgsMapToolCapture( QgsMapCanvas* canvas, CaptureTool tool );
 
     //! destructor
     virtual ~QgsMapToolCapture();

src/core/qgscoordinatetransform.cpp

@@ -193,13 +193,13 @@ void QgsCoordinateTransform::initialise()
     // If the source and destination projection are the same, set the short
     // circuit flag (no transform takes place)
     mShortCircuit = true;
-    QgsDebugMsg( "Source/Dest CRS equal, shortcircuit is set." );
+    QgsDebugMsgLevel( "Source/Dest CRS equal, shortcircuit is set.", 3 );
   }
   else
   {
     // Transform must take place
     mShortCircuit = false;
-    QgsDebugMsg( "Source/Dest CRS UNequal, shortcircuit is NOt set." );
+    QgsDebugMsgLevel( "Source/Dest CRS UNequal, shortcircuit is NOt set.", 3 );
   }
 
 }
@@ -472,18 +472,18 @@ void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, d
     {
       if ( direction == ForwardTransform )
       {
-        points += QString("(%1, %2)\n").arg( x[i] ).arg( y[i] );
+        points += QString( "(%1, %2)\n" ).arg( x[i] ).arg( y[i] );
       }
       else
       {
-        points += QString("(%1, %2)\n").arg( x[i]*RAD_TO_DEG ).arg( y[i]*RAD_TO_DEG );
+        points += QString( "(%1, %2)\n" ).arg( x[i] * RAD_TO_DEG ).arg( y[i] * RAD_TO_DEG );
       }
     }
 
-    QString msg = tr("%1 of\n%2\nfailed with error: %3\n")
-	                  .arg( dir )
-	                  .arg( points )
-	                  .arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
+    QString msg = tr( "%1 of\n%2\nfailed with error: %3\n" )
+                  .arg( dir )
+                  .arg( points )
+                  .arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
 
     QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
 

src/plugins/grass/qgsgrassmodule.cpp

@@ -294,8 +294,8 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
   QgisInterface *iface,
   QString xname, QDomElement qDocElem,
   QWidget * parent, Qt::WFlags f )
-    : QgsGrassModuleOptions( tools, module, iface ),
-    QWidget( parent, f )
+    : QWidget( parent, f ),
+    QgsGrassModuleOptions( tools, module, iface )
 {
   QgsDebugMsg( "called." );
   QgsDebugMsg( QString( "PATH = %1" ).arg( getenv( "PATH" ) ) );

src/plugins/scale_bar/pluginguibase.ui

@@ -123,7 +123,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Colour of bar</string>
+      <string>Color of bar</string>
      </property>
      <property name="buddy">
       <cstring>pbnChangeColor</cstring>
@@ -139,10 +139,10 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Click to select the colour</string>
+      <string>Click to select the color</string>
      </property>
      <property name="whatsThis">
-      <string>Click to select the colour</string>
+      <string>Click to select the color</string>
      </property>
      <property name="text">
       <string/>

src/ui/qgsoptionsbase.ui

@@ -699,7 +699,7 @@
           <item row="1" column="0">
            <widget class="QLabel" name="mLineColorTextLabel">
             <property name="text">
-             <string>Line colour</string>
+             <string>Line color</string>
             </property>
            </widget>
           </item>