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

r2854:46147b040d06
r2878:97bb01ce5d85 merge
Show More
qbarlegendmarker_p.h
75 lines | 2.4 KiB | text/x-c | CLexer
/ src / charts / legend / qbarlegendmarker_p.h
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 **
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.
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174
// W A R N I N G
// -------------
//
Titta Heikkala
Updated private header warning...
r2807 // This file is not part of the Qt Chart API. It exists purely as an
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 // implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
#ifndef QBARLEGENDMARKER_P_H
#define QBARLEGENDMARKER_P_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartGlobal>
#include <private/qlegendmarker_p.h>
#include <private/legendmarkeritem_p.h>
#include <QtCharts/QAbstractBarSeries>
#include <QtCharts/QBarSet>
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174
class QBarLegendMarker;
class QBarLegendMarkerPrivate : public QLegendMarkerPrivate
{
Q_OBJECT
public:
explicit QBarLegendMarkerPrivate(QBarLegendMarker *q, QAbstractBarSeries *series, QBarSet *barset, QLegend *legend);
virtual ~QBarLegendMarkerPrivate();
sauimone
Better handling for new or removed markers
r2182 virtual QAbstractBarSeries* series();
virtual QObject* relatedObject();
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 public Q_SLOTS:
virtual void updated();
private:
QBarLegendMarker *q_ptr;
sauimone
optional series parameter to markers function. code style fixes
r2193 QAbstractBarSeries *m_series;
QBarSet *m_barset;
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174
Q_DECLARE_PUBLIC(QBarLegendMarker)
};
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174
#endif // QBARLEGENDMARKER_P_H