Index: trunk/BNC/qwt/qwt_plot_spectrogram.h
===================================================================
--- trunk/BNC/qwt/qwt_plot_spectrogram.h	(revision 9383)
+++ trunk/BNC/qwt/qwt_plot_spectrogram.h	(revision 11158)
@@ -1,3 +1,3 @@
-/* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
+/******************************************************************************
  * Qwt Widget Library
  * Copyright (C) 1997   Josef Wilgen
@@ -14,33 +14,31 @@
 #include "qwt_raster_data.h"
 #include "qwt_plot_rasteritem.h"
-#include <qlist.h>
 
 class QwtColorMap;
+template< typename T > class QList;
 
 /*!
-  \brief A plot item, which displays a spectrogram
+   \brief A plot item, which displays a spectrogram
 
-  A spectrogram displays 3-dimensional data, where the 3rd dimension
-  ( the intensity ) is displayed using colors. The colors are calculated
-  from the values using a color map.
+   A spectrogram displays 3-dimensional data, where the 3rd dimension
+   ( the intensity ) is displayed using colors. The colors are calculated
+   from the values using a color map.
 
-  On multi-core systems the performance of the image composition
-  can often be improved by dividing the area into tiles - each of them
-  rendered in a different thread ( see QwtPlotItem::setRenderThreadCount() ).
+   On multi-core systems the performance of the image composition
+   can often be improved by dividing the area into tiles - each of them
+   rendered in a different thread ( see QwtPlotItem::setRenderThreadCount() ).
 
-  In ContourMode contour lines are painted for the contour levels.
+   In ContourMode contour lines are painted for the contour levels.
 
-  \image html spectrogram3.png
+   \sa QwtRasterData, QwtColorMap, QwtPlotItem::setRenderThreadCount()
+ */
 
-  \sa QwtRasterData, QwtColorMap, QwtPlotItem::setRenderThreadCount()
-*/
-
-class QWT_EXPORT QwtPlotSpectrogram: public QwtPlotRasterItem
+class QWT_EXPORT QwtPlotSpectrogram : public QwtPlotRasterItem
 {
-public:
+  public:
     /*!
-      The display mode controls how the raster data will be represented.
-      \sa setDisplayMode(), testDisplayMode()
-    */
+       The display mode controls how the raster data will be represented.
+       \sa setDisplayMode(), testDisplayMode()
+     */
 
     enum DisplayMode
@@ -53,8 +51,7 @@
     };
 
-    //! Display modes
-    typedef QFlags<DisplayMode> DisplayModes;
+    Q_DECLARE_FLAGS( DisplayModes, DisplayMode )
 
-    explicit QwtPlotSpectrogram( const QString &title = QString() );
+    explicit QwtPlotSpectrogram( const QString& title = QString() );
     virtual ~QwtPlotSpectrogram();
 
@@ -62,17 +59,20 @@
     bool testDisplayMode( DisplayMode ) const;
 
-    void setData( QwtRasterData *data );
-    const QwtRasterData *data() const;
-    QwtRasterData *data();
+    void setData( QwtRasterData* data );
+    const QwtRasterData* data() const;
+    QwtRasterData* data();
 
-    void setColorMap( QwtColorMap * );
-    const QwtColorMap *colorMap() const;
+    void setColorMap( QwtColorMap* );
+    const QwtColorMap* colorMap() const;
 
-    virtual QwtInterval interval(Qt::Axis) const;
-    virtual QRectF pixelHint( const QRectF & ) const;
+    void setColorTableSize( int numColors );
+    int colorTableSize() const;
 
-    void setDefaultContourPen( const QColor &,
+    virtual QwtInterval interval( Qt::Axis ) const QWT_OVERRIDE;
+    virtual QRectF pixelHint( const QRectF& ) const QWT_OVERRIDE;
+
+    void setDefaultContourPen( const QColor&,
         qreal width = 0.0, Qt::PenStyle = Qt::SolidLine );
-    void setDefaultContourPen( const QPen & );
+    void setDefaultContourPen( const QPen& );
     QPen defaultContourPen() const;
 
@@ -82,34 +82,34 @@
     bool testConrecFlag( QwtRasterData::ConrecFlag ) const;
 
-    void setContourLevels( const QList<double> & );
-    QList<double> contourLevels() const;
+    void setContourLevels( const QList< double >& );
+    QList< double > contourLevels() const;
 
-    virtual int rtti() const;
+    virtual int rtti() const QWT_OVERRIDE;
 
-    virtual void draw( QPainter *,
-        const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-        const QRectF &canvasRect ) const;
+    virtual void draw( QPainter*,
+        const QwtScaleMap& xMap, const QwtScaleMap& yMap,
+        const QRectF& canvasRect ) const QWT_OVERRIDE;
 
-protected:
+  protected:
     virtual QImage renderImage(
-        const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-        const QRectF &area, const QSize &imageSize ) const;
+        const QwtScaleMap& xMap, const QwtScaleMap& yMap,
+        const QRectF& area, const QSize& imageSize ) const QWT_OVERRIDE;
 
     virtual QSize contourRasterSize(
-        const QRectF &, const QRect & ) const;
+        const QRectF&, const QRect& ) const;
 
     virtual QwtRasterData::ContourLines renderContourLines(
-        const QRectF &rect, const QSize &raster ) const;
+        const QRectF& rect, const QSize& raster ) const;
 
-    virtual void drawContourLines( QPainter *,
-        const QwtScaleMap &xMap, const QwtScaleMap &yMap,
+    virtual void drawContourLines( QPainter*,
+        const QwtScaleMap& xMap, const QwtScaleMap& yMap,
         const QwtRasterData::ContourLines& ) const;
 
-    void renderTile( const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-        const QRect &tile, QImage * ) const;
+    void renderTile( const QwtScaleMap& xMap, const QwtScaleMap& yMap,
+        const QRect& tile, QImage* ) const;
 
-private:
+  private:
     class PrivateData;
-    PrivateData *d_data;
+    PrivateData* m_data;
 };
 
