[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Juergen E. Fischer]

The following commit has been merged in the master branch:
commit ea80d59f9fdd19bbb128caf7b136fcd3eac87c35
Author: Juergen E. Fischer <jef at norbit.de>
Date:   Wed Feb 29 21:22:15 2012 +0100

    fix warnings

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 6eff2d5..6cec2d6 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -628,7 +628,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 
 #ifdef ANDROID
   //add reacting to long click in android
-  grabGesture(Qt::TapAndHoldGesture);
+  grabGesture( Qt::TapAndHoldGesture );
 #endif
 
   // update windows
@@ -741,9 +741,9 @@ bool QgisApp::event( QEvent * event )
     done = true;
   }
 #ifdef ANDROID
-  else if (event->type() == QEvent::Gesture )
+  else if ( event->type() == QEvent::Gesture )
   {
-    done = gestureEvent(static_cast<QGestureEvent*>(event));
+    done = gestureEvent( static_cast<QGestureEvent*>( event ) );
   }
 #endif
   else
@@ -7293,18 +7293,19 @@ QMenu* QgisApp::createPopupMenu()
 }
 
 #ifdef ANDROID
-bool QgisApp::gestureEvent(QGestureEvent *event)
+bool QgisApp::gestureEvent( QGestureEvent *event )
 {
-  if (QGesture *tapAndHold = event->gesture(Qt::TapAndHoldGesture))
+  if ( QGesture *tapAndHold = event->gesture( Qt::TapAndHoldGesture ) )
   {
-    tapAndHoldTriggered(static_cast<QTapAndHoldGesture *>(tapAndHold));
+    tapAndHoldTriggered( static_cast<QTapAndHoldGesture *>( tapAndHold ) );
   }
   return true;
 }
 
-void QgisApp::tapAndHoldTriggered(QTapAndHoldGesture *gesture)
+void QgisApp::tapAndHoldTriggered( QTapAndHoldGesture *gesture )
 {
-  if (gesture->state() == Qt::GestureFinished) {
+  if ( gesture->state() == Qt::GestureFinished )
+  {
     QPoint pos = gesture->position().toPoint();
     QWidget * receiver = QApplication::widgetAt( pos );
     qDebug() << "tapAndHoldTriggered: LONG CLICK gesture happened at " << pos;
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index 03dd077..c56828b 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -1165,8 +1165,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QString mOldScale;
 
 #ifdef ANDROID
-    bool gestureEvent(QGestureEvent *event);
-    void tapAndHoldTriggered(QTapAndHoldGesture *gesture);
+    bool gestureEvent( QGestureEvent *event );
+    void tapAndHoldTriggered( QTapAndHoldGesture *gesture );
 #endif
 };
 
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
index f125b78..689f132 100644
--- a/src/app/qgsmaptooloffsetcurve.cpp
+++ b/src/app/qgsmaptooloffsetcurve.cpp
@@ -484,5 +484,6 @@ QgsGeometry* QgsMapToolOffsetCurve::convertToSingleLine( QgsGeometry* geom, int
 
 QgsGeometry* QgsMapToolOffsetCurve::convertToMultiLine( QgsGeometry* geom )
 {
+  Q_UNUSED( geom );
   return 0;
 }
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
index b3890d3..a83b5dc 100644
--- a/src/core/qgsgeometry.cpp
+++ b/src/core/qgsgeometry.cpp
@@ -6156,8 +6156,6 @@ QgsGeometry* QgsGeometry::combine( QgsGeometry* geometry )
   try
   {
     GEOSGeometry* unionGeom = GEOSUnion( mGeos, geometry->mGeos );
-    QGis::WkbType thisGeomType = wkbType();
-    QGis::WkbType otherGeomType = geometry->wkbType();
     if ( type() == QGis::Line )
     {
       GEOSGeometry* mergedGeom = GEOSLineMerge( unionGeom );
diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
index 4f02498..054f688 100644
--- a/src/core/qgslabel.cpp
+++ b/src/core/qgslabel.cpp
@@ -593,6 +593,8 @@ unsigned char* QgsLabel::labelPoint( labelpoint& point, unsigned char *geom, siz
   QGis::WkbType wkbType;
 #ifndef QT_NO_DEBUG
   unsigned char *geomend = geom + geomlen;
+#else
+  Q_UNUSED( geomlen );
 #endif
   Q_ASSERT( geom + 1 + sizeof( wkbType ) <= geomend );
 
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index b3687ea..d50ff57 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -2959,7 +2959,7 @@ QStringList QgsWmsProvider::identifyAs( const QgsPoint& point, QString format )
         setQueryItem( requestUrl, "X", QString::number( point.x() ) );
         setQueryItem( requestUrl, "Y", QString::number( point.y() ) );
 
-        if( mFeatureCount > 0 )
+        if ( mFeatureCount > 0 )
         {
           setQueryItem( requestUrl, "FEATURE_COUNT", QString::number( mFeatureCount ) );
         }
diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp
index d29a2a1..b5c06e3 100644
--- a/src/providers/wms/qgswmssourceselect.cpp
+++ b/src/providers/wms/qgswmssourceselect.cpp
@@ -473,7 +473,7 @@ void QgsWMSSourceSelect::addClicked()
 
   if ( mFeatureCount->text().toInt() > 0 )
   {
-    if( !connArgs.isEmpty() )
+    if ( !connArgs.isEmpty() )
       connArgs += ",";
     connArgs += QString( "featureCount=%1" ).arg( mFeatureCount->text().toInt() );
   }

-- 
The Quantum GIS in Debian project