Skip to content

Commit 3f67443

Browse files
committed
fix warnings
1 parent 0529f11 commit 3f67443

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

src/core/composer/qgscomposermapgrid.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,8 +1388,6 @@ QgsComposerMap::GridAnnotationDirection QgsComposerMapGrid::gridAnnotationDirect
13881388
return mBottomGridAnnotationDirection;
13891389
break;
13901390
}
1391-
mComposerMap->updateBoundingRect();
1392-
mComposerMap->update();
13931391
}
13941392

13951393
int QgsComposerMapGrid::crsGridParams( QgsRectangle& crsRect, QgsCoordinateTransform& inverseTransform ) const

src/core/composer/qgscomposition.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,20 +2805,15 @@ void QgsComposition::refreshPageSize()
28052805
if ( ok )
28062806
{
28072807
double heightD, widthD;
2808-
switch ( orientation )
2808+
if ( orientation == QgsComposition::Portrait )
28092809
{
2810-
case QgsComposition::Portrait:
2811-
{
2812-
heightD = qMax( pageHeight, pageWidth );
2813-
widthD = qMin( pageHeight, pageWidth );
2814-
break;
2815-
}
2816-
case QgsComposition::Landscape:
2817-
{
2818-
heightD = qMin( pageHeight, pageWidth );
2819-
widthD = qMax( pageHeight, pageWidth );
2820-
break;
2821-
}
2810+
heightD = qMax( pageHeight, pageWidth );
2811+
widthD = qMin( pageHeight, pageWidth );
2812+
}
2813+
else
2814+
{
2815+
heightD = qMin( pageHeight, pageWidth );
2816+
widthD = qMax( pageHeight, pageWidth );
28222817
}
28232818
pageWidth = widthD;
28242819
pageHeight = heightD;

src/core/qgsgeometry.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6280,7 +6280,6 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart )
62806280
multiPoint << *lineIt;
62816281
return fromMultiPoint( multiPoint );
62826282
}
6283-
return 0;
62846283
}
62856284

62866285
default:

src/providers/spatialite/qspatialite/qsql_spatialite.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ bool QSpatiaLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, i
303303
q->setAt(QSql::AfterLastRow);
304304
return false;
305305
}
306-
return false;
307306
}
308307

309308
QSpatiaLiteResult::QSpatiaLiteResult(const QSpatiaLiteDriver* db)

0 commit comments

Comments
 (0)