Index: trunk/BNC/qwt/qwt_plot_scaleitem.cpp
===================================================================
--- trunk/BNC/qwt/qwt_plot_scaleitem.cpp	(revision 9383)
+++ trunk/BNC/qwt/qwt_plot_scaleitem.cpp	(revision 11158)
@@ -1,3 +1,3 @@
-/* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
+/******************************************************************************
  * Qwt Widget Library
  * Copyright (C) 1997   Josef Wilgen
@@ -12,4 +12,6 @@
 #include "qwt_scale_map.h"
 #include "qwt_interval.h"
+#include "qwt_text.h"
+
 #include <qpalette.h>
 #include <qpainter.h>
@@ -17,10 +19,10 @@
 class QwtPlotScaleItem::PrivateData
 {
-public:
-    PrivateData():
-        position( 0.0 ),
-        borderDistance( -1 ),
-        scaleDivFromAxis( true ),
-        scaleDraw( new QwtScaleDraw() )
+  public:
+    PrivateData()
+        : position( 0.0 )
+        , borderDistance( -1 )
+        , scaleDivFromAxis( true )
+        , scaleDraw( new QwtScaleDraw() )
     {
     }
@@ -31,6 +33,6 @@
     }
 
-    QwtInterval scaleInterval( const QRectF &,
-        const QwtScaleMap &, const QwtScaleMap & ) const;
+    QwtInterval scaleInterval( const QRectF&,
+        const QwtScaleMap&, const QwtScaleMap& ) const;
 
     QPalette palette;
@@ -39,9 +41,9 @@
     int borderDistance;
     bool scaleDivFromAxis;
-    QwtScaleDraw *scaleDraw;
+    QwtScaleDraw* scaleDraw;
 };
 
-QwtInterval QwtPlotScaleItem::PrivateData::scaleInterval( const QRectF &canvasRect,
-    const QwtScaleMap &xMap, const QwtScaleMap &yMap ) const
+QwtInterval QwtPlotScaleItem::PrivateData::scaleInterval( const QRectF& canvasRect,
+    const QwtScaleMap& xMap, const QwtScaleMap& yMap ) const
 {
     QwtInterval interval;
@@ -70,12 +72,12 @@
 
    \sa setPosition(), setAlignment()
-*/
+ */
 QwtPlotScaleItem::QwtPlotScaleItem(
-        QwtScaleDraw::Alignment alignment, const double pos ):
-    QwtPlotItem( QwtText( "Scale" ) )
-{
-    d_data = new PrivateData;
-    d_data->position = pos;
-    d_data->scaleDraw->setAlignment( alignment );
+        QwtScaleDraw::Alignment alignment, const double pos )
+    : QwtPlotItem( QwtText( "Scale" ) )
+{
+    m_data = new PrivateData;
+    m_data->position = pos;
+    m_data->scaleDraw->setAlignment( alignment );
 
     setItemInterest( QwtPlotItem::ScaleInterest, true );
@@ -86,5 +88,5 @@
 QwtPlotScaleItem::~QwtPlotScaleItem()
 {
-    delete d_data;
+    delete m_data;
 }
 
@@ -103,9 +105,9 @@
    \param scaleDiv Scale division
    \sa scaleDiv(), setScaleDivFromAxis(), isScaleDivFromAxis()
-*/
+ */
 void QwtPlotScaleItem::setScaleDiv( const QwtScaleDiv& scaleDiv )
 {
-    d_data->scaleDivFromAxis = false;
-    d_data->scaleDraw->setScaleDiv( scaleDiv );
+    m_data->scaleDivFromAxis = false;
+    m_data->scaleDraw->setScaleDiv( scaleDiv );
 }
 
@@ -113,5 +115,5 @@
 const QwtScaleDiv& QwtPlotScaleItem::scaleDiv() const
 {
-    return d_data->scaleDraw->scaleDiv();
+    return m_data->scaleDraw->scaleDiv();
 }
 
@@ -122,13 +124,13 @@
    \param on true/false
    \sa isScaleDivFromAxis()
-*/
+ */
 void QwtPlotScaleItem::setScaleDivFromAxis( bool on )
 {
-    if ( on != d_data->scaleDivFromAxis )
-    {
-        d_data->scaleDivFromAxis = on;
+    if ( on != m_data->scaleDivFromAxis )
+    {
+        m_data->scaleDivFromAxis = on;
         if ( on )
         {
-            const QwtPlot *plt = plot();
+            const QwtPlot* plt = plot();
             if ( plt )
             {
@@ -145,8 +147,8 @@
            the corresponding axis is enabled.
    \sa setScaleDiv(), setScaleDivFromAxis()
-*/
+ */
 bool QwtPlotScaleItem::isScaleDivFromAxis() const
 {
-    return d_data->scaleDivFromAxis;
+    return m_data->scaleDivFromAxis;
 }
 
@@ -154,10 +156,10 @@
    Set the palette
    \sa QwtAbstractScaleDraw::draw(), palette()
-*/
-void QwtPlotScaleItem::setPalette( const QPalette &palette )
-{
-    if ( palette != d_data->palette )
-    {
-        d_data->palette = palette;
+ */
+void QwtPlotScaleItem::setPalette( const QPalette& palette )
+{
+    if ( palette != m_data->palette )
+    {
+        m_data->palette = palette;
 
         legendChanged();
@@ -169,8 +171,8 @@
    \return palette
    \sa setPalette()
-*/
+ */
 QPalette QwtPlotScaleItem::palette() const
 {
-    return d_data->palette;
+    return m_data->palette;
 }
 
@@ -178,10 +180,10 @@
    Change the tick label font
    \sa font()
-*/
-void QwtPlotScaleItem::setFont( const QFont &font )
-{
-    if ( font != d_data->font )
-    {
-        d_data->font = font;
+ */
+void QwtPlotScaleItem::setFont( const QFont& font )
+{
+    if ( font != m_data->font )
+    {
+        m_data->font = font;
         itemChanged();
     }
@@ -191,32 +193,32 @@
    \return tick label font
    \sa setFont()
-*/
+ */
 QFont QwtPlotScaleItem::font() const
 {
-    return d_data->font;
-}
-
-/*!
-  \brief Set a scale draw
-
-  \param scaleDraw object responsible for drawing scales.
-
-  The main use case for replacing the default QwtScaleDraw is
-  to overload QwtAbstractScaleDraw::label, to replace or swallow
-  tick labels.
-
-  \sa scaleDraw()
-*/
-void QwtPlotScaleItem::setScaleDraw( QwtScaleDraw *scaleDraw )
+    return m_data->font;
+}
+
+/*!
+   \brief Set a scale draw
+
+   \param scaleDraw object responsible for drawing scales.
+
+   The main use case for replacing the default QwtScaleDraw is
+   to overload QwtAbstractScaleDraw::label, to replace or swallow
+   tick labels.
+
+   \sa scaleDraw()
+ */
+void QwtPlotScaleItem::setScaleDraw( QwtScaleDraw* scaleDraw )
 {
     if ( scaleDraw == NULL )
         return;
 
-    if ( scaleDraw != d_data->scaleDraw )
-        delete d_data->scaleDraw;
-
-    d_data->scaleDraw = scaleDraw;
-
-    const QwtPlot *plt = plot();
+    if ( scaleDraw != m_data->scaleDraw )
+        delete m_data->scaleDraw;
+
+    m_data->scaleDraw = scaleDraw;
+
+    const QwtPlot* plt = plot();
     if ( plt )
     {
@@ -231,8 +233,8 @@
    \return Scale draw
    \sa setScaleDraw()
-*/
-const QwtScaleDraw *QwtPlotScaleItem::scaleDraw() const
-{
-    return d_data->scaleDraw;
+ */
+const QwtScaleDraw* QwtPlotScaleItem::scaleDraw() const
+{
+    return m_data->scaleDraw;
 }
 
@@ -240,8 +242,8 @@
    \return Scale draw
    \sa setScaleDraw()
-*/
-QwtScaleDraw *QwtPlotScaleItem::scaleDraw()
-{
-    return d_data->scaleDraw;
+ */
+QwtScaleDraw* QwtPlotScaleItem::scaleDraw()
+{
+    return m_data->scaleDraw;
 }
 
@@ -256,11 +258,11 @@
    \param pos New position
    \sa position(), setAlignment()
-*/
+ */
 void QwtPlotScaleItem::setPosition( double pos )
 {
-    if ( d_data->position != pos )
-    {
-        d_data->position = pos;
-        d_data->borderDistance = -1;
+    if ( m_data->position != pos )
+    {
+        m_data->position = pos;
+        m_data->borderDistance = -1;
         itemChanged();
     }
@@ -270,8 +272,8 @@
    \return Position of the scale
    \sa setPosition(), setAlignment()
-*/
+ */
 double QwtPlotScaleItem::position() const
 {
-    return d_data->position;
+    return m_data->position;
 }
 
@@ -291,5 +293,5 @@
 
    \sa setPosition(), borderDistance()
-*/
+ */
 void QwtPlotScaleItem::setBorderDistance( int distance )
 {
@@ -297,7 +299,7 @@
         distance = -1;
 
-    if ( distance != d_data->borderDistance )
-    {
-        d_data->borderDistance = distance;
+    if ( distance != m_data->borderDistance )
+    {
+        m_data->borderDistance = distance;
         itemChanged();
     }
@@ -307,8 +309,8 @@
    \return Distance from a canvas border
    \sa setBorderDistance(), setPosition()
-*/
+ */
 int QwtPlotScaleItem::borderDistance() const
 {
-    return d_data->borderDistance;
+    return m_data->borderDistance;
 }
 
@@ -328,8 +330,8 @@
 
    \sa scaleDraw(), QwtScaleDraw::alignment(), setPosition()
-*/
+ */
 void QwtPlotScaleItem::setAlignment( QwtScaleDraw::Alignment alignment )
 {
-    QwtScaleDraw *sd = d_data->scaleDraw;
+    QwtScaleDraw* sd = m_data->scaleDraw;
     if ( sd->alignment() != alignment )
     {
@@ -340,16 +342,16 @@
 
 /*!
-  \brief Draw the scale
-*/
-void QwtPlotScaleItem::draw( QPainter *painter,
-    const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-    const QRectF &canvasRect ) const
-{
-    QwtScaleDraw *sd = d_data->scaleDraw;
-
-    if ( d_data->scaleDivFromAxis )
+   \brief Draw the scale
+ */
+void QwtPlotScaleItem::draw( QPainter* painter,
+    const QwtScaleMap& xMap, const QwtScaleMap& yMap,
+    const QRectF& canvasRect ) const
+{
+    QwtScaleDraw* sd = m_data->scaleDraw;
+
+    if ( m_data->scaleDivFromAxis )
     {
         const QwtInterval interval =
-            d_data->scaleInterval( canvasRect, xMap, yMap );
+            m_data->scaleInterval( canvasRect, xMap, yMap );
 
         if ( interval != sd->scaleDiv().interval() )
@@ -368,11 +370,11 @@
     {
         double y;
-        if ( d_data->borderDistance >= 0 )
+        if ( m_data->borderDistance >= 0 )
         {
             if ( sd->alignment() == QwtScaleDraw::BottomScale )
-                y = canvasRect.top() + d_data->borderDistance;
+                y = canvasRect.top() + m_data->borderDistance;
             else
             {
-                y = canvasRect.bottom() - d_data->borderDistance;
+                y = canvasRect.bottom() - m_data->borderDistance;
             }
 
@@ -380,5 +382,5 @@
         else
         {
-            y = yMap.transform( d_data->position );
+            y = yMap.transform( m_data->position );
         }
 
@@ -389,5 +391,5 @@
         sd->setLength( canvasRect.width() - 1 );
 
-        QwtTransform *transform = NULL;
+        QwtTransform* transform = NULL;
         if ( xMap.transformation() )
             transform = xMap.transformation()->copy();
@@ -398,16 +400,16 @@
     {
         double x;
-        if ( d_data->borderDistance >= 0 )
+        if ( m_data->borderDistance >= 0 )
         {
             if ( sd->alignment() == QwtScaleDraw::RightScale )
-                x = canvasRect.left() + d_data->borderDistance;
+                x = canvasRect.left() + m_data->borderDistance;
             else
             {
-                x = canvasRect.right() - d_data->borderDistance;
+                x = canvasRect.right() - m_data->borderDistance;
             }
         }
         else
         {
-            x = xMap.transform( d_data->position );
+            x = xMap.transform( m_data->position );
         }
         if ( x < canvasRect.left() || x > canvasRect.right() )
@@ -417,5 +419,5 @@
         sd->setLength( canvasRect.height() - 1 );
 
-        QwtTransform *transform = NULL;
+        QwtTransform* transform = NULL;
         if ( yMap.transformation() )
             transform = yMap.transformation()->copy();
@@ -424,7 +426,7 @@
     }
 
-    painter->setFont( d_data->font );
-
-    sd->draw( painter, d_data->palette );
+    painter->setFont( m_data->font );
+
+    sd->draw( painter, m_data->palette );
 }
 
@@ -439,22 +441,22 @@
 
    \sa QwtPlot::updateAxes()
-*/
+ */
 
 void QwtPlotScaleItem::updateScaleDiv( const QwtScaleDiv& xScaleDiv,
     const QwtScaleDiv& yScaleDiv )
 {
-    QwtScaleDraw *scaleDraw = d_data->scaleDraw;
-
-    if ( d_data->scaleDivFromAxis && scaleDraw )
-    {
-        const QwtScaleDiv &scaleDiv =
+    QwtScaleDraw* scaleDraw = m_data->scaleDraw;
+
+    if ( m_data->scaleDivFromAxis && scaleDraw )
+    {
+        const QwtScaleDiv& scaleDiv =
             scaleDraw->orientation() == Qt::Horizontal ? xScaleDiv : yScaleDiv;
 
-        const QwtPlot *plt = plot();
+        const QwtPlot* plt = plot();
         if ( plt != NULL )
         {
             const QRectF canvasRect = plt->canvas()->contentsRect();
 
-            const QwtInterval interval = d_data->scaleInterval(
+            const QwtInterval interval = m_data->scaleInterval(
                 canvasRect, plt->canvasMap( xAxis() ), plt->canvasMap( yAxis() ) );
 
