Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot_textlabel.cpp

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_textlabel.cpp (modified) (9 diffs)

trunk/BNC/qwt/qwt_plot_textlabel.cpp

@@ -16 +16 @@
 
 static QRect qwtItemRect( int renderFlags,
-    const QRectF &rect, const QSizeF &itemSize ) 
+    const QRectF &rect, const QSizeF &itemSize )
 {
     int x;
@@ -33 +33 @@
 
     int y;
-    if ( renderFlags & Qt::AlignTop ) 
+    if ( renderFlags & Qt::AlignTop )
     {
         y = rect.top();
@@ -50 +50 @@
 
 class QwtPlotTextLabel::PrivateData
-{   
+{
 public:
     PrivateData():
@@ -61 +61 @@
 
     QPixmap pixmap;
-};  
+};
 
 /*!
@@ -102 +102 @@
 
 /*!
-  Set the text 
+  Set the text
 
   The label will be aligned to the plot canvas according to
@@ -211 +211 @@
             pw = qMax( d_data->text.borderPen().width(), 1 );
 
-        QRect pixmapRect; 
+        QRect pixmapRect;
         pixmapRect.setLeft( qFloor( rect.left() ) - pw );
         pixmapRect.setTop( qFloor( rect.top() ) - pw );
         pixmapRect.setRight( qCeil( rect.right() ) + pw );
         pixmapRect.setBottom( qCeil( rect.bottom() ) + pw );
-        
+
 #define QWT_HIGH_DPI 1
 
@@ -225 +225 @@
         const QSize scaledSize = pixmapRect.size();
 #endif
-        if ( d_data->pixmap.isNull() || 
+        if ( d_data->pixmap.isNull() ||
             ( scaledSize != d_data->pixmap.size() )  )
         {
@@ -234 +234 @@
             d_data->pixmap.fill( Qt::transparent );
 
-            const QRect r( pw, pw, 
+            const QRect r( pw, pw,
                 pixmapRect.width() - 2 * pw, pixmapRect.height() - 2 * pw );
 
@@ -260 +260 @@
    \sa setMargin(), QwtText::renderFlags(), QwtText::textSize()
  */
-QRectF QwtPlotTextLabel::textRect( 
+QRectF QwtPlotTextLabel::textRect(
     const QRectF &rect, const QSizeF &textSize ) const
 {