Skip to content

Commit ea80d59

Browse files
committed
fix warnings
1 parent 991f3d3 commit ea80d59

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

src/app/qgisapp.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
628628

629629
#ifdef ANDROID
630630
//add reacting to long click in android
631-
grabGesture(Qt::TapAndHoldGesture);
631+
grabGesture( Qt::TapAndHoldGesture );
632632
#endif
633633

634634
// update windows
@@ -741,9 +741,9 @@ bool QgisApp::event( QEvent * event )
741741
done = true;
742742
}
743743
#ifdef ANDROID
744-
else if (event->type() == QEvent::Gesture )
744+
else if ( event->type() == QEvent::Gesture )
745745
{
746-
done = gestureEvent(static_cast<QGestureEvent*>(event));
746+
done = gestureEvent( static_cast<QGestureEvent*>( event ) );
747747
}
748748
#endif
749749
else
@@ -7293,18 +7293,19 @@ QMenu* QgisApp::createPopupMenu()
72937293
}
72947294

72957295
#ifdef ANDROID
7296-
bool QgisApp::gestureEvent(QGestureEvent *event)
7296+
bool QgisApp::gestureEvent( QGestureEvent *event )
72977297
{
7298-
if (QGesture *tapAndHold = event->gesture(Qt::TapAndHoldGesture))
7298+
if ( QGesture *tapAndHold = event->gesture( Qt::TapAndHoldGesture ) )
72997299
{
7300-
tapAndHoldTriggered(static_cast<QTapAndHoldGesture *>(tapAndHold));
7300+
tapAndHoldTriggered( static_cast<QTapAndHoldGesture *>( tapAndHold ) );
73017301
}
73027302
return true;
73037303
}
73047304

7305-
void QgisApp::tapAndHoldTriggered(QTapAndHoldGesture *gesture)
7305+
void QgisApp::tapAndHoldTriggered( QTapAndHoldGesture *gesture )
73067306
{
7307-
if (gesture->state() == Qt::GestureFinished) {
7307+
if ( gesture->state() == Qt::GestureFinished )
7308+
{
73087309
QPoint pos = gesture->position().toPoint();
73097310
QWidget * receiver = QApplication::widgetAt( pos );
73107311
qDebug() << "tapAndHoldTriggered: LONG CLICK gesture happened at " << pos;

src/app/qgisapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,8 +1165,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
11651165
QString mOldScale;
11661166

11671167
#ifdef ANDROID
1168-
bool gestureEvent(QGestureEvent *event);
1169-
void tapAndHoldTriggered(QTapAndHoldGesture *gesture);
1168+
bool gestureEvent( QGestureEvent *event );
1169+
void tapAndHoldTriggered( QTapAndHoldGesture *gesture );
11701170
#endif
11711171
};
11721172

src/app/qgsmaptooloffsetcurve.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,5 +484,6 @@ QgsGeometry* QgsMapToolOffsetCurve::convertToSingleLine( QgsGeometry* geom, int
484484

485485
QgsGeometry* QgsMapToolOffsetCurve::convertToMultiLine( QgsGeometry* geom )
486486
{
487+
Q_UNUSED( geom );
487488
return 0;
488489
}

src/core/qgsgeometry.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6156,8 +6156,6 @@ QgsGeometry* QgsGeometry::combine( QgsGeometry* geometry )
61566156
try
61576157
{
61586158
GEOSGeometry* unionGeom = GEOSUnion( mGeos, geometry->mGeos );
6159-
QGis::WkbType thisGeomType = wkbType();
6160-
QGis::WkbType otherGeomType = geometry->wkbType();
61616159
if ( type() == QGis::Line )
61626160
{
61636161
GEOSGeometry* mergedGeom = GEOSLineMerge( unionGeom );

src/core/qgslabel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,8 @@ unsigned char* QgsLabel::labelPoint( labelpoint& point, unsigned char *geom, siz
593593
QGis::WkbType wkbType;
594594
#ifndef QT_NO_DEBUG
595595
unsigned char *geomend = geom + geomlen;
596+
#else
597+
Q_UNUSED( geomlen );
596598
#endif
597599
Q_ASSERT( geom + 1 + sizeof( wkbType ) <= geomend );
598600

src/providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2959,7 +2959,7 @@ QStringList QgsWmsProvider::identifyAs( const QgsPoint& point, QString format )
29592959
setQueryItem( requestUrl, "X", QString::number( point.x() ) );
29602960
setQueryItem( requestUrl, "Y", QString::number( point.y() ) );
29612961

2962-
if( mFeatureCount > 0 )
2962+
if ( mFeatureCount > 0 )
29632963
{
29642964
setQueryItem( requestUrl, "FEATURE_COUNT", QString::number( mFeatureCount ) );
29652965
}

src/providers/wms/qgswmssourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ void QgsWMSSourceSelect::addClicked()
473473

474474
if ( mFeatureCount->text().toInt() > 0 )
475475
{
476-
if( !connArgs.isEmpty() )
476+
if ( !connArgs.isEmpty() )
477477
connArgs += ",";
478478
connArgs += QString( "featureCount=%1" ).arg( mFeatureCount->text().toInt() );
479479
}

0 commit comments

Comments
 (0)