Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot_rasteritem.h

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/qwt_plot_rasteritem.h (modified) (6 diffs)

trunk/BNC/qwt/qwt_plot_rasteritem.h

@@ -51 +51 @@
         /*!
           renderImage() is called, whenever the image cache is not valid,
-          or the scales, or the size of the canvas has changed. 
+          or the scales, or the size of the canvas has changed.
 
-          This type of cache is useful for improving the performance 
-          of hide/show operations or manipulations of the alpha value. 
+          This type of cache is useful for improving the performance
+          of hide/show operations or manipulations of the alpha value.
           All other situations are handled by the canvas backing store.
          */
@@ -69 +69 @@
           When the image is rendered according to the data pixels
           ( QwtRasterData::pixelHint() ) it can be expanded to paint
-          device resolution before it is passed to QPainter. 
-          The expansion algorithm rounds the pixel borders in the same 
+          device resolution before it is passed to QPainter.
+          The expansion algorithm rounds the pixel borders in the same
           way as the axis ticks, what is usually better than the
           scaling algorithm implemented in Qt.
-          Disabling this flag might make sense, to reduce the size of a 
+          Disabling this flag might make sense, to reduce the size of a
           document/file. If this is possible for a document format
           depends on the implementation of the specific QPaintEngine.
@@ -84 +84 @@
     typedef QFlags<PaintAttribute> PaintAttributes;
 
-    explicit QwtPlotRasterItem( const QString& title = QString::null );
+    explicit QwtPlotRasterItem( const QString& title = QString() );
     explicit QwtPlotRasterItem( const QwtText& title );
     virtual ~QwtPlotRasterItem();
@@ -99 +99 @@
     void invalidateCache();
 
-    virtual void draw( QPainter *p,
+    virtual void draw( QPainter *,
         const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-        const QRectF &rect ) const;
+        const QRectF &canvasRect ) const;
 
     virtual QRectF pixelHint( const QRectF & ) const;
@@ -110 +110 @@
 protected:
     /*!
-      \brief Render an image 
+      \brief Render an image
 
       An implementation of render() might iterate over all
-      pixels of imageRect. Each pixel has to be translated into 
+      pixels of imageRect. Each pixel has to be translated into
       the corresponding position in scale coordinates using the maps.
       This position can be used to look up a value in a implementation
@@ -122 +122 @@
       \param area Requested area for the image in scale coordinates
       \param imageSize Requested size of the image
-   
+
       \return Rendered image
      */