HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/legend/qarealegendmarker.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

             qarealegendmarker.h
        
                    57 lines
            
             | 1.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / legend / qarealegendmarker.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

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

        sauimone
    
added QAreaLegendMarker

              r2176
            
      **

        Titta Heikkala
    
Updated license headers...

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

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

        sauimone
    
added QAreaLegendMarker

              r2176
            
      **

        Titta Heikkala
    
Updated license headers...

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

        sauimone
    
added QAreaLegendMarker

              r2176
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        sauimone
    
added QAreaLegendMarker

              r2176
            
      **

        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.

        sauimone
    
added QAreaLegendMarker

              r2176
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

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

        sauimone
    
added QAreaLegendMarker

              r2176
            
      #ifndef QAREALEGENDMARKER_H

      #define QAREALEGENDMARKER_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #include <QtCharts/QLegendMarker>

      #include <QtCharts/QAreaSeries>

        sauimone
    
added QAreaLegendMarker

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
added QAreaLegendMarker

              r2176
            
      class QAreaLegendMarkerPrivate;

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker

        sauimone
    
added QAreaLegendMarker

              r2176
            
      {

          Q_OBJECT

      public:

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

              r2871
            
          explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);

        sauimone
    
added QAreaLegendMarker

              r2176
            
          virtual ~QAreaLegendMarker();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          virtual LegendMarkerType type() { return LegendMarkerTypeArea; }

          // Related series

        sauimone
    
pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type

              r2181
            
          virtual QAreaSeries* series();

        sauimone
    
added QAreaLegendMarker

              r2176
            
      protected:

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

              r2871
            
          QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);

        sauimone
    
added QAreaLegendMarker

              r2176
            
      private:

          Q_DECLARE_PRIVATE(QAreaLegendMarker)

          Q_DISABLE_COPY(QAreaLegendMarker)

      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        sauimone
    
added QAreaLegendMarker

              r2176
            
      #endif // QAREALEGENDMARKER_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	/******************************************************************************
sauimone added QAreaLegendMarker	r2176	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
sauimone added QAreaLegendMarker	r2176	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
sauimone added QAreaLegendMarker	r2176	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
sauimone added QAreaLegendMarker	r2176	**
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.
sauimone added QAreaLegendMarker	r2176	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
sauimone added QAreaLegendMarker	r2176
		#ifndef QAREALEGENDMARKER_H
		#define QAREALEGENDMARKER_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712	#include <QtCharts/QLegendMarker>
		#include <QtCharts/QAreaSeries>
sauimone added QAreaLegendMarker	r2176
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone added QAreaLegendMarker	r2176
		class QAreaLegendMarkerPrivate;

Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker
sauimone added QAreaLegendMarker	r2176	{
		Q_OBJECT

		public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QAreaLegendMarker(QAreaSeries series, QLegend legend, QObject *parent = Q_NULLPTR);
sauimone added QAreaLegendMarker	r2176	virtual ~QAreaLegendMarker();

sauimone removed peer object solution. Introduced marker type solution	r2179	virtual LegendMarkerType type() { return LegendMarkerTypeArea; }

		// Related series
sauimone pure virtual getter for series to QLegendMarker. In some cases user don't need the derived pointer. This removes the need to cast to derived marker type	r2181	virtual QAreaSeries* series();
sauimone added QAreaLegendMarker	r2176
		protected:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
sauimone added QAreaLegendMarker	r2176
		private:
		Q_DECLARE_PRIVATE(QAreaLegendMarker)
		Q_DISABLE_COPY(QAreaLegendMarker)

		};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
sauimone added QAreaLegendMarker	r2176
		#endif // QAREALEGENDMARKER_H