##// END OF EJS Templates
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

File last commit:

r2878:97bb01ce5d85 merge
r2878:97bb01ce5d85 merge
Show More
qvxymodelmapper.h
79 lines | 2.8 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Marek Rosa
Added license text to mapper classes
r1355 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Marek Rosa
Added license text to mapper classes
r1355 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Marek Rosa
Added license text to mapper classes
r1355 **
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.
Marek Rosa
Added license text to mapper classes
r1355 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Marek Rosa
Added license text to mapper classes
r1355
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 #ifndef QVXYMODELMAPPER_H
#define QVXYMODELMAPPER_H
Titta Heikkala
Qt Charts project file structure change...
r2712 #include <QtCharts/QXYModelMapper>
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
/* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */
class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 {
Q_OBJECT
Marek Rosa
QXYModelMapper removed from the docs
r1507 Q_PROPERTY(QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced)
Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced)
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 Q_PROPERTY(int xColumn READ xColumn WRITE setXColumn NOTIFY xColumnChanged)
Q_PROPERTY(int yColumn READ yColumn WRITE setYColumn NOTIFY yColumnChanged)
Marek Rosa
QXYModelMapper removed from the docs
r1507 Q_PROPERTY(int firstRow READ firstRow WRITE setFirstRow NOTIFY firstRowChanged)
Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
public:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QVXYModelMapper(QObject *parent = Q_NULLPTR);
Marek Rosa
QXYModelMapper removed from the docs
r1507
Jani Honkonen
more coding style fixes for src-folder...
r2104 QAbstractItemModel *model() const;
Marek Rosa
QXYModelMapper removed from the docs
r1507 void setModel(QAbstractItemModel *model);
Jani Honkonen
more coding style fixes for src-folder...
r2104 QXYSeries *series() const;
Marek Rosa
QXYModelMapper removed from the docs
r1507 void setSeries(QXYSeries *series);
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 int xColumn() const;
void setXColumn(int xColumn);
int yColumn() const;
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 void setYColumn(int yColumn);
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477
Marek Rosa
QXYModelMapper removed from the docs
r1507 int firstRow() const;
void setFirstRow(int firstRow);
int rowCount() const;
void setRowCount(int rowCount);
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 Q_SIGNALS:
Marek Rosa
QXYModelMapper removed from the docs
r1507 void seriesReplaced();
void modelReplaced();
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 void xColumnChanged();
void yColumnChanged();
Marek Rosa
QXYModelMapper removed from the docs
r1507 void firstRowChanged();
void rowCountChanged();
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
#endif // QVXYMODELMAPPER_H