Index: trunk/BNC/qwt/qwt_painter_command.cpp
===================================================================
--- trunk/BNC/qwt/qwt_painter_command.cpp	(revision 9383)
+++ trunk/BNC/qwt/qwt_painter_command.cpp	(revision 11158)
@@ -1,3 +1,3 @@
-/* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
+/******************************************************************************
  * Qwt Widget Library
  * Copyright (C) 1997   Josef Wilgen
@@ -11,120 +11,120 @@
 
 //! Construct an invalid command
-QwtPainterCommand::QwtPainterCommand():
-    d_type( Invalid )
+QwtPainterCommand::QwtPainterCommand()
+    : m_type( Invalid )
 {
 }
 
 //! Copy constructor
-QwtPainterCommand::QwtPainterCommand( const QPainterPath &path ):
-    d_type( Path )
-{
-    d_path = new QPainterPath( path );
-}
-
-/*!
-  Constructor for Pixmap paint operation
-
-  \param rect Target rectangle
-  \param pixmap Pixmap
-  \param subRect Rectangle inside the pixmap
-
-  \sa QPainter::drawPixmap()
- */
-QwtPainterCommand::QwtPainterCommand( const QRectF &rect,
-        const QPixmap &pixmap, const QRectF& subRect ):
-    d_type( Pixmap )
-{
-    d_pixmapData = new PixmapData();
-    d_pixmapData->rect = rect;
-    d_pixmapData->pixmap = pixmap;
-    d_pixmapData->subRect = subRect;
-}
-
-/*!
-  Constructor for Image paint operation
-
-  \param rect Target rectangle
-  \param image Image
-  \param subRect Rectangle inside the image
-  \param flags Conversion flags
-
-  \sa QPainter::drawImage()
- */
-QwtPainterCommand::QwtPainterCommand( const QRectF &rect,
-        const QImage &image, const QRectF& subRect,
-        Qt::ImageConversionFlags flags ):
-    d_type( Image )
-{
-    d_imageData = new ImageData();
-    d_imageData->rect = rect;
-    d_imageData->image = image;
-    d_imageData->subRect = subRect;
-    d_imageData->flags = flags;
-}
-
-/*!
-  Constructor for State paint operation
-  \param state Paint engine state
- */
-QwtPainterCommand::QwtPainterCommand( const QPaintEngineState &state ):
-    d_type( State )
-{
-    d_stateData = new StateData();
-
-    d_stateData->flags = state.state();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyPen )
-        d_stateData->pen = state.pen();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyBrush )
-        d_stateData->brush = state.brush();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyBrushOrigin )
-        d_stateData->brushOrigin = state.brushOrigin();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyFont )
-        d_stateData->font = state.font();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyBackground )
-    {
-        d_stateData->backgroundMode = state.backgroundMode();
-        d_stateData->backgroundBrush = state.backgroundBrush();
-    }
-
-    if ( d_stateData->flags & QPaintEngine::DirtyTransform )
-        d_stateData->transform = state.transform();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyClipEnabled )
-        d_stateData->isClipEnabled = state.isClipEnabled();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyClipRegion )
-    {
-        d_stateData->clipRegion = state.clipRegion();
-        d_stateData->clipOperation = state.clipOperation();
-    }
-
-    if ( d_stateData->flags & QPaintEngine::DirtyClipPath )
-    {
-        d_stateData->clipPath = state.clipPath();
-        d_stateData->clipOperation = state.clipOperation();
-    }
-
-    if ( d_stateData->flags & QPaintEngine::DirtyHints )
-        d_stateData->renderHints = state.renderHints();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyCompositionMode )
-        d_stateData->compositionMode = state.compositionMode();
-
-    if ( d_stateData->flags & QPaintEngine::DirtyOpacity )
-        d_stateData->opacity = state.opacity();
-}
-
-/*!
-  Copy constructor
-  \param other Command to be copied
-
- */
-QwtPainterCommand::QwtPainterCommand(const QwtPainterCommand &other)
+QwtPainterCommand::QwtPainterCommand( const QPainterPath& path )
+    : m_type( Path )
+{
+    m_path = new QPainterPath( path );
+}
+
+/*!
+   Constructor for Pixmap paint operation
+
+   \param rect Target rectangle
+   \param pixmap Pixmap
+   \param subRect Rectangle inside the pixmap
+
+   \sa QPainter::drawPixmap()
+ */
+QwtPainterCommand::QwtPainterCommand( const QRectF& rect,
+        const QPixmap& pixmap, const QRectF& subRect )
+    : m_type( Pixmap )
+{
+    m_pixmapData = new PixmapData();
+    m_pixmapData->rect = rect;
+    m_pixmapData->pixmap = pixmap;
+    m_pixmapData->subRect = subRect;
+}
+
+/*!
+   Constructor for Image paint operation
+
+   \param rect Target rectangle
+   \param image Image
+   \param subRect Rectangle inside the image
+   \param flags Conversion flags
+
+   \sa QPainter::drawImage()
+ */
+QwtPainterCommand::QwtPainterCommand( const QRectF& rect,
+        const QImage& image, const QRectF& subRect,
+        Qt::ImageConversionFlags flags )
+    : m_type( Image )
+{
+    m_imageData = new ImageData();
+    m_imageData->rect = rect;
+    m_imageData->image = image;
+    m_imageData->subRect = subRect;
+    m_imageData->flags = flags;
+}
+
+/*!
+   Constructor for State paint operation
+   \param state Paint engine state
+ */
+QwtPainterCommand::QwtPainterCommand( const QPaintEngineState& state )
+    : m_type( State )
+{
+    m_stateData = new StateData();
+
+    m_stateData->flags = state.state();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyPen )
+        m_stateData->pen = state.pen();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyBrush )
+        m_stateData->brush = state.brush();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyBrushOrigin )
+        m_stateData->brushOrigin = state.brushOrigin();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyFont )
+        m_stateData->font = state.font();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyBackground )
+    {
+        m_stateData->backgroundMode = state.backgroundMode();
+        m_stateData->backgroundBrush = state.backgroundBrush();
+    }
+
+    if ( m_stateData->flags & QPaintEngine::DirtyTransform )
+        m_stateData->transform = state.transform();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyClipEnabled )
+        m_stateData->isClipEnabled = state.isClipEnabled();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyClipRegion )
+    {
+        m_stateData->clipRegion = state.clipRegion();
+        m_stateData->clipOperation = state.clipOperation();
+    }
+
+    if ( m_stateData->flags & QPaintEngine::DirtyClipPath )
+    {
+        m_stateData->clipPath = state.clipPath();
+        m_stateData->clipOperation = state.clipOperation();
+    }
+
+    if ( m_stateData->flags & QPaintEngine::DirtyHints )
+        m_stateData->renderHints = state.renderHints();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyCompositionMode )
+        m_stateData->compositionMode = state.compositionMode();
+
+    if ( m_stateData->flags & QPaintEngine::DirtyOpacity )
+        m_stateData->opacity = state.opacity();
+}
+
+/*!
+   Copy constructor
+   \param other Command to be copied
+
+ */
+QwtPainterCommand::QwtPainterCommand( const QwtPainterCommand& other )
 {
     copy( other );
@@ -138,10 +138,10 @@
 
 /*!
-  Assignment operator
-
-  \param other Command to be copied
-  \return Modified command
- */
-QwtPainterCommand &QwtPainterCommand::operator=(const QwtPainterCommand &other)
+   Assignment operator
+
+   \param other Command to be copied
+   \return Modified command
+ */
+QwtPainterCommand& QwtPainterCommand::operator=( const QwtPainterCommand& other )
 {
     reset();
@@ -151,28 +151,28 @@
 }
 
-void QwtPainterCommand::copy( const QwtPainterCommand &other )
-{
-    d_type = other.d_type;
-
-    switch( other.d_type )
+void QwtPainterCommand::copy( const QwtPainterCommand& other )
+{
+    m_type = other.m_type;
+
+    switch( other.m_type )
     {
         case Path:
         {
-            d_path = new QPainterPath( *other.d_path );
+            m_path = new QPainterPath( *other.m_path );
             break;
         }
         case Pixmap:
         {
-            d_pixmapData = new PixmapData( *other.d_pixmapData );
+            m_pixmapData = new PixmapData( *other.m_pixmapData );
             break;
         }
         case Image:
         {
-            d_imageData = new ImageData( *other.d_imageData );
+            m_imageData = new ImageData( *other.m_imageData );
             break;
         }
         case State:
         {
-            d_stateData = new StateData( *other.d_stateData );
+            m_stateData = new StateData( *other.m_stateData );
             break;
         }
@@ -184,24 +184,24 @@
 void QwtPainterCommand::reset()
 {
-    switch( d_type )
+    switch( m_type )
     {
         case Path:
         {
-            delete d_path;
+            delete m_path;
             break;
         }
         case Pixmap:
         {
-            delete d_pixmapData;
+            delete m_pixmapData;
             break;
         }
         case Image:
         {
-            delete d_imageData;
+            delete m_imageData;
             break;
         }
         case State:
         {
-            delete d_stateData;
+            delete m_stateData;
             break;
         }
@@ -210,11 +210,11 @@
     }
 
-    d_type = Invalid;
+    m_type = Invalid;
 }
 
 //! \return Painter path to be painted
-QPainterPath *QwtPainterCommand::path()
-{
-    return d_path;
+QPainterPath* QwtPainterCommand::path()
+{
+    return m_path;
 }
 
@@ -222,5 +222,5 @@
 QwtPainterCommand::PixmapData* QwtPainterCommand::pixmapData()
 {
-    return d_pixmapData;
+    return m_pixmapData;
 }
 
@@ -228,5 +228,5 @@
 QwtPainterCommand::ImageData* QwtPainterCommand::imageData()
 {
-    return d_imageData;
+    return m_imageData;
 }
 
@@ -234,4 +234,4 @@
 QwtPainterCommand::StateData* QwtPainterCommand::stateData()
 {
-    return d_stateData;
-}
+    return m_stateData;
+}
