Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_slider.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_slider.cpp (modified) (21 diffs)

trunk/BNC/qwt/qwt_slider.cpp

@@ -21 +21 @@
 #include <qapplication.h>
 
-static QSize qwtHandleSize( const QSize &size, 
+static QSize qwtHandleSize( const QSize &size,
     Qt::Orientation orientation, bool hasTrough )
 {
@@ -42 +42 @@
 }
 
-static QwtScaleDraw::Alignment qwtScaleDrawAlignment( 
+static QwtScaleDraw::Alignment qwtScaleDrawAlignment(
     Qt::Orientation orientation, QwtSlider::ScalePosition scalePos )
 {
@@ -108 +108 @@
 /*!
   Construct vertical slider in QwtSlider::Trough style
-  with a scale to the left. 
+  with a scale to the left.
 
   The scale is initialized to [0.0, 100.0] and the value set to 0.0.
@@ -131 +131 @@
 
   \param parent Parent widget
-  \param orientation Orientation of the slider. 
+  \param orientation Orientation of the slider.
 */
 QwtSlider::QwtSlider( Qt::Orientation orientation, QWidget *parent ):
@@ -158 +158 @@
     d_data->orientation = orientation;
 
-    scaleDraw()->setAlignment( 
+    scaleDraw()->setAlignment(
         qwtScaleDrawAlignment( orientation, d_data->scalePosition ) );
     scaleDraw()->setLength( 100 );
@@ -179 +179 @@
     d_data->orientation = orientation;
 
-    scaleDraw()->setAlignment( 
+    scaleDraw()->setAlignment(
         qwtScaleDrawAlignment( orientation, d_data->scalePosition ) );
 
@@ -216 +216 @@
 
     d_data->scalePosition = scalePosition;
-    scaleDraw()->setAlignment( 
+    scaleDraw()->setAlignment(
         qwtScaleDrawAlignment( d_data->orientation, scalePosition ) );
 
@@ -223 +223 @@
 }
 
-/*! 
+/*!
   \return Position of the scale
   \sa setScalePosition()
@@ -412 +412 @@
    \param sliderRect Bounding rectangle of the slider
 */
-void QwtSlider::drawSlider( 
+void QwtSlider::drawSlider(
     QPainter *painter, const QRect &sliderRect ) const
 {
@@ -434 +434 @@
         const int slotMargin = 4;
 
-        QRect slotRect; 
+        QRect slotRect;
         if ( orientation() == Qt::Horizontal )
         {
@@ -470 +470 @@
   \param pos Position of the handle marker in widget coordinates
 */
-void QwtSlider::drawHandle( QPainter *painter, 
+void QwtSlider::drawHandle( QPainter *painter,
     const QRect &handleRect, int pos ) const
 {
     const int bw = d_data->borderWidth;
 
-    qDrawShadePanel( painter, 
+    qDrawShadePanel( painter,
         handleRect, palette(), false, bw,
         &palette().brush( QPalette::Button ) );
@@ -497 +497 @@
   \param pos Mouse position
 
-  \retval True, when handleRect() contains pos 
+  \retval True, when handleRect() contains pos
   \sa scrolledTo()
 */
@@ -504 +504 @@
     if ( handleRect().contains( pos ) )
     {
-        const double v = ( orientation() == Qt::Horizontal ) 
+        const double v = ( orientation() == Qt::Horizontal )
             ? pos.x() : pos.y();
 
@@ -525 +525 @@
 double QwtSlider::scrolledTo( const QPoint &pos ) const
 {
-    int p = ( orientation() == Qt::Horizontal ) 
+    int p = ( orientation() == Qt::Horizontal )
         ? pos.x() : pos.y();
 
@@ -629 +629 @@
 
    \param event Mouse event
-*/  
+*/
 void QwtSlider::timerEvent( QTimerEvent *event )
 {
@@ -663 +663 @@
         killTimer( d_data->repeatTimerId );
         d_data->repeatTimerId = startTimer( updateInterval() );
-        
+
         d_data->timerTick = true;
-    }   
+    }
 }
 
@@ -710 +710 @@
 void QwtSlider::changeEvent( QEvent *event )
 {
-    if ( event->type() == QEvent::StyleChange || 
+    if ( event->type() == QEvent::StyleChange ||
         event->type() == QEvent::FontChange )
     {
@@ -740 +740 @@
     /*
        The marker line of the handle needs to be aligned to
-       the scale. But the marker is in the center 
+       the scale. But the marker is in the center
        and we need space enough to display the rest of the handle.
 
@@ -878 +878 @@
     {
         d_data->hasGroove = on;
-        
+
         if ( testAttribute( Qt::WA_WState_Polished ) )
             layoutSlider( true );
@@ -891 +891 @@
 {
     return d_data->hasGroove;
-} 
+}
 
 /*!
@@ -918 +918 @@
         bw = d_data->borderWidth;
 
-    int sliderLength = 0; 
+    int sliderLength = 0;
     int scaleExtent = 0;