Skip to content
Permalink
Browse files
fix warnings
  • Loading branch information
jef-n committed Jul 15, 2014
1 parent 0529f11 commit 3f67443dd3924986f187e67fe7d9c217c32338da
Showing with 8 additions and 17 deletions.
  1. +0 −2 src/core/composer/qgscomposermapgrid.cpp
  2. +8 −13 src/core/composer/qgscomposition.cpp
  3. +0 −1 src/core/qgsgeometry.cpp
  4. +0 −1 src/providers/spatialite/qspatialite/qsql_spatialite.cpp
@@ -1388,8 +1388,6 @@ QgsComposerMap::GridAnnotationDirection QgsComposerMapGrid::gridAnnotationDirect
return mBottomGridAnnotationDirection;
break;
}
mComposerMap->updateBoundingRect();
mComposerMap->update();
}

int QgsComposerMapGrid::crsGridParams( QgsRectangle& crsRect, QgsCoordinateTransform& inverseTransform ) const
@@ -2805,20 +2805,15 @@ void QgsComposition::refreshPageSize()
if ( ok )
{
double heightD, widthD;
switch ( orientation )
if ( orientation == QgsComposition::Portrait )
{
case QgsComposition::Portrait:
{
heightD = qMax( pageHeight, pageWidth );
widthD = qMin( pageHeight, pageWidth );
break;
}
case QgsComposition::Landscape:
{
heightD = qMin( pageHeight, pageWidth );
widthD = qMax( pageHeight, pageWidth );
break;
}
heightD = qMax( pageHeight, pageWidth );
widthD = qMin( pageHeight, pageWidth );
}
else
{
heightD = qMin( pageHeight, pageWidth );
widthD = qMax( pageHeight, pageWidth );
}
pageWidth = widthD;
pageHeight = heightD;
@@ -6280,7 +6280,6 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart )
multiPoint << *lineIt;
return fromMultiPoint( multiPoint );
}
return 0;
}

default:
@@ -303,7 +303,6 @@ bool QSpatiaLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, i
q->setAt(QSql::AfterLastRow);
return false;
}
return false;
}

QSpatiaLiteResult::QSpatiaLiteResult(const QSpatiaLiteDriver* db)

1 comment on commit 3f67443

@nyalldawson

This comment has been minimized.

Copy link
Collaborator

@nyalldawson nyalldawson commented on 3f67443 Jul 15, 2014

@jef-n out of interest, why is the switch change in qgscomposition.cpp needed?

Please sign in to comment.