改进代码

qwtdemo/qwt/qwt_dial.cpp

@@ -237,7 +237,7 @@ QRect QwtDial::boundingRect() const
 {
     const QRect cr = contentsRect();
 
-    const double dim = qMin( cr.width(), cr.height() );
+    const int dim = qMin( cr.width(), cr.height() );
 
     QRect inner( 0, 0, dim, dim );
     inner.moveCenter( cr.center() );
@@ -337,7 +337,7 @@ void QwtDial::paintEvent( QPaintEvent *event )
         QPainter p( &d_data->pixmapCache );
         p.setRenderHint( QPainter::Antialiasing, true );
         p.translate( -r.topLeft() );
-            
+
         if ( d_data->mode != QwtDial::RotateScale )
             drawContents( &p );
 
@@ -474,7 +474,7 @@ void QwtDial::drawNeedle( QPainter *painter ) const
   \param center Center of the dial
   \param radius Radius of the scale
 */
-void QwtDial::drawScale( QPainter *painter, 
+void QwtDial::drawScale( QPainter *painter,
     const QPointF &center, double radius ) const
 {
     QwtRoundScaleDraw *sd = const_cast<QwtRoundScaleDraw *>( scaleDraw() );
@@ -567,9 +567,9 @@ const QwtRoundScaleDraw *QwtDial::scaleDraw() const
   Set an individual scale draw
 
   The motivation for setting a scale draw is often
-  to overload QwtRoundScaleDraw::label() to return 
+  to overload QwtRoundScaleDraw::label() to return
   individual tick labels.
-  
+
   \param scaleDraw Scale draw
   \warning The previous scale draw is deleted
 */
@@ -600,7 +600,7 @@ void QwtDial::setScaleArc( double minArc, double maxArc )
     if ( maxScaleArc - minScaleArc > 360.0 )
         maxScaleArc = minScaleArc + 360.0;
 
-    if ( ( minScaleArc != d_data->minScaleArc ) || 
+    if ( ( minScaleArc != d_data->minScaleArc ) ||
         ( maxScaleArc != d_data->maxScaleArc ) )
     {
         d_data->minScaleArc = minScaleArc;
@@ -611,7 +611,7 @@ void QwtDial::setScaleArc( double minArc, double maxArc )
     }
 }
 
-/*! 
+/*!
   Set the lower limit for the scale arc
 
   \param min Lower limit of the scale arc
@@ -622,7 +622,7 @@ void QwtDial::setMinScaleArc( double min )
     setScaleArc( min, d_data->maxScaleArc );
 }
 
-/*! 
+/*!
   \return Lower limit of the scale arc
   \sa setScaleArc()
 */
@@ -631,7 +631,7 @@ double QwtDial::minScaleArc() const
     return d_data->minScaleArc;
 }
 
-/*! 
+/*!
   Set the upper limit for the scale arc
 
   \param max Upper limit of the scale arc
@@ -642,7 +642,7 @@ void QwtDial::setMaxScaleArc( double max )
     setScaleArc( d_data->minScaleArc, max );
 }
 
-/*! 
+/*!
   \return Upper limit of the scale arc
   \sa setScaleArc()
 */
@@ -690,7 +690,7 @@ QSize QwtDial::sizeHint() const
 
     const int d = 6 * sh + 2 * lineWidth();
 
-    QSize hint( d, d ); 
+    QSize hint( d, d );
     if ( !isReadOnly() )
         hint = hint.expandedTo( QApplication::globalStrut() );
 
@@ -717,7 +717,7 @@ QSize QwtDial::minimumSizeHint() const
 
   \param pos Mouse position
 
-  \retval True, when the inner circle contains pos 
+  \retval True, when the inner circle contains pos
   \sa scrolledTo()
 */
 bool QwtDial::isScrollPosition( const QPoint &pos ) const
@@ -729,7 +729,7 @@ bool QwtDial::isScrollPosition( const QPoint &pos ) const
         if ( d_data->mode == QwtDial::RotateScale )
             angle = 360.0 - angle;
 
-        double valueAngle = 
+        double valueAngle =
             qwtNormalizeDegrees( 90.0 - scaleMap().transform( value() ) );
 
         d_data->mouseOffset = qwtNormalizeDegrees( angle - valueAngle );
@@ -774,7 +774,7 @@ double QwtDial::scrolledTo( const QPoint &pos ) const
             const double arc = angle - scaleMap().transform( value() );
             if ( qAbs( arc ) > 180.0 )
             {
-                boundedAngle = ( arc > 0 ) 
+                boundedAngle = ( arc > 0 )
                     ? scaleMap().p1() : scaleMap().p2();
             }
 
@@ -820,7 +820,7 @@ void QwtDial::changeEvent( QEvent *event )
         default:
             break;
     }
-    
+
     QwtAbstractSlider::changeEvent( event );
 }
 
@@ -846,7 +846,7 @@ void QwtDial::setAngleRange( double angle, double span )
 }
 
 /*!
-  Invalidate the internal caches and call 
+  Invalidate the internal caches and call
   QwtAbstractSlider::scaleChange()
  */
 void QwtDial::scaleChange()