HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/areachart/qareaseries.h

Make public headers compile with -Wzero-as-null-pointer-constant...

Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I79c74046eaf224235cc80a4323fefd2c083b007f Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Marc Mutz - - Load All Authors

File last commit:

r2871:cf15f38aab8d


                r2871:cf15f38aab8d

Download file

             qareaseries.h
        
                    115 lines
            
             | 4.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / areachart / qareaseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

              r2845
            
      /******************************************************************************

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Copyright (C) 2015 The Qt Company Ltd.

      ** Contact: http://www.qt.io/licensing/

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

      ** and conditions see http://www.qt.io/terms-conditions. For further

      ** information use the contact form at http://www.qt.io/contact-us.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

      ******************************************************************************/

        Jani Honkonen
    
Add license headers

              r794
            
        Michal Klocek
    
Fixes header guard style issues

              r969
            
      #ifndef QAREASERIES_H

      #define QAREASERIES_H

        Michal Klocek
    
Adds area chart...

              r421
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

      #include <QtCharts/QAbstractSeries>

      #include <QtGui/QPen>

      #include <QtGui/QBrush>

        Michal Klocek
    
Adds area chart...

              r421
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
Adds area chart...

              r421
            
      class QLineSeries;

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      class QAreaSeriesPrivate;

        Michal Klocek
    
Adds area chart...

              r421
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries

        Michal Klocek
    
Adds area chart...

              r421
            
      {

          Q_OBJECT

        Tero Ahola
    
QAreaSeries upper and lower series type to QLineSeries

              r1498
            
          Q_PROPERTY(QLineSeries *upperSeries READ upperSeries)

          Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries)

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

          Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)

        Titta Heikkala
    
Remove warnings about unmatched parentheses...

              r2692
            
          Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)

          Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)

          Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)

          Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)

        Titta Heikkala
    
Added option to set labels clipping...

              r2815
            
          Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)

        Tero Ahola
    
Rest of the pie, bar, area and scatter properties to QML property tester

              r1308
            
        Michal Klocek
    
Adds area chart...

              r421
            
      public:

        Marc Mutz
    
Make public headers compile with -Wzero-as-null-pointer-constant...

              r2871
            
          explicit QAreaSeries(QObject *parent = Q_NULLPTR);

          explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = Q_NULLPTR);

        Michal Klocek
    
Fixes explicit issues in cstr

              r970
            
          ~QAreaSeries();

        Michal Klocek
    
Adds area chart...

              r421
            
        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      public:

        Michal Klocek
    
Fixes to API , QSeriesType -> SeriesType , add missing getters

              r1107
            
          QAbstractSeries::SeriesType type() const;

        Michal Klocek
    
Adds area chart...

              r421
            
        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
          void setUpperSeries(QLineSeries *series);

          QLineSeries *upperSeries() const;

          void setLowerSeries(QLineSeries *series);

          QLineSeries *lowerSeries() const;

        Michal Klocek
    
Adds area chart...

              r421
            
        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          void setPen(const QPen &pen);

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          QPen pen() const;

        Michal Klocek
    
Adds area chart...

              r421
            
        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          void setBrush(const QBrush &brush);

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          QBrush brush() const;

        Michal Klocek
    
Adds area chart...

              r421
            
        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void setColor(const QColor &color);

          QColor color() const;

          void setBorderColor(const QColor &color);

          QColor borderColor() const;

        Tero Ahola
    
Default to true in boolean setters

              r987
            
          void setPointsVisible(bool visible = true);

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          bool pointsVisible() const;

        Titta Heikkala
    
Added possibility to show series value...

              r2689
            
          void setPointLabelsFormat(const QString &format);

          QString pointLabelsFormat() const;

          void setPointLabelsVisible(bool visible = true);

          bool pointLabelsVisible() const;

          void setPointLabelsFont(const QFont &font);

          QFont pointLabelsFont() const;

          void setPointLabelsColor(const QColor &color);

          QColor pointLabelsColor() const;

        Titta Heikkala
    
Added option to set labels clipping...

              r2815
            
          void setPointLabelsClipping(bool enabled = true);

          bool pointLabelsClipping() const;

        sauimone
    
Q_SIGNALS and Q_SLOTS

              r775
            
      Q_SIGNALS:

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
          void clicked(const QPointF &point);

        Marek Rosa
    
Added hovered support to areachart. Might need to be re-thought

              r2264
            
          void hovered(const QPointF &point, bool state);

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
          void pressed(const QPointF &point);

          void released(const QPointF &point);

          void doubleClicked(const QPointF &point);

        Michal Klocek
    
Refactor qledgend handling...

              r855
            
          void selected();

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          void colorChanged(QColor color);

          void borderColorChanged(QColor color);

        Titta Heikkala
    
Added possibility to show series value...

              r2689
            
          void pointLabelsFormatChanged(const QString &format);

          void pointLabelsVisibilityChanged(bool visible);

          void pointLabelsFontChanged(const QFont &font);

          void pointLabelsColorChanged(const QColor &color);

        Titta Heikkala
    
Added option to set labels clipping...

              r2815
            
          void pointLabelsClippingChanged(bool clipping);

        Michal Klocek
    
Adds area chart...

              r421
            
      private:

        Tero Ahola
    
color and borderColor properties to XY charts; removed unnecessary signals

              r1481
            
          Q_DECLARE_PRIVATE(QAreaSeries)

          Q_DISABLE_COPY(QAreaSeries)

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
          friend class AreaLegendMarker;

          friend class AreaChartItem;

        sauimone
    
added QAreaLegendMarker

              r2176
            
          friend class QAreaLegendMarkerPrivate;

        Michal Klocek
    
Adds area chart...

              r421
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Michal Klocek
    
Adds area chart...

              r421
            
        Jani Honkonen
    
Spit&polish public headers

              r2046
            
      #endif // QAREASERIES_H

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Titta Heikkala Updated license headers...	r2845	/******************************************************************************
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
		** and conditions see http://www.qt.io/terms-conditions. For further
		** information use the contact form at http://www.qt.io/contact-us.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
Jani Honkonen Add license headers	r794
Michal Klocek Fixes header guard style issues	r969	#ifndef QAREASERIES_H
		#define QAREASERIES_H
Michal Klocek Adds area chart...	r421
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
		#include <QtCharts/QAbstractSeries>
		#include <QtGui/QPen>
		#include <QtGui/QBrush>
Michal Klocek Adds area chart...	r421
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek Adds area chart...	r421	class QLineSeries;
Michal Klocek Adds big fat pimpl to series classes...	r938	class QAreaSeriesPrivate;
Michal Klocek Adds area chart...	r421
Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries
Michal Klocek Adds area chart...	r421	{
		Q_OBJECT
Tero Ahola QAreaSeries upper and lower series type to QLineSeries	r1498	Q_PROPERTY(QLineSeries *upperSeries READ upperSeries)
		Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries)
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
		Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
Titta Heikkala Remove warnings about unmatched parentheses...	r2692	Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)
		Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
		Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
		Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
Titta Heikkala Added option to set labels clipping...	r2815	Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
Tero Ahola Rest of the pie, bar, area and scatter properties to QML property tester	r1308
Michal Klocek Adds area chart...	r421	public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QAreaSeries(QObject *parent = Q_NULLPTR);
		explicit QAreaSeries(QLineSeries upperSeries, QLineSeries lowerSeries = Q_NULLPTR);
Michal Klocek Fixes explicit issues in cstr	r970	~QAreaSeries();
Michal Klocek Adds area chart...	r421
Michal Klocek Adds big fat pimpl to series classes...	r938	public:
Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	QAbstractSeries::SeriesType type() const;
Michal Klocek Adds area chart...	r421
Jani Honkonen more coding style fixes for src-folder...	r2104	void setUpperSeries(QLineSeries *series);
		QLineSeries *upperSeries() const;
		void setLowerSeries(QLineSeries *series);
		QLineSeries *lowerSeries() const;
Michal Klocek Adds area chart...	r421
sauimone minor code review issues. indent, spaces, brackets etc.	r743	void setPen(const QPen &pen);
Michal Klocek Adds big fat pimpl to series classes...	r938	QPen pen() const;
Michal Klocek Adds area chart...	r421
sauimone minor code review issues. indent, spaces, brackets etc.	r743	void setBrush(const QBrush &brush);
Michal Klocek Adds big fat pimpl to series classes...	r938	QBrush brush() const;
Michal Klocek Adds area chart...	r421
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void setColor(const QColor &color);
		QColor color() const;

		void setBorderColor(const QColor &color);
		QColor borderColor() const;

Tero Ahola Default to true in boolean setters	r987	void setPointsVisible(bool visible = true);
Michal Klocek Adds big fat pimpl to series classes...	r938	bool pointsVisible() const;

Titta Heikkala Added possibility to show series value...	r2689	void setPointLabelsFormat(const QString &format);
		QString pointLabelsFormat() const;

		void setPointLabelsVisible(bool visible = true);
		bool pointLabelsVisible() const;

		void setPointLabelsFont(const QFont &font);
		QFont pointLabelsFont() const;

		void setPointLabelsColor(const QColor &color);
		QColor pointLabelsColor() const;

Titta Heikkala Added option to set labels clipping...	r2815	void setPointLabelsClipping(bool enabled = true);
		bool pointLabelsClipping() const;

sauimone Q_SIGNALS and Q_SLOTS	r775	Q_SIGNALS:
Titta Heikkala Qt Charts project file structure change...	r2712	void clicked(const QPointF &point);
Marek Rosa Added hovered support to areachart. Might need to be re-thought	r2264	void hovered(const QPointF &point, bool state);
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	void pressed(const QPointF &point);
		void released(const QPointF &point);
		void doubleClicked(const QPointF &point);
Michal Klocek Refactor qledgend handling...	r855	void selected();
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	void colorChanged(QColor color);
		void borderColorChanged(QColor color);
Titta Heikkala Added possibility to show series value...	r2689	void pointLabelsFormatChanged(const QString &format);
		void pointLabelsVisibilityChanged(bool visible);
		void pointLabelsFontChanged(const QFont &font);
		void pointLabelsColorChanged(const QColor &color);
Titta Heikkala Added option to set labels clipping...	r2815	void pointLabelsClippingChanged(bool clipping);
Michal Klocek Adds area chart...	r421
		private:
Tero Ahola color and borderColor properties to XY charts; removed unnecessary signals	r1481	Q_DECLARE_PRIVATE(QAreaSeries)
		Q_DISABLE_COPY(QAreaSeries)
Michal Klocek Adds big fat pimpl to series classes...	r938	friend class AreaLegendMarker;
		friend class AreaChartItem;
sauimone added QAreaLegendMarker	r2176	friend class QAreaLegendMarkerPrivate;
Michal Klocek Adds area chart...	r421	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Michal Klocek Adds area chart...	r421
Jani Honkonen Spit&polish public headers	r2046	#endif // QAREASERIES_H