HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/linechart/qlineseries.h

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

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

Liang Qi - - Load All Authors

File last commit:

r2878:97bb01ce5d85


                r2898:03a6177a3223

master

Download file

             qlineseries.h
        
                    61 lines
            
             | 1.9 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / linechart / qlineseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

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

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
      **

        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.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add license headers

              r794
            
        Michal Klocek
    
Fixes header guard style issues

              r969
            
      #ifndef QLINESERIES_H

      #define QLINESERIES_H

        Tero Ahola
    
Started to refactor the API to allow integrating different plot types

              r19
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

      #include <QtCharts/QXYSeries>

      #include <QtGui/QPen>

        Michal Klocek
    
adds missing files form previous commit

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
adds missing files form previous commit

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

              r938
            
      class QLineSeriesPrivate;

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      class QT_CHARTS_EXPORT QLineSeries : public QXYSeries

        Michal Klocek
    
adds missing files form previous commit

              r12
            
      {

        Tero Ahola
    
Scatter customization to QML api

              r1276
            
          Q_OBJECT

        Michal Klocek
    
Refactor domain model...

              r439
            
      public:

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

              r2871
            
          explicit QLineSeries(QObject *parent = Q_NULLPTR);

        Michal Klocek
    
Fixes header guard style issues

              r969
            
          ~QLineSeries();

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

              r1107
            
          QAbstractSeries::SeriesType type() const;

        Michal Klocek
    
Refactor domain model...

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

              r938
            
      protected:

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

              r2871
            
          QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR);

        Michal Klocek
    
Refactor scatter chart to fit the other classes...

              r470
            
      private:

        Tero Ahola
    
QML weather example to use data API instead of model

              r1222
            
          Q_DECLARE_PRIVATE(QLineSeries)

          Q_DISABLE_COPY(QLineSeries)

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

              r938
            
          friend class LineChartItem;

        Michal Klocek
    
adds missing files form previous commit

              r12
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Tero Ahola
    
Started to refactor the API to allow integrating different plot types

              r19
            
        Jani Honkonen
    
Spit&polish public headers

              r2046
            
      #endif // QLINESERIES_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	/****************************************************************************
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add license headers	r794	**
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.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add license headers	r794
Michal Klocek Fixes header guard style issues	r969	#ifndef QLINESERIES_H
		#define QLINESERIES_H
Tero Ahola Started to refactor the API to allow integrating different plot types	r19
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
		#include <QtCharts/QXYSeries>
		#include <QtGui/QPen>
Michal Klocek adds missing files form previous commit	r12
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek adds missing files form previous commit	r12
Michal Klocek Adds big fat pimpl to series classes...	r938	class QLineSeriesPrivate;

Titta Heikkala Qt Charts project file structure change...	r2712	class QT_CHARTS_EXPORT QLineSeries : public QXYSeries
Michal Klocek adds missing files form previous commit	r12	{
Tero Ahola Scatter customization to QML api	r1276	Q_OBJECT

Michal Klocek Refactor domain model...	r439	public:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	explicit QLineSeries(QObject *parent = Q_NULLPTR);
Michal Klocek Fixes header guard style issues	r969	~QLineSeries();
Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	QAbstractSeries::SeriesType type() const;
Michal Klocek Refactor domain model...	r439
Michal Klocek Adds big fat pimpl to series classes...	r938	protected:
Marc Mutz Make public headers compile with -Wzero-as-null-pointer-constant...	r2871	QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek Refactor scatter chart to fit the other classes...	r470
		private:
Tero Ahola QML weather example to use data API instead of model	r1222	Q_DECLARE_PRIVATE(QLineSeries)
		Q_DISABLE_COPY(QLineSeries)
Michal Klocek Adds big fat pimpl to series classes...	r938	friend class LineChartItem;
Michal Klocek adds missing files form previous commit	r12	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Tero Ahola Started to refactor the API to allow integrating different plot types	r19
Jani Honkonen Spit&polish public headers	r2046	#endif // QLINESERIES_H