##// 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: 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

File last commit:

r2878:97bb01ce5d85 merge
r2898:03a6177a3223 merge master
Show More
qhxymodelmapper.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 QHXYMODELMAPPER_H
#define QHXYMODELMAPPER_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 QHXYModelMapper : 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 xRow READ xRow WRITE setXRow NOTIFY xRowChanged)
Q_PROPERTY(int yRow READ yRow WRITE setYRow NOTIFY yRowChanged)
Marek Rosa
QXYModelMapper removed from the docs
r1507 Q_PROPERTY(int firstColumn READ firstColumn WRITE setFirstColumn NOTIFY firstColumnChanged)
Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
public:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QHXYModelMapper(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 xRow() const;
void setXRow(int xRow);
int yRow() const;
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 void setYRow(int yRow);
Marek Rosa
QXYModelMapper removed from the docs
r1507 int firstColumn() const;
void setFirstColumn(int firstColumn);
int columnCount() const;
void setColumnCount(int columnCount);
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 xRowChanged();
void yRowChanged();
Marek Rosa
QXYModelMapper removed from the docs
r1507 void firstColumnChanged();
void columnCountChanged();
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 // QHXYMODELMAPPER_H