HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/chartsqml2/declarativexypoint.h

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

Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I3f2ec8fb552bbed786cb0f7f5a0433d2d15f1931

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2879:d27b6b26880d

Download file

             declarativexypoint.h
        
                    51 lines
            
             | 1.8 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / chartsqml2 / declarativexypoint.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

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

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
      **

        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/modify license headers

              r830
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

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

        Jani Honkonen
    
Add/modify license headers

              r830
            
        Tero Ahola
    
d

              r722
            
      #ifndef DECLARATIVE_XY_POINT_H

      #define DECLARATIVE_XY_POINT_H

        Tero Ahola
    
Proposal for QML data API

              r196
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

      #include <QtCore/QObject>

      #include <QtCore/QPointF>

        Tero Ahola
    
Proposal for QML data API

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Tero Ahola
    
Proposal for QML data API

              r196
            
        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
      class DeclarativeXYPoint : public QObject, public QPointF

        Tero Ahola
    
Proposal for QML data API

              r196
            
      {

          Q_OBJECT

        Tero Ahola
    
Removed a few unnecessary TODOs

              r1911
            
          Q_PROPERTY(qreal x READ x WRITE setX)

          Q_PROPERTY(qreal y READ y WRITE setY)

        Tero Ahola
    
Proposal for QML data API

              r196
            
      public:

        Tero Ahola
    
Renamed XyPoint to XYPoint

              r1532
            
          explicit DeclarativeXYPoint(QObject *parent = 0);

        Tero Ahola
    
Proposal for QML data API

              r196
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Tero Ahola
    
Proposal for QML data API

              r196
            
        Tero Ahola
    
d

              r722
            
      #endif // DECLARATIVE_XY_POINT_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/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add/modify license headers	r830	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add/modify license headers	r830	**
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/modify license headers	r830	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add/modify license headers	r830
Tero Ahola d	r722	#ifndef DECLARATIVE_XY_POINT_H
		#define DECLARATIVE_XY_POINT_H
Tero Ahola Proposal for QML data API	r196
Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
		#include <QtCore/QObject>
		#include <QtCore/QPointF>
Tero Ahola Proposal for QML data API	r196
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Tero Ahola Proposal for QML data API	r196
Tero Ahola Renamed XyPoint to XYPoint	r1532	class DeclarativeXYPoint : public QObject, public QPointF
Tero Ahola Proposal for QML data API	r196	{
		Q_OBJECT
Tero Ahola Removed a few unnecessary TODOs	r1911	Q_PROPERTY(qreal x READ x WRITE setX)
		Q_PROPERTY(qreal y READ y WRITE setY)
Tero Ahola Proposal for QML data API	r196
		public:
Tero Ahola Renamed XyPoint to XYPoint	r1532	explicit DeclarativeXYPoint(QObject *parent = 0);
Tero Ahola Proposal for QML data API	r196	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Tero Ahola Proposal for QML data API	r196
Tero Ahola d	r722	#endif // DECLARATIVE_XY_POINT_H