fix warnings

qgis · Jul 15, 2014 · 3f67443 · 3f67443 · nyalldawson · Jul 15, 2014
1 parent 0529f11
commit 3f67443
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -1388,8 +1388,6 @@ QgsComposerMap::GridAnnotationDirection QgsComposerMapGrid::gridAnnotationDirect
       return mBottomGridAnnotationDirection;
       break;
   }
-  mComposerMap->updateBoundingRect();
-  mComposerMap->update();
 }
 
 int QgsComposerMapGrid::crsGridParams( QgsRectangle& crsRect, QgsCoordinateTransform& inverseTransform ) const

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -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;

diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -6280,7 +6280,6 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart )
             multiPoint << *lineIt;
         return fromMultiPoint( multiPoint );
       }
-      return 0;
     }
 
     default:

diff --git a/src/providers/spatialite/qspatialite/qsql_spatialite.cpp b/src/providers/spatialite/qspatialite/qsql_spatialite.cpp
@@ -303,7 +303,6 @@ bool QSpatiaLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, i
         q->setAt(QSql::AfterLastRow);
         return false;
     }
-    return false;
 }
 
 QSpatiaLiteResult::QSpatiaLiteResult(const QSpatiaLiteDriver* db)