##// 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/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2878:97bb01ce5d85 merge
r2893:0464d42b101e merge 5.7.0
Show More
qxymodelmapper.h
80 lines | 2.3 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
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 #ifndef QXYMODELMAPPER_H
#define QXYMODELMAPPER_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartGlobal>
#include <QtCore/QObject>
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 class QAbstractItemModel;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Marek Rosa
XYModelMapper slots for model signals implemented
r1256
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 class QXYModelMapperPrivate;
class QXYSeries;
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QXYModelMapper : public QObject
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 {
Q_OBJECT
Marek Rosa
Added license text to mapper classes
r1355 protected:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QXYModelMapper(QObject *parent = Q_NULLPTR);
Marek Rosa
Added license text to mapper classes
r1355
Jani Honkonen
more coding style fixes for src-folder...
r2104 QAbstractItemModel *model() const;
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 void setModel(QAbstractItemModel *model);
Jani Honkonen
more coding style fixes for src-folder...
r2104 QXYSeries *series() const;
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 void setSeries(QXYSeries *series);
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 int first() const;
void setFirst(int first);
int count() const;
void setCount(int count);
Qt::Orientation orientation() const;
void setOrientation(Qt::Orientation orientation);
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 int xSection() const;
void setXSection(int xSection);
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 int ySection() const;
void setYSection(int ySection);
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 protected:
Jani Honkonen
more coding style fixes for src-folder...
r2104 QXYModelMapperPrivate *const d_ptr;
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 Q_DECLARE_PRIVATE(QXYModelMapper)
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164
#endif // QXYMODELMAPPER_H