fix windows build and some deprecation warnings

jef-n · jef-n · commit 03b0526e1959 · 2012-07-17T10:16:30.000+02:00
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1076,7 +1076,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
  */
 QPixmap QgsRasterLayer::legendAsPixmap()
 {
-  return legendAsPixmap( false );
+  return QPixmap();
 }
 
 /**
@@ -1740,14 +1740,6 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
     mRasterType = GrayOrUndefined;
   }
 
-  // Set min/max values for single band if we have them ready (no need to calculate which is slow)
-  // don't set min/max on multiband even if available because it would cause stretch of bands and thus colors distortion
-  if ( mDataProvider->bandCount() == 1 && ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactMinimumMaximum ) )
-  {
-    setMinimumValue( 1, mDataProvider->minimumValue( 1 ) );
-    setMaximumValue( 1, mDataProvider->maximumValue( 1 ) );
-  }
-
   QgsDebugMsg( "mRasterType = " + QString::number( mRasterType ) );
   if ( mRasterType == ColorLayer )
   {
diff --git a/src/gui/raster/qgsrasterhistogramwidget.h b/src/gui/raster/qgsrasterhistogramwidget.h
@@ -34,7 +34,7 @@ typedef QPointF QwtDoublePoint;
   *@author Etienne Tourigny
   */
 
-class QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
+class GUI_EXPORT QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase
 {
     Q_OBJECT
 

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const`
`1076`	`1076`	`*/`
`1077`	`1077`	`QPixmap QgsRasterLayer::legendAsPixmap()`
`1078`	`1078`	`{`
`1079`		`- return legendAsPixmap( false );`
	`1079`	`+ return QPixmap();`
`1080`	`1080`	`}`
`1081`	`1081`
`1082`	`1082`	`/**`
`@@ -1740,14 +1740,6 @@ void QgsRasterLayer::setDataProvider( QString const & provider )`
`1740`	`1740`	`mRasterType = GrayOrUndefined;`
`1741`	`1741`	`}`
`1742`	`1742`
`1743`		`- // Set min/max values for single band if we have them ready (no need to calculate which is slow)`
`1744`		`- // don't set min/max on multiband even if available because it would cause stretch of bands and thus colors distortion`
`1745`		`- if ( mDataProvider->bandCount() == 1 && ( mDataProvider->capabilities() & QgsRasterDataProvider::ExactMinimumMaximum ) )`
`1746`		`- {`
`1747`		`- setMinimumValue( 1, mDataProvider->minimumValue( 1 ) );`
`1748`		`- setMaximumValue( 1, mDataProvider->maximumValue( 1 ) );`
`1749`		`- }`
`1750`		`-`
`1751`	`1743`	`QgsDebugMsg( "mRasterType = " + QString::number( mRasterType ) );`
`1752`	`1744`	`if ( mRasterType == ColorLayer )`
`1753`	`1745`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ typedef QPointF QwtDoublePoint;`
`34`	`34`	`*@author Etienne Tourigny`
`35`	`35`	`*/`
`36`	`36`
`37`		`-class QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase`
	`37`	`+class GUI_EXPORT QgsRasterHistogramWidget : public QWidget, private Ui::QgsRasterHistogramWidgetBase`
`38`	`38`	`{`
`39`	`39`	`Q_OBJECT`
`40`	`40`