Fix warnings

nyalldawson · nyalldawson · commit 6e40b88fd70d · 2017-10-16T10:59:14.000+10:00
diff --git a/python/gui/qgsprojectionselectiontreewidget.sip b/python/gui/qgsprojectionselectiontreewidget.sip
@@ -103,7 +103,7 @@ class QgsProjectionSelectionTreeWidget : QWidget
 .. seealso:: previewRect()
 %End
 
-    const QgsRectangle previewRect();
+    QgsRectangle previewRect() const;
 %Docstring
  The initial "preview" rectangle for the bounds overview map.
 .. versionadded:: 3.0
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -2117,7 +2117,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
   }
 
   QTextStream lines( &csv );
-  QString header = lines.readLine();
+  ( void )lines.readLine(); // header line
 
   for ( ;; )
   {
diff --git a/src/gui/qgsprojectionselectiontreewidget.cpp b/src/gui/qgsprojectionselectiontreewidget.cpp
@@ -324,7 +324,7 @@ void QgsProjectionSelectionTreeWidget::setPreviewRect( const QgsRectangle &rect
   mVertexMarker->show();
 }
 
-const QgsRectangle QgsProjectionSelectionTreeWidget::previewRect()
+QgsRectangle QgsProjectionSelectionTreeWidget::previewRect() const
 {
   return mPreviewRect;
 }
diff --git a/src/gui/qgsprojectionselectiontreewidget.h b/src/gui/qgsprojectionselectiontreewidget.h
@@ -117,7 +117,7 @@ class GUI_EXPORT QgsProjectionSelectionTreeWidget : public QWidget, private Ui::
      * \since QGIS 3.0
      * \see previewRect()
      */
-    const QgsRectangle previewRect();
+    QgsRectangle previewRect() const;
 
     /**
      * \brief filters this widget by the given CRSs
diff --git a/src/ui/qgsprojectionselectorbase.ui b/src/ui/qgsprojectionselectorbase.ui
@@ -309,7 +309,6 @@
               <height>16777215</height>
              </size>
             </property>
-            <zorder>mExtentsLabel</zorder>
            </widget>
           </item>
          </layout>

Original file line number	Diff line number	Diff line change
`@@ -2117,7 +2117,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()`
`2117`	`2117`	`}`
`2118`	`2118`
`2119`	`2119`	`QTextStream lines( &csv );`
`2120`		`- QString header = lines.readLine();`
	`2120`	`+ ( void )lines.readLine(); // header line`
`2121`	`2121`
`2122`	`2122`	`for ( ;; )`
`2123`	`2123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ void QgsProjectionSelectionTreeWidget::setPreviewRect( const QgsRectangle &rect`
`324`	`324`	`mVertexMarker->show();`
`325`	`325`	`}`
`326`	`326`
`327`		`-const QgsRectangle QgsProjectionSelectionTreeWidget::previewRect()`
	`327`	`+QgsRectangle QgsProjectionSelectionTreeWidget::previewRect() const`
`328`	`328`	`{`
`329`	`329`	`return mPreviewRect;`
`330`	`330`	`}`