HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2793:f83d776d3813

Fix build against 5.6...

Miikka Heikkinen -

r2793:f83d776d3813

parent child

Context file:

r2793:f83d776d3813

Collapse all files

examples/charts/qmloscilloscope/datasource.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef DATASOURCE_H
             #define DATASOURCE_H
             #include <QtCore/QObject>
             #include <QtCharts/QAbstractSeries>
             QT_BEGIN_NAMESPACE
             class QQuickView;
             QT_END_NAMESPACE
             QT_CHARTS_USE_NAMESPACE
             class DataSource : public QObject
             {
                 Q_OBJECT
             public:
                 explicit DataSource(QQuickView *appViewer, QObject *parent = 0);
-            signals:
+            Q_SIGNALS:
             public slots:
                 void generateData(int type, int rowCount, int colCount);
                 void update(QAbstractSeries *series);
             private:
                 QQuickView *m_appViewer;
                 QList<QList<QPointF> > m_data;
                 int m_index;
             };
             #endif // DATASOURCE_H

plugins/designer/qchartsplugin.cpp +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include "qchartsplugin.h"
             #include <QtCharts/QChartView>
             #include <QtCore/QtPlugin>
             QT_CHARTS_USE_NAMESPACE
             QChartsPlugin::QChartsPlugin(QObject *parent) :
                 QObject(parent)
             {
             }
             QChartsPlugin::~QChartsPlugin()
             {
             }
             QString QChartsPlugin::name() const
             {
                 return QStringLiteral("QtCharts::QChartView");
             }
             QString QChartsPlugin::includeFile() const
             {
             #ifdef linux
                 QString myNewLine = QStringLiteral("\n");
             #endif
             #ifdef WIN32
                 QString myNewLine = QStringLiteral("\n\r");
             #endif
             #ifdef __APPLE__
                 QString myNewLine = QStringLiteral("\n");
             #endif
                 return QStringLiteral("<QtCharts/QChartView>") + myNewLine
-                        + QStringLiteral("#include <chartsnamespace.h>");
+                        + QStringLiteral("#include <QtCharts/chartsnamespace.h>");
             }
             QString QChartsPlugin::group() const
             {
                 return tr("Qt Charts Widgets");
             }
             QIcon QChartsPlugin::icon() const
             {
                 return QIcon(QStringLiteral(":/images/qcharts.png"));
             }
             QString QChartsPlugin::toolTip() const
             {
                 return tr("A Qt Charts view widget");
             }
             QString QChartsPlugin::whatsThis() const
             {
                 return tr("This widget is presents QChartView widget");
             }
             bool QChartsPlugin::isContainer() const
             {
                 return false;
             }
             QWidget *QChartsPlugin::createWidget(QWidget *parent)
             {
                 return new QChartView(new QChart(), parent);
             }
             QString QChartsPlugin::domXml() const
             {
                 return QStringLiteral("\
                 <ui language=\"c++\">\
                     <widget class=\"QtCharts::QChartView\" name=\"chartview\">\
                         <property name=\"geometry\">\
                             <rect>\
                                 <x>0</x>\
                                 <y>0</y>\
                                 <width>200</width>\
                                 <height>200</height>\
                             </rect>\
                         </property>\
                     </widget>\
                 </ui>");
             }

src/charts/barchart/vertical/bar/barchartitem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BARCHARTITEM_H
             #define BARCHARTITEM_H
             #include <private/abstractbarchartitem_p.h>
             #include <QtCharts/QStackedBarSeries>
             #include <QtWidgets/QGraphicsItem>
             QT_CHARTS_BEGIN_NAMESPACE
             class BarChartItem : public AbstractBarChartItem
             {
                 Q_OBJECT
             public:
                 BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();
             };
             QT_CHARTS_END_NAMESPACE
             #endif // BARCHARTITEM_H

src/charts/barchart/vertical/percent/percentbarchartitem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef PERCENTBARCHARTITEM_H
             #define PERCENTBARCHARTITEM_H
             #include <private/abstractbarchartitem_p.h>
             #include <QtWidgets/QGraphicsItem>
             QT_CHARTS_BEGIN_NAMESPACE
             class QAbstractBarSeries;
             class PercentBarChartItem : public AbstractBarChartItem
             {
                 Q_OBJECT
             public:
                 PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
                 void handleUpdatedBars();
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();
             };
             QT_CHARTS_END_NAMESPACE
             #endif // PERCENTBARCHARTITEM_H

src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef STACKEDBARCHARTITEM_H
             #define STACKEDBARCHARTITEM_H
             #include <private/abstractbarchartitem_p.h>
             #include <QtCharts/QStackedBarSeries>
             #include <QtWidgets/QGraphicsItem>
             QT_CHARTS_BEGIN_NAMESPACE
             class StackedBarChartItem : public AbstractBarChartItem
             {
                 Q_OBJECT
             public:
                 StackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item =0);
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();
             };
             QT_CHARTS_END_NAMESPACE
             #endif // STACKEDBARCHARTITEM_H

src/charts/boxplotchart/qboxplotseries_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QBOXPLOTSERIES_P_H
             #define QBOXPLOTSERIES_P_H
             #include <QtCharts/QBoxPlotSeries>
             #include <private/qabstractbarseries_p.h>
             #include <private/abstractdomain_p.h>
             #include <QtCharts/QBarSet>
             QT_CHARTS_BEGIN_NAMESPACE
             class BoxPlotAnimation;
             class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QBoxPlotSeriesPrivate(QBoxPlotSeries *q);
                 ~QBoxPlotSeriesPrivate();
                 void initializeGraphics(QGraphicsItem *parent);
                 void initializeDomain();
                 void initializeAxes();
                 void initializeAnimations(QChart::AnimationOptions options);
                 void initializeTheme(int index, ChartTheme *theme, bool forced = false);
                 QList<QLegendMarker*> createLegendMarkers(QLegend *legend);
                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const;
                 bool append(QBoxSet *set);
                 bool remove(QBoxSet *set);
                 bool append(QList<QBoxSet *> sets);
                 bool remove(QList<QBoxSet *> sets);
                 bool insert(int index, QBoxSet *set);
                 QBoxSet *boxSetAt(int index);
                 qreal max();
                 qreal min();
             private:
                 void populateCategories(QBarCategoryAxis *axis);
             Q_SIGNALS:
                 void updated();
                 void clicked(int index, QBoxSet *barset);
                 void pressed(int index, QBoxSet *barset);
                 void released(int index, QBoxSet *barset);
                 void doubleClicked(int index, QBoxSet *barset);
                 void updatedBoxes();
                 void updatedLayout();
                 void restructuredBoxes();
-            private slots:
+            private Q_SLOTS:
                 void handleSeriesChange(QAbstractSeries *series);
                 void handleSeriesRemove(QAbstractSeries *series);
             protected:
                 QList<QBoxSet *> m_boxSets;
                 QPen m_pen;
                 QBrush m_brush;
                 bool m_boxOutlineVisible;
                 int m_index;
                 BoxPlotAnimation *m_animation;
                 qreal m_boxWidth;
             private:
                 Q_DECLARE_PUBLIC(QBoxPlotSeries)
             };
             QT_CHARTS_END_NAMESPACE
             #endif

src/charts/chartpresenter_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTPRESENTER_H
             #define CHARTPRESENTER_H
             #include <QtCharts/QChartGlobal>
             #include <QtCharts/QChart> //because of QChart::ChartThemeId
             #include <QtCore/QRectF>
             #include <QtCore/QMargins>
             #include <QtCore/QLocale>
             QT_CHARTS_BEGIN_NAMESPACE
             class ChartItem;
             class AxisItem;
             class QAbstractSeries;
             class ChartDataSet;
             class AbstractDomain;
             class ChartAxisElement;
             class ChartAnimator;
             class ChartBackground;
             class ChartTitle;
             class ChartAnimation;
             class AbstractChartLayout;
             class ChartPresenter: public QObject
             {
                 Q_OBJECT
             public:
                 enum ZValues {
                     BackgroundZValue = -1,
                     PlotAreaZValue,
                     ShadesZValue,
                     GridZValue,
                     AxisZValue,
                     SeriesZValue,
                     LineChartZValue = SeriesZValue,
                     SplineChartZValue = SeriesZValue,
                     BarSeriesZValue = SeriesZValue,
                     ScatterSeriesZValue = SeriesZValue,
                     PieSeriesZValue = SeriesZValue,
                     BoxPlotSeriesZValue = SeriesZValue,
                     LegendZValue,
                     TopMostZValue
                 };
                 enum State {
                     ShowState,
                     ScrollUpState,
                     ScrollDownState,
                     ScrollLeftState,
                     ScrollRightState,
                     ZoomInState,
                     ZoomOutState
                 };
                 ChartPresenter(QChart *chart, QChart::ChartType type);
                 virtual ~ChartPresenter();
                 void setGeometry(QRectF rect);
                 QRectF geometry() const;
                 QGraphicsItem *rootItem(){ return m_chart; }
                 ChartBackground *backgroundElement();
                 QAbstractGraphicsShapeItem *plotAreaElement();
                 ChartTitle *titleElement();
                 QList<ChartAxisElement *> axisItems() const;
                 QList<ChartItem *> chartItems() const;
                 QLegend *legend();
                 void setBackgroundBrush(const QBrush &brush);
                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
                 void setBackgroundRoundness(qreal diameter);
                 qreal backgroundRoundness() const;
                 void setPlotAreaBackgroundBrush(const QBrush &brush);
                 QBrush plotAreaBackgroundBrush() const;
                 void setPlotAreaBackgroundPen(const QPen &pen);
                 QPen plotAreaBackgroundPen() const;
                 void setTitle(const QString &title);
                 QString title() const;
                 void setTitleFont(const QFont &font);
                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setBackgroundVisible(bool visible);
                 bool isBackgroundVisible() const;
                 void setPlotAreaBackgroundVisible(bool visible);
                 bool isPlotAreaBackgroundVisible() const;
                 void setBackgroundDropShadowEnabled(bool enabled);
                 bool isBackgroundDropShadowEnabled() const;
                 void setLocalizeNumbers(bool localize);
                 inline bool localizeNumbers() const { return m_localizeNumbers; }
                 void setLocale(const QLocale &locale);
                 inline const QLocale &locale() const { return m_locale; }
                 void setVisible(bool visible);
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 void startAnimation(ChartAnimation *animation);
                 void setState(State state,QPointF point);
                 State state() const { return m_state; }
                 QPointF statePoint() const { return m_statePoint; }
                 AbstractChartLayout *layout();
                 QChart::ChartType chartType() const { return m_chart->chartType(); }
                 QChart *chart() { return m_chart; }
                 static QRectF textBoundingRect(const QFont &font, const QString &text, qreal angle = 0.0);
                 static QString truncatedText(const QFont &font, const QString &text, qreal angle,
                                              qreal maxWidth, qreal maxHeight, QRectF &boundingRect);
                 inline static qreal textMargin() { return qreal(0.5); }
                 QString numberToString(double value, char f = 'g', int prec = 6);
                 QString numberToString(int value);
             private:
                 void createBackgroundItem();
                 void createPlotAreaBackgroundItem();
                 void createTitleItem();
             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries *series);
                 void handleSeriesRemoved(QAbstractSeries *series);
                 void handleAxisAdded(QAbstractAxis *axis);
                 void handleAxisRemoved(QAbstractAxis *axis);
-            signals:
+            Q_SIGNALS:
                 void plotAreaChanged(const QRectF &plotArea);
             private:
                 QChart *m_chart;
                 QList<ChartItem *> m_chartItems;
                 QList<ChartAxisElement *> m_axisItems;
                 QList<QAbstractSeries *> m_series;
                 QList<QAbstractAxis *> m_axes;
                 QChart::AnimationOptions m_options;
                 State m_state;
                 QPointF m_statePoint;
                 AbstractChartLayout *m_layout;
                 ChartBackground *m_background;
                 QAbstractGraphicsShapeItem *m_plotAreaBackground;
                 ChartTitle *m_title;
                 QRectF m_rect;
                 bool m_localizeNumbers;
                 QLocale m_locale;
             };
             QT_CHARTS_END_NAMESPACE
             #endif /* CHARTPRESENTER_H */

src/charts/chartsnamespace.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef CHARTSNAMESPACE_H
             #define CHARTSNAMESPACE_H
             // this is needed by the designer plugin.
+            #ifdef QT_CHARTS_USE_NAMESPACE
             QT_CHARTS_USE_NAMESPACE
+            #endif
             #endif /* CHARTSNAMESPACE_H */

src/charts/piechart/qpieseries_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QPIESERIES_P_H
             #define QPIESERIES_P_H
             #include <QtCharts/QPieSeries>
             #include <private/qabstractseries_p.h>
             QT_CHARTS_BEGIN_NAMESPACE
             class QLegendPrivate;
             class QPieSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QPieSeriesPrivate(QPieSeries *parent);
                 ~QPieSeriesPrivate();
                 void initializeDomain();
                 void initializeAxes();
                 void initializeGraphics(QGraphicsItem* parent);
                 void initializeAnimations(QtCharts::QChart::AnimationOptions options);
                 void initializeTheme(int index, ChartTheme* theme, bool forced = false);
                 QList<QLegendMarker *> createLegendMarkers(QLegend *legend);
                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const;
                 void updateDerivativeData();
                 void setSizes(qreal innerSize, qreal outerSize);
                 static QPieSeriesPrivate *fromSeries(QPieSeries *series);
-            signals:
+            Q_SIGNALS:
                 void calculatedDataChanged();
                 void pieSizeChanged();
                 void pieStartAngleChanged();
                 void pieEndAngleChanged();
                 void horizontalPositionChanged();
                 void verticalPositionChanged();
             public Q_SLOTS:
                 void sliceValueChanged();
                 void sliceClicked();
                 void sliceHovered(bool state);
                 void slicePressed();
                 void sliceReleased();
                 void sliceDoubleClicked();
             private:
                 QList<QPieSlice *> m_slices;
                 qreal m_pieRelativeHorPos;
                 qreal m_pieRelativeVerPos;
                 qreal m_pieRelativeSize;
                 qreal m_pieStartAngle;
                 qreal m_pieEndAngle;
                 qreal m_sum;
                 qreal m_holeRelativeSize;
             public:
                 friend class QLegendPrivate;
                 Q_DECLARE_PUBLIC(QPieSeries)
             };
             QT_CHARTS_END_NAMESPACE
             #endif // QPIESERIES_P_H

src/charts/qchart.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef QCHART_H
             #define QCHART_H
             #include <QtCharts/QAbstractSeries>
             #include <QtCharts/QLegend>
             #include <QtWidgets/QGraphicsWidget>
             #include <QtCore/QMargins>
             QT_BEGIN_NAMESPACE
             class QGraphicsSceneResizeEvent;
             QT_END_NAMESPACE
             QT_CHARTS_BEGIN_NAMESPACE
             class QAbstractSeries;
             class QAbstractAxis;
             class QLegend;
             class QChartPrivate;
             class QBoxPlotSeries;
             class QT_CHARTS_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
                 Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
                 Q_PROPERTY(bool dropShadowEnabled READ isDropShadowEnabled WRITE setDropShadowEnabled)
                 Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness)
                 Q_PROPERTY(QChart::AnimationOptions animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QMargins margins READ margins WRITE setMargins)
                 Q_PROPERTY(QChart::ChartType chartType READ chartType)
                 Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible)
                 Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers)
                 Q_PROPERTY(QLocale locale READ locale WRITE setLocale)
                 Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged)
                 Q_ENUMS(ChartTheme)
                 Q_ENUMS(AnimationOption)
                 Q_ENUMS(ChartType)
             public:
                 enum ChartType {
                     ChartTypeUndefined = 0,
                     ChartTypeCartesian,
                     ChartTypePolar
                 };
                 enum ChartTheme {
                     ChartThemeLight = 0,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy,
                     ChartThemeQt
                 };
                 enum AnimationOption {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations = 0x2,
                     AllAnimations = 0x3
                 };
                 Q_DECLARE_FLAGS(AnimationOptions, AnimationOption)
             public:
                 explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 void addSeries(QAbstractSeries *series);
                 void removeSeries(QAbstractSeries *series);
                 void removeAllSeries();
                 QList<QAbstractSeries *> series() const;
                 // *** deprecated ***
                 void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 QAbstractAxis *axisX(QAbstractSeries *series = 0) const;
                 QAbstractAxis *axisY(QAbstractSeries *series = 0) const;
                 // ******************
                 void addAxis(QAbstractAxis *axis, Qt::Alignment alignment);
                 void removeAxis(QAbstractAxis *axis);
                 QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = 0) const;
                 void createDefaultAxes();
                 void setTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme theme() const;
                 void setTitle(const QString &title);
                 QString title() const;
                 void setTitleFont(const QFont &font);
                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setBackgroundBrush(const QBrush &brush);
                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
                 void setBackgroundVisible(bool visible = true);
                 bool isBackgroundVisible() const;
                 void setDropShadowEnabled(bool enabled = true);
                 bool isDropShadowEnabled() const;
                 void setBackgroundRoundness(qreal diameter);
                 qreal backgroundRoundness() const;
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomOut();
                 void zoomIn(const QRectF &rect);
                 void zoom(qreal factor);
                 void zoomReset();
                 bool isZoomed();
                 void scroll(qreal dx, qreal dy);
                 QLegend *legend() const;
                 void setMargins(const QMargins &margins);
                 QMargins margins() const;
                 QRectF plotArea() const;
                 void setPlotAreaBackgroundBrush(const QBrush &brush);
                 QBrush plotAreaBackgroundBrush() const;
                 void setPlotAreaBackgroundPen(const QPen &pen);
                 QPen plotAreaBackgroundPen() const;
                 void setPlotAreaBackgroundVisible(bool visible = true);
                 bool isPlotAreaBackgroundVisible() const;
                 void setLocalizeNumbers(bool localize);
                 bool localizeNumbers() const;
                 void setLocale(const QLocale &locale);
                 QLocale locale() const;
                 QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0);
                 QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0);
                 ChartType chartType() const;
-            signals:
+            Q_SIGNALS:
                 void plotAreaChanged(const QRectF &plotArea);
             protected:
                 explicit QChart(QChart::ChartType type, QGraphicsItem *parent, Qt::WindowFlags wFlags);
                 QScopedPointer<QChartPrivate> d_ptr;
                 friend class QLegend;
                 friend class DeclarativeChart;
                 friend class ChartDataSet;
                 friend class ChartPresenter;
                 friend class ChartThemeManager;
                 friend class QAbstractSeries;
                 friend class QBoxPlotSeriesPrivate;
             private:
                 Q_DISABLE_COPY(QChart)
             };
             QT_CHARTS_END_NAMESPACE
             Q_DECLARE_OPERATORS_FOR_FLAGS(QT_CHARTS_NAMESPACE::QChart::AnimationOptions)
             #endif // QCHART_H

src/chartsqml2/declarativeaxes.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #ifndef DECLARATIVEAXES_H
             #define DECLARATIVEAXES_H
             #include <QtCharts/QChartGlobal>
             #include <QtCore/QObject>
             QT_CHARTS_BEGIN_NAMESPACE
             class QAbstractAxis;
             class DeclarativeAxes : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
                 Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged)
                 Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged)
             public:
                 explicit DeclarativeAxes(QObject *parent = 0);
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis);
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis);
                 QAbstractAxis *axisXTop() { return m_axisXTop; }
                 void setAxisXTop(QAbstractAxis *axis);
                 QAbstractAxis *axisYRight() { return m_axisYRight; }
                 void setAxisYRight(QAbstractAxis *axis);
             public:
                 void emitAxisXChanged() { emit axisXChanged(m_axisX); }
                 void emitAxisYChanged() { emit axisYChanged(m_axisY); }
                 void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); }
                 void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); }
-            signals:
+            Q_SIGNALS:
                 void axisXChanged(QAbstractAxis *axis);
                 void axisYChanged(QAbstractAxis *axis);
                 void axisXTopChanged(QAbstractAxis *axis);
                 void axisYRightChanged(QAbstractAxis *axis);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
                 QAbstractAxis *m_axisXTop;
                 QAbstractAxis *m_axisYRight;
             };
             QT_CHARTS_END_NAMESPACE
             #endif // DECLARATIVEAXES_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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