HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/legend/qxylegendmarker.h

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

Liang Qi - - Load All Authors

File last commit:

r2878:97bb01ce5d85


                r2878:97bb01ce5d85

Download file

             qxylegendmarker.h
        
                    64 lines
            
             | 2.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / legend / qxylegendmarker.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        sauimone
    
added QXYLegendMarker

              r2175
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

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

        sauimone
    
added QXYLegendMarker

              r2175
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        sauimone
    
added QXYLegendMarker

              r2175
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        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

        Miikka Heikkinen
    
Updated license...

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

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

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        sauimone
    
added QXYLegendMarker

              r2175
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        sauimone
    
added QXYLegendMarker

              r2175
            
      #ifndef QXYLEGENDMARKER_H

      #define QXYLEGENDMARKER_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      #include <QtCharts/QLegendMarker>

      #include <QtCharts/QXYSeries>

        sauimone
    
added QXYLegendMarker

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
added QXYLegendMarker

              r2175
            
      class QXYLegendMarkerPrivate;

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker

        sauimone
    
added QXYLegendMarker

              r2175
            
      {

          Q_OBJECT

      public:

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

              r2871
            
          explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR);

        sauimone
    
added QXYLegendMarker

              r2175
            
          virtual ~QXYLegendMarker();

        sauimone
    
removed peer object solution. Introduced marker type solution

              r2179
            
          virtual LegendMarkerType type() { return LegendMarkerTypeXY; }

          // 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 QXYSeries* series();

        sauimone
    
added QXYLegendMarker

              r2175
            
      protected:

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

              r2871
            
          QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);

        sauimone
    
added QXYLegendMarker

              r2175
            
      private:

          Q_DECLARE_PRIVATE(QXYLegendMarker)

          Q_DISABLE_COPY(QXYLegendMarker)

      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        sauimone
    
added QXYLegendMarker

              r2175
            
      #endif // QXYLEGENDMARKER_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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
sauimone added QXYLegendMarker	r2175	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
sauimone added QXYLegendMarker	r2175	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
sauimone added QXYLegendMarker	r2175	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
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
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
sauimone added QXYLegendMarker	r2175	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
sauimone added QXYLegendMarker	r2175
		#ifndef QXYLEGENDMARKER_H
		#define QXYLEGENDMARKER_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
Titta Heikkala Qt Charts project file structure change...	r2712	#include <QtCharts/QLegendMarker>
		#include <QtCharts/QXYSeries>
sauimone added QXYLegendMarker	r2175
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone added QXYLegendMarker	r2175
		class QXYLegendMarkerPrivate;

Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker
sauimone added QXYLegendMarker	r2175	{
		Q_OBJECT
		public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QXYLegendMarker(QXYSeries series, QLegend legend, QObject *parent = Q_NULLPTR);
sauimone added QXYLegendMarker	r2175	virtual ~QXYLegendMarker();

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

		// 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 QXYSeries* series();
sauimone added QXYLegendMarker	r2175
		protected:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR);
sauimone added QXYLegendMarker	r2175
		private:
		Q_DECLARE_PRIVATE(QXYLegendMarker)
		Q_DISABLE_COPY(QXYLegendMarker)

		};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
sauimone added QXYLegendMarker	r2175
		#endif // QXYLEGENDMARKER_H