HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r969:db6eae90aaea

Fixes header guard style issues

Michal Klocek -

r969:db6eae90aaea

parent child

Context file:

r969:db6eae90aaea

Expand all files

src/animations/axisanimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef AXISANIMATIONITEM_H_
+            #ifndef AXISANIMATION_H
-            #define AXISANIMATIONITEM_H_
+            #define AXISANIMATION_H
             #include "axis_p.h"
             #include "chartanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisAnimation: public ChartAnimation
             {
             public:
                 AxisAnimation(Axis *axis);
                 ~AxisAnimation();
             protected:
                 QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
                 void updateCurrentValue(const QVariant &value );
             private:
                 Axis *m_axis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* AXISITEM_H_ */

src/animations/baranimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef BARANIMATION_P_H_
+            #ifndef BARANIMATION_P_H
-            #define BARANIMATION_P_H_
+            #define BARANIMATION_P_H
             #include "chartanimation_p.h"
             #include "barchartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BarChartItem;
             class QBarSet;
             class BarSetAnimation;
             class BarAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 BarAnimation(BarChartItem *item);
                 ~BarAnimation();
             public: // from QVariantAnimation
                 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
                 virtual void updateCurrentValue(const QVariant &value);
             public Q_SLOTS:
             private:
                 BarChartItem *m_item;
                 QHash<QBarSet *, BarSetAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/chartanimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTANIMATION_H_
+            #ifndef CHARTANIMATION_H
-            #define CHARTANIMATION_H_
+            #define CHARTANIMATION_H
             #include "qchartglobal.h"
             #include <QVariantAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartAnimation: public QVariantAnimation
             {
             public:
                 enum Animation { LineDrawAnimation, MoveDownAnimation, MoveUpAnimation };
                 ChartAnimation(QObject *parent = 0):QVariantAnimation(parent), m_type(MoveDownAnimation){}
                 void setAnimationType(Animation type){
                     m_type=type;
                 }
             protected:
                 Animation m_type;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* AXISITEM_H_ */

src/animations/chartanimator_p.h +3 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTANIMATOR_P_H_
+            #ifndef CHARTANIMATOR_P_H
-            #define CHARTANIMATOR_P_H_
+            #define CHARTANIMATOR_P_H
             #include "qchartglobal.h"
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "barchartitem_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class Axis;
             class AreaChartItem;
             class SplineChartItem;
             class ScatterChartItem;
             class LineChartItem;
             class XYChartItem;
             class ChartAnimator : public QObject {
             public:
                 enum State{ShowState, ScrollUpState, ScrollDownState, ScrollLeftState, ScrollRightState, ZoomInState, ZoomOutState};
                 ChartAnimator(QObject *parent = 0);
                 virtual ~ChartAnimator();
                 void addAnimation(Axis *item);
                 void addAnimation(PieChartItem *item);
                 void addAnimation(ScatterChartItem *item);
                 void addAnimation(LineChartItem *item);
                 void addAnimation(SplineChartItem *item);
                 void addAnimation(BarChartItem *item);
                 void removeAnimation(Chart *item);
                 void animationStarted();
                 void updateLayout(XYChartItem *item, QVector<QPointF> &oldLayout, QVector<QPointF> &newLayout, int index);
                 void updateLayout(SplineChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newContorlPoints, int index);
                 void updateLayout(Axis *item, QVector<qreal> &layout);
                 void addAnimation(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty);
                 void removeAnimation(PieChartItem *item, QPieSlice *slice);
                 void updateLayout(PieChartItem *item, const PieLayout &layout);
                 void updateLayout(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData);
                 void updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
                 void setState(State state,const QPointF &point = QPointF());
             private:
                  QMap<Chart *, ChartAnimation *> m_animations;
                  State m_state;
                  QPointF m_point;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/pieanimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef PIEANIMATION_P_H_
+            #ifndef PIEANIMATION_P_H
-            #define PIEANIMATION_P_H_
+            #define PIEANIMATION_P_H
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "piesliceanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class PieAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 PieAnimation(PieChartItem *item);
                 ~PieAnimation();
                 void updateValues(const PieLayout &newValues);
                 void updateValue(QPieSlice *slice, const PieSliceData &newValue);
                 void addSlice(QPieSlice *slice, const PieSliceData &endValue, bool isEmpty);
                 void removeSlice(QPieSlice *slice);
             public: // from QVariantAnimation
                 void updateCurrentValue(const QVariant &value);
             public Q_SLOTS:
                 void destroySliceAnimationComplete();
             private:
                 PieChartItem *m_item;
                 QHash<QPieSlice *, PieSliceAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/piesliceanimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef PIESLICEANIMATION_P_H_
+            #ifndef PIESLICEANIMATION_P_H
-            #define PIESLICEANIMATION_P_H_
+            #define PIESLICEANIMATION_P_H
             #include "piechartitem_p.h"
             #include <QVariantAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class QPieSlice;
             class PieSliceAnimation : public QVariantAnimation
             {
             public:
                 PieSliceAnimation(PieChartItem *item, QPieSlice *slice);
                 ~PieSliceAnimation();
                 void setValue(const PieSliceData &startValue, const PieSliceData &endValue);
                 void updateValue(const PieSliceData &endValue);
                 PieSliceData currentSliceValue();
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
             private:
                 PieChartItem *m_item;
                 QPieSlice *m_slice;
                 PieSliceData m_currentValue;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/splineanimation_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef SPLINEANIMATION_P_H_
+            #ifndef SPLINEANIMATION_P_H
-            #define SPLINEANIMATION_P_H_
+            #define SPLINEANIMATION_P_H
             #include "chartanimation_p.h"
             #include <QPointF>
             typedef  QPair<QVector<QPointF >, QVector<QPointF > >  SplineVector;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class SplineChartItem;
             class SplineAnimation : public ChartAnimation
             {
             public:
                 SplineAnimation(SplineChartItem *item);
                 ~SplineAnimation();
                 void setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index);
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
             private:
                 SplineVector m_oldSpline;
                 SplineChartItem *m_item;
                 bool m_dirty;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/xyanimation_p.h +3 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef XYCHARTANIMATION_P_H_
+            #ifndef XYANIMATION_P_H
-            #define XYCHARTANIMATION_P_H_
+            #define XYANIMATION_P_H
             #include "chartanimation_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class XYChartItem;
             class XYAnimation : public ChartAnimation
             {
             public:
                 enum Animation { LineDrawAnimation, MoveDownAnimation, MoveUpAnimation };
                 XYAnimation(XYChartItem *item);
                 ~XYAnimation();
                 void setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index);
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress ) const;
                 void updateCurrentValue (const QVariant &value );
             private:
                 XYChartItem *m_item;
                 QVector<QPointF> m_oldPoints;
                 bool m_dirty;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/areachart/qareaseries.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef QAREASERIES_H_
+            #ifndef QAREASERIES_H
-            #define QAREASERIES_H_
+            #define QAREASERIES_H
             #include <qchartglobal.h>
             #include <qseries.h>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLineSeries;
             class QAreaSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QSeries
             {
                 Q_OBJECT
             public:
                 QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = 0);
                 virtual ~QAreaSeries();
             public:
                 QSeries::QSeriesType type() const;
                 QLineSeries* upperSeries() const;
                 QLineSeries* lowerSeries() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPointsVisible(bool visible);
                 bool pointsVisible() const;
                 bool setModel(QAbstractItemModel* model);
                 QAbstractItemModel* model() const;
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void selected();
             private:
                 Q_DECLARE_PRIVATE(QAreaSeries);
                 Q_DISABLE_COPY(QAreaSeries);
                 friend class AreaLegendMarker;
                 friend class AreaChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/areachart/qareaseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QAREASERIES_P_H_
+            #ifndef QAREASERIES_P_H
-            #define QAREASERIES_P_H_
+            #define QAREASERIES_P_H
             #include "qseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAreaSeries;
             class QAreaSeriesPrivate: public QSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries,QAreaSeries* q);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
             Q_SIGNALS:
                 void updated();
             protected:
                 QBrush m_brush;
                 QPen m_pen;
                 QLineSeries* m_upperSeries;
                 QLineSeries* m_lowerSeries;
                 bool m_pointsVisible;
             private:
                 Q_DECLARE_PUBLIC(QAreaSeries);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/axis/axis_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef AXISITEM_H_
+            #ifndef AXIS_H
-            #define AXISITEM_H_
+            #define AXIS_H
             #include "qchartglobal.h"
             #include "chart_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxis;
             class ChartPresenter;
             class Axis : public Chart
             {
                 Q_OBJECT
             public:
                 enum AxisType{X_AXIS,Y_AXIS};
                 Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS);
                 ~Axis();
                 AxisType axisType() const { return m_type; }
                 void setAxisOpacity(qreal opacity);
                 qreal axisOpacity() const;
                 void setGridOpacity(qreal opacity);
                 qreal gridOpacity() const;
                 void setLabelsOpacity(qreal opacity);
                 qreal labelsOpacity() const;
                 void setShadesOpacity(qreal opacity);
                 qreal shadesOpacity() const;
                 void setLabelsAngle(int angle);
                 int labelsAngle()const { return m_labelsAngle; }
                 void setShadesBrush(const QBrush &brush);
                 void setShadesPen(const QPen &pen);
                 void setAxisPen(const QPen &pen);
                 void setGridPen(const QPen &pen);
                 void setLabelsPen(const QPen &pen);
                 void setLabelsBrush(const QBrush &brush);
                 void setLabelsFont(const QFont &font);
                 inline QRectF geometry() const { return m_rect; }
                 inline QVector<qreal> layout() { return m_layoutVector; }
             public Q_SLOTS:
                 void handleAxisUpdated();
                 void handleAxisCategoriesUpdated();
                 void handleRangeChanged(qreal min , qreal max,int tickCount);
                 void handleGeometryChanged(const QRectF &size);
             private:
                 inline bool isEmpty();
                 void createItems(int count);
                 void deleteItems(int count);
                 QVector<qreal> calculateLayout() const;
                 void updateLayout(QVector<qreal> &layout);
                 void setLayout(QVector<qreal> &layout);
                 bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
                 void axisSelected();
             private:
                 QChartAxis* m_chartAxis;
                 AxisType m_type;
                 QRectF m_rect;
                 int m_labelsAngle;
                 QScopedPointer<QGraphicsItemGroup> m_grid;
                 QScopedPointer<QGraphicsItemGroup> m_shades;
                 QScopedPointer<QGraphicsItemGroup> m_labels;
                 QScopedPointer<QGraphicsItemGroup> m_axis;
                 QVector<qreal> m_layoutVector;
                 qreal m_min;
                 qreal m_max;
                 int m_ticksCount;
                 friend class AxisAnimation;
                 friend class AxisItem;
             };
             class AxisItem: public QGraphicsLineItem
             {
             public:
                 AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
             protected:
                void mousePressEvent(QGraphicsSceneMouseEvent *event)
                {
                    Q_UNUSED(event)
                    m_axis->axisSelected();
                }
                QRectF boundingRect() const
                {
                   return shape().boundingRect();
                }
                QPainterPath shape() const
                {
                    QPainterPath path = QGraphicsLineItem::shape();
                    QRectF rect = path.boundingRect();
                    path.addRect(rect.adjusted(0,0,m_axis->axisType()!=Axis::X_AXIS?8:0,m_axis->axisType()!=Axis::Y_AXIS?8:0));
                    return path;
                }
             private:
                Axis* m_axis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* AXISITEM_H_ */

src/axis/qchartaxis.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef QCHARTAXIS_H_
+            #ifndef QCHARTAXIS_H
-            #define QCHARTAXIS_H_
+            #define QCHARTAXIS_H
             #include <qchartglobal.h>
             #include <qchartaxiscategories.h>
             #include <QPen>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxisPrivate;
             class QTCOMMERCIALCHART_EXPORT QChartAxis : public QObject
             {
             	Q_OBJECT
             public:
                 QChartAxis(QObject *parent =0);
                 ~QChartAxis();
                 //axis handling
                 bool isAxisVisible() const;
                 void setAxisVisible(bool visible);
                 void setAxisPen(const QPen &pen);
                 QPen axisPen() const;
                 //grid handling
                 bool isGridLineVisible() const;
                 void setGridLineVisible(bool visible);
                 void setGridLinePen(const QPen &pen);
                 QPen gridLinePen() const;
                 //labels handling
                 bool labelsVisible() const;
                 void setLabelsVisible(bool visible);
                 void setLabelsPen(const QPen &pen);
                 QPen labelsPen() const;
                 void setLabelsBrush(const QBrush &brush);
                 QBrush labelsBrush() const;
                 void setLabelsFont(const QFont &font);
                 QFont labelsFont() const;
                 void setLabelsAngle(int angle);
                 int labelsAngle() const;
                 //shades handling
                 bool shadesVisible() const;
                 void setShadesVisible(bool visible);
                 void setShadesPen(const QPen &pen);
                 QPen shadesPen() const;
                 void setShadesBrush(const QBrush &brush);
                 QBrush shadesBrush() const;
                 void setShadesOpacity(qreal opacity);
                 qreal shadesOpacity() const;
                 //range handling
                 void setMin(qreal min);
                 qreal min() const;
                 void setMax(qreal max);
                 qreal max() const;
                 void setRange(qreal min, qreal max);
                 //ticks handling
                 void setTicksCount(int count);
                 int ticksCount() const;
                 void setNiceNumbers(bool enable);
                 bool niceNumbers() const;
                 QChartAxisCategories* categories();
                 void show();
                 void hide();
             Q_SIGNALS:
             	void minChanged(qreal min);
             	void maxChanged(qreal max);
             	void rangeChanged(qreal min, qreal max);
             	void ticksCountChanged(int count);
             private:
             	QScopedPointer<QChartAxisPrivate> d_ptr;
                 Q_DISABLE_COPY(QChartAxis);
                 friend class ChartDataSet;
                 friend class Axis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* QCHARTAXIS_H_ */

src/axis/qchartaxis_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QCHARTAXIS_P_H_
+            #ifndef QCHARTAXIS_P_H
-            #define QCHARTAXIS_P_H_
+            #define QCHARTAXIS_P_H
             #include "qchartaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxisPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 QChartAxisPrivate(QChartAxis *q);
                 ~QChartAxisPrivate();
             Q_SIGNALS:
                 void updated();
                 void changed(qreal min, qreal max, int tickCount,bool niceNumbers);
             public Q_SLOTS:
                 void handleAxisRangeChanged(qreal min, qreal max,int count);
             private:
                 QChartAxis *q_ptr;
                 bool m_axisVisible;
                 QPen m_axisPen;
                 QBrush m_axisBrush;
                 bool m_gridLineVisible;
                 QPen m_gridLinePen;
                 bool m_labelsVisible;
                 QPen m_labelsPen;
                 QBrush m_labelsBrush;
                 QFont m_labelsFont;
                 int m_labelsAngle;
                 bool m_shadesVisible;
                 QPen m_shadesPen;
                 QBrush m_shadesBrush;
                 qreal m_shadesOpacity;
                 qreal m_min;
                 qreal m_max;
                 int m_ticksCount;
                 QChartAxisCategories m_category;
                 bool m_niceNumbers;
                 friend class QChartAxis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/axis/qchartaxiscategories.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef QCHARTAXISCATEGORIES_H_
+            #ifndef QCHARTAXISCATEGORIES_H
-            #define QCHARTAXISCATEGORIES_H_
+            #define QCHARTAXISCATEGORIES_H
             #include <qchartglobal.h>
             #include <qbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxisCategoriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QChartAxisCategories : public QObject
             {
                 Q_OBJECT
             private:
                 QChartAxisCategories();
             public:
                 ~QChartAxisCategories();
                 void insert(const QBarCategories &category);
                 void insert(qreal value,QString label);
                 void remove(qreal value);
                 QList<qreal> values() const;
                 QString label(qreal value) const;
                 void clear();
                 int count();
             private:
                 QScopedPointer<QChartAxisCategoriesPrivate> d_ptr;
                 friend class QChartAxisPrivate;
                 friend class Axis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* QCHARTAXISCATEGORIES_H_ */

src/axis/qchartaxiscategories_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QCHARTAXISCATEGORIES_P_H_
+            #ifndef QCHARTAXISCATEGORIES_P_H
-            #define QCHARTAXISCATEGORIES_P_H_
+            #define QCHARTAXISCATEGORIES_P_H
             #include "qchartaxiscategories.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxisCategoriesPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 QChartAxisCategoriesPrivate(QChartAxisCategories *q);
                 ~QChartAxisCategoriesPrivate();
             Q_SIGNALS:
                 void updated();
             private:
                 QChartAxisCategories *q_ptr;
                 QMap<qreal,QString> m_map;
                 friend class QChartAxisCategories;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/barchart/barchartmodel.cpp +3 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
+            #include "barchartmodel_p.h"
+            #include "qbarset.h"
             #include <limits.h>
             #include <QVector>
             #include <QDebug>
-            #include "barchartmodel_p.h"
-            #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartModel::BarChartModel(QStringList categories, QObject *parent) : QObject(parent),
                 m_category(categories)
             {
             }
             QStringList BarChartModel::category()
             {
                 return m_category;
             }
             void BarChartModel::appendBarSet(QBarSet *set)
             {
                 m_dataModel.append(set);
             }
             void BarChartModel::removeBarSet(QBarSet *set)
             {
                 if (m_dataModel.contains(set)) {
                     m_dataModel.removeOne(set);
                 }
             }
             void BarChartModel::insertBarSet(int i, QBarSet *set)
             {
                 m_dataModel.insert(i, set);
             }
             void BarChartModel::insertCategory(int i, QString category)
             {
                 m_category.insert(i, category);
             }
             void BarChartModel::removeCategory(int i)
             {
                 m_category.removeAt(i);
             }
             QBarSet* BarChartModel::barsetAt(int index) const
             {
                 return m_dataModel.at(index);
             }
             QList<QBarSet*> BarChartModel::barSets() const
             {
                 return m_dataModel;
             }
             int BarChartModel::barsetCount() const
             {
                 return m_dataModel.count();
             }
             int BarChartModel::categoryCount() const
             {
                 return m_category.count();
             }
             qreal BarChartModel::min() const
             {
                 Q_ASSERT(m_dataModel.count() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_dataModel.count(); i++) {
                     int itemCount = m_dataModel.at(i)->count();
                     for (int j = 0; j < itemCount; j++) {
                         qreal temp = m_dataModel.at(i)->valueAt(j);
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal BarChartModel::max() const
             {
                 if (m_dataModel.count() == 0) return 0;
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_dataModel.count(); i++) {
                     int itemCount = m_dataModel.at(i)->count();
                     for (int j = 0; j < itemCount; j++) {
                         qreal temp = m_dataModel.at(i)->valueAt(j);
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             qreal BarChartModel::valueAt(int set, int category) const
             {
                 if ((set < 0) || (set >= m_dataModel.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_dataModel.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 return m_dataModel.at(set)->valueAt(category);
             }
             qreal BarChartModel::percentageAt(int set, int category) const
             {
                 if ((set < 0) || (set >= m_dataModel.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_dataModel.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 qreal value = m_dataModel.at(set)->valueAt(category);
                 qreal total = categorySum(category);
                 if ( qFuzzyCompare(total, 0) )
                     return 0;
                 return value / total;
             }
             qreal BarChartModel::categorySum(int category) const
             {
                 qreal sum(0);
                 int count = m_dataModel.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_dataModel.at(set)->count())
                         sum += m_dataModel.at(set)->valueAt(category);
                 }
                 return sum;
             }
             qreal BarChartModel::absoluteCategorySum(int category) const
             {
                 qreal sum(0);
                 int count = m_dataModel.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_dataModel.at(set)->count())
                         sum += qAbs(m_dataModel.at(set)->valueAt(category));
                 }
                 return sum;
             }
             qreal BarChartModel::maxCategorySum() const
             {
                 qreal max = INT_MIN;
                 int count = categoryCount();
                 for (int col = 0; col < count; col++) {
                     qreal sum = categorySum(col);
                     if (sum > max)
                         max = sum;
                 }
                 return max;
             }
             QString BarChartModel::categoryName(int category)
             {
                 return m_category.at(category);
             }
             #include "moc_barchartmodel_p.cpp"
-            QTCOMMERCIALCHART_END_NAMESPACE
+            QTCOMMERCIALCHART_END_NAMESPACE
  No newline at end of file

src/barchart/qpercentbarseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QPERCENTBARSERIES_P_H_
+            #ifndef QPERCENTBARSERIES_P_H
-            #define QPERCENTBARSERIES_P_H_
+            #define QPERCENTBARSERIES_P_H
             #include "qbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPercentBarSeriesPrivate: public QBarSeriesPrivate
             {
             public:
                 QPercentBarSeriesPrivate(QBarCategories categories,QPercentBarSeries* q);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
             private:
                 Q_DECLARE_PUBLIC(QPercentBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/barchart/qstackedbarseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QSTACKEDBARSERIES_P_H_
+            #ifndef QSTACKEDBARSERIES_P_H
-            #define QSTACKEDBARSERIES_P_H_
+            #define QSTACKEDBARSERIES_P_H
             #include "qbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QStackedBarSeriesPrivate: public QBarSeriesPrivate
             {
             public:
                 QStackedBarSeriesPrivate(QBarCategories categories,QStackedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QStackedBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/chart_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHART_H_
+            #ifndef CHART_H
-            #define CHART_H_
+            #define CHART_H
             #include "qchartglobal.h"
             #include <QRect>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartAnimator;
             class ChartPresenter;
             class Chart: public QObject
             {
                 Q_OBJECT
             public:
                 explicit Chart(ChartPresenter *presenter);
             public Q_SLOTS:
                 virtual void handleGeometryChanged(const QRectF& rect);
                 virtual void handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY);
                 virtual void rangeXChanged(qreal min, qreal max, int tickXCount);
                 virtual void rangeYChanged(qreal min, qreal max, int tickYCount);
                 void setAnimator(ChartAnimator* animator);
                 ChartAnimator* animator() const;
                 ChartPresenter* presenter() const;
             private:
                 ChartAnimator* m_animator;
                 ChartPresenter* m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/chartbackground_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTBACKGROUND_H_
+            #ifndef CHARTBACKGROUND_H
-            #define CHARTBACKGROUND_H_
+            #define CHARTBACKGROUND_H
             #include "qchartglobal.h"
             #include <QGraphicsRectItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartBackground: public QGraphicsRectItem
             {
             public:
                 ChartBackground(QGraphicsItem *parent =0);
                 ~ChartBackground();
                 void setDimeter(int dimater);
                 int diameter() const;
             protected:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
             private:
                 int roundness(qreal size) const;
             private:
                  int m_diameter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTBACKGROUND_H_ */

src/chartconfig_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTCONFIG_H_
+            #ifndef CHARTCONFIG_H
-            #define CHARTCONFIG_H_
+            #define CHARTCONFIG_H
             #include "qchartglobal.h"
             #ifdef Q_CC_MSVC
             // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
             // This is the case at least with shadow builds.
             // http://qt-project.org/wiki/jom
             const char *buildTime = __DATE__;
             const char *gitHead = "unknown";
             #else
             #include "qchartversion_p.h"
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartConfig {
             private:
                 ChartConfig(){
                 #ifndef QT_NO_DEBUG
                     qDebug()<<"buildTime" << buildTime;
                     qDebug()<<"gitHead" << gitHead;
                 #endif
                     m_instance = this;
                 }
             public:
                 static ChartConfig* instance(){
                     if(!m_instance){
                         m_instance= new ChartConfig();
                     }
                     return m_instance;
                 }
                 QString compilationTime(){
                     return buildTime;
                 }
                 QString compilationHead(){
                     return gitHead;
                 }
             private:
                 static ChartConfig* m_instance;
             };
             ChartConfig* ChartConfig::m_instance=0;
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/chartdataset_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 CHARTDATASET_P_H_
+            #ifndef CHARTDATASET_P_H
-            #define CHARTDATASET_P_H_
+            #define CHARTDATASET_P_H
             #include "qseries.h"
             #include "domain_p.h"
             #include <QVector>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxis;
             class QBarSeries;
             class ChartDataSet : public QObject
             {
                 Q_OBJECT
             public:
                 ChartDataSet(QObject* parent=0);
                 virtual ~ChartDataSet();
                 void addSeries(QSeries* series,QChartAxis *axisY = 0);
                 void removeSeries(QSeries* series);
                 void removeAllSeries();
                 void zoomInDomain(const QRectF& rect, const QSizeF& size);
                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
                 void scrollDomain(int dx,int dy,const QSizeF& size);
                 int seriesCount(QSeries::QSeriesType type);
                 int seriesIndex(QSeries *series);
                 Domain* domain(QSeries* series) const;
                 Domain* domain(QChartAxis* axis) const;
                 QChartAxis* axisX() const { return m_axisX; }
                 QChartAxis* axisY(QSeries* series = 0) const;
             Q_SIGNALS:
                 void seriesAdded(QSeries* series,Domain* domain);
                 void seriesRemoved(QSeries* series);
                 void axisAdded(QChartAxis* axis,Domain* domain);
                 void axisRemoved(QChartAxis* axis);
             private:
                 QStringList createLabels(QChartAxis* axis,qreal min, qreal max);
                 void calculateDomain(QSeries* series,Domain* domain);
                 void setupCategories(QBarSeries* series);
             private:
                 QMap<QSeries*, QChartAxis*> m_seriesAxisMap;
                 QMap<QChartAxis*, Domain*> m_axisDomainMap;
                 QMap<int,QSeries*> m_indexSeriesMap;
                 QChartAxis* m_axisX;
                 QChartAxis* m_axisY;
                 int m_domainIndex;
                 bool m_axisXInitialized;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTENGINE_P_H_ */

src/chartitem_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTITEM_H_
+            #ifndef CHARTITEM_H
-            #define CHARTITEM_H_
+            #define CHARTITEM_H
             #include "chart_p.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem : public QGraphicsItem, public Chart
             {
                 enum ChartItemTypes{ AXIS_ITEM = UserType + 1, XYLINE_ITEM };
             public:
                 ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), Chart(presenter) {}
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTITEM_H_ */

src/chartpresenter.cpp +159 -160

             /****************************************************************************
-            **
+             **
-            ** Copyright (C) 2012 Digia Plc
+             ** Copyright (C) 2012 Digia Plc
-            ** All rights reserved.
+             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+             ** For any questions to Digia, please use contact form at http://qt.digia.com
-            **
+             **
-            ** This file is part of the Qt Commercial Charts Add-on.
+             ** This file is part of the Qt Commercial Charts Add-on.
-            **
+             **
-            ** $QT_BEGIN_LICENSE$
+             ** $QT_BEGIN_LICENSE$
-            ** Licensees holding valid Qt Commercial licenses may use this file in
+             ** Licensees holding valid Qt Commercial licenses may use this file in
-            ** accordance with the Qt Commercial License Agreement provided with the
+             ** accordance with the Qt Commercial License Agreement provided with the
-            ** Software or, alternatively, in accordance with the terms contained in
+             ** Software or, alternatively, in accordance with the terms contained in
-            ** a written agreement between you and Digia.
+             ** a written agreement between you and Digia.
-            **
+             **
-            ** If you have questions regarding the use of this file, please use
+             ** If you have questions regarding the use of this file, please use
-            ** contact form at http://qt.digia.com
+             ** contact form at http://qt.digia.com
-            ** $QT_END_LICENSE$
+             ** $QT_END_LICENSE$
-            **
+             **
-            ****************************************************************************/
+             ****************************************************************************/
+            #include "chartpresenter_p.h"
             #include "qchart.h"
             #include "qchart_p.h"
             #include "qchartaxis.h"
-            #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "qseries_p.h"
             #include "qareaseries.h"
             #include "axis_p.h"
             #include "areachartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
-                m_chart(chart),
+            m_chart(chart),
-                m_animator(0),
+            m_animator(0),
-                m_dataset(dataset),
+            m_dataset(dataset),
-                m_chartTheme(0),
+            m_chartTheme(0),
-                m_chartRect(QRectF(QPoint(0,0),m_chart->size())),
+            m_chartRect(QRectF(QPoint(0,0),m_chart->size())),
-                m_options(QChart::NoAnimation),
+            m_options(QChart::NoAnimation),
-                m_minLeftMargin(0),
+            m_minLeftMargin(0),
-                m_minBottomMargin(0),
+            m_minBottomMargin(0),
-                m_backgroundItem(0),
+            m_backgroundItem(0),
-                m_titleItem(0),
+            m_titleItem(0),
-                m_marginBig(60),
+            m_marginBig(60),
-                m_marginSmall(20),
+            m_marginSmall(20),
-                m_marginTiny(10),
+            m_marginTiny(10),
-                m_chartMargins(QRect(m_marginBig,m_marginBig,0,0))
+            m_chartMargins(QRect(m_marginBig,m_marginBig,0,0))
             {
             }
             ChartPresenter::~ChartPresenter()
             {
-            	delete m_chartTheme;
+                delete m_chartTheme;
             }
             void ChartPresenter::setGeometry(const QRectF& rect)
             {
                 m_rect = rect;
                 Q_ASSERT(m_rect.isValid());
                 updateLayout();
             }
             void ChartPresenter::setMinimumMarginWidth(Axis* axis, qreal width)
             {
                 switch(axis->axisType()){
-                    case Axis::X_AXIS:
+                case Axis::X_AXIS:
+                {
-                        if(width>m_chartRect.width()+ m_chartMargins.left()) {
+                    if(width>m_chartRect.width()+ m_chartMargins.left()) {
-                            m_minLeftMargin= width - m_chartRect.width();
+                        m_minLeftMargin= width - m_chartRect.width();
-                            updateLayout();
+                        updateLayout();
-                        break;
                     }
-                    case Axis::Y_AXIS:
+                    break;
+                }
+                case Axis::Y_AXIS:
+                {
-                        if(m_minLeftMargin!=width){
+                    if(m_minLeftMargin!=width){
-                            m_minLeftMargin= width;
+                        m_minLeftMargin= width;
-                            updateLayout();
+                        updateLayout();
-                        break;
                     }
+                    break;
+                }
                 }
             }
             void ChartPresenter::setMinimumMarginHeight(Axis* axis, qreal height)
             {
                 switch(axis->axisType()){
-                    case Axis::X_AXIS:
+                case Axis::X_AXIS:
+                {
-                        if(m_minBottomMargin!=height) {
+                    if(m_minBottomMargin!=height) {
-                            m_minBottomMargin= height;
+                        m_minBottomMargin= height;
-                            updateLayout();
+                        updateLayout();
-                        break;
                     }
-                    case Axis::Y_AXIS:
+                    break;
+                }
+                case Axis::Y_AXIS:
+                {
-                        if(height>m_chartMargins.bottom()+m_chartRect.height()){
+                    if(height>m_chartMargins.bottom()+m_chartRect.height()){
-                            m_minBottomMargin= height - m_chartRect.height();
+                        m_minBottomMargin= height - m_chartRect.height();
-                           updateLayout();
+                        updateLayout();
-                        break;
                     }
+                    break;
+                }
                 }
             }
             void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
             {
                 Axis* item = new Axis(axis,this,axis==m_dataset->axisX()?Axis::X_AXIS : Axis::Y_AXIS);
                 if(m_options.testFlag(QChart::GridAxisAnimations)){
                     m_animator->addAnimation(item);
                 }
                 if(axis==m_dataset->axisX()){
                     m_chartTheme->decorate(axis,true);
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minX(),domain->maxX(),domain->tickXCount());
                 }
                 else{
                     m_chartTheme->decorate(axis,false);
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount());
                 }
                 QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
                 //initialize
                 item->handleGeometryChanged(m_chartRect);
                 m_axisItems.insert(axis, item);
             }
             void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
             {
                 Axis* item = m_axisItems.take(axis);
                 Q_ASSERT(item);
                 if(m_animator) m_animator->removeAnimation(item);
                 delete item;
             }
             void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
             {
-            	Chart *item = series->d_ptr->createGraphics(this);
+                Chart *item = series->d_ptr->createGraphics(this);
-            	Q_ASSERT(item);
+                Q_ASSERT(item);
-            	QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
+                QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
-            	QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
+                QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
-            	  //initialize
+                //initialize
-            	item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
+                item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
-            	if(m_chartRect.isValid()) item->handleGeometryChanged(m_chartRect);
+                if(m_chartRect.isValid()) item->handleGeometryChanged(m_chartRect);
-            	m_chartItems.insert(series,item);
+                m_chartItems.insert(series,item);
             }
             void ChartPresenter::handleSeriesRemoved(QSeries* series)
             {
                 Chart* item = m_chartItems.take(series);
                 Q_ASSERT(item);
                 if(m_animator) {
                     //small hack to handle area animations
                     if(series->type()==QSeries::SeriesTypeArea){
-                         QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
+                        QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
-                         AreaChartItem* area = static_cast<AreaChartItem*>(item);
+                        AreaChartItem* area = static_cast<AreaChartItem*>(item);
-                         m_animator->removeAnimation(area->upperLineItem());
+                        m_animator->removeAnimation(area->upperLineItem());
-                         if(areaSeries->lowerSeries())  m_animator->removeAnimation(area->lowerLineItem());
+                        if(areaSeries->lowerSeries())  m_animator->removeAnimation(area->lowerLineItem());
                     }else
-                    m_animator->removeAnimation(item);
+                        m_animator->removeAnimation(item);
                 }
                 delete item;
             }
             void ChartPresenter::setTheme(QChart::ChartTheme theme,bool force)
             {
-            	if(m_chartTheme && m_chartTheme->id() == theme) return;
+                if(m_chartTheme && m_chartTheme->id() == theme) return;
                 delete m_chartTheme;
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->setForced(force);
                 m_chartTheme->decorate(m_chart);
                 m_chartTheme->decorate(m_chart->legend());
                 resetAllElements();
             }
             QChart::ChartTheme ChartPresenter::theme()
             {
                 return m_chartTheme->id();
             }
             void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
             {
                 if(m_options!=options) {
                     m_options=options;
                     if(m_options!=QChart::NoAnimation && !m_animator) {
                         m_animator= new ChartAnimator(this);
                     }
                     resetAllElements();
                 }
             }
             void ChartPresenter::resetAllElements()
             {
-                 QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
+                QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
-                 QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
+                QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
-                 foreach(QChartAxis* axis, axisList) {
+                foreach(QChartAxis* axis, axisList) {
-                     handleAxisRemoved(axis);
+                    handleAxisRemoved(axis);
-                     handleAxisAdded(axis,m_dataset->domain(axis));
+                    handleAxisAdded(axis,m_dataset->domain(axis));
+                }
-                 foreach(QSeries* series, seriesList) {
+                foreach(QSeries* series, seriesList) {
-                     handleSeriesRemoved(series);
+                    handleSeriesRemoved(series);
-                     handleSeriesAdded(series,m_dataset->domain(series));
+                    handleSeriesAdded(series,m_dataset->domain(series));
+                }
             }
             void ChartPresenter::zoomIn()
             {
-            	QRectF rect = chartGeometry();
+                QRectF rect = chartGeometry();
-            	rect.setWidth(rect.width()/2);
+                rect.setWidth(rect.width()/2);
-            	rect.setHeight(rect.height()/2);
+                rect.setHeight(rect.height()/2);
-            	rect.moveCenter(chartGeometry().center());
+                rect.moveCenter(chartGeometry().center());
-            	zoomIn(rect);
+                zoomIn(rect);
             }
             void ChartPresenter::zoomIn(const QRectF& rect)
             {
-            	QRectF r = rect.normalized();
+                QRectF r = rect.normalized();
                 r.translate(-m_chartMargins.topLeft());
-            	if(m_animator) {
+                if(m_animator) {
-            		QPointF point(r.center().x()/chartGeometry().width(),r.center().y()/chartGeometry().height());
+                    QPointF point(r.center().x()/chartGeometry().width(),r.center().y()/chartGeometry().height());
-            		m_animator->setState(ChartAnimator::ZoomInState,point);
+                    m_animator->setState(ChartAnimator::ZoomInState,point);
+                }
-            	m_dataset->zoomInDomain(r,chartGeometry().size());
+                m_dataset->zoomInDomain(r,chartGeometry().size());
-            	if(m_animator) {
+                if(m_animator) {
-            		m_animator->setState(ChartAnimator::ShowState);
+                    m_animator->setState(ChartAnimator::ShowState);
+                }
             }
             void ChartPresenter::zoomOut()
             {
-            	if(m_animator)
+                if(m_animator)
+                {
-            		m_animator->setState(ChartAnimator::ZoomOutState);
+                    m_animator->setState(ChartAnimator::ZoomOutState);
+                }
-            	QSizeF size = chartGeometry().size();
+                QSizeF size = chartGeometry().size();
-            	QRectF rect = chartGeometry();
+                QRectF rect = chartGeometry();
                 rect.translate(-m_chartMargins.topLeft());
                 m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);
                 //m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
-            	if(m_animator){
+                if(m_animator){
-            			m_animator->setState(ChartAnimator::ShowState);
+                    m_animator->setState(ChartAnimator::ShowState);
+                }
             }
             void ChartPresenter::scroll(int dx,int dy)
             {
-            	if(m_animator){
+                if(m_animator){
-            		if(dx<0) m_animator->setState(ChartAnimator::ScrollLeftState,QPointF());
+                    if(dx<0) m_animator->setState(ChartAnimator::ScrollLeftState,QPointF());
-            		if(dx>0) m_animator->setState(ChartAnimator::ScrollRightState,QPointF());
+                    if(dx>0) m_animator->setState(ChartAnimator::ScrollRightState,QPointF());
-            		if(dy<0) m_animator->setState(ChartAnimator::ScrollUpState,QPointF());
+                    if(dy<0) m_animator->setState(ChartAnimator::ScrollUpState,QPointF());
-            		if(dy>0) m_animator->setState(ChartAnimator::ScrollDownState,QPointF());
+                    if(dy>0) m_animator->setState(ChartAnimator::ScrollDownState,QPointF());
+                }
-            	m_dataset->scrollDomain(dx,dy,chartGeometry().size());
+                m_dataset->scrollDomain(dx,dy,chartGeometry().size());
                 if(m_animator){
-            		m_animator->setState(ChartAnimator::ShowState);
+                    m_animator->setState(ChartAnimator::ShowState);
+                }
             }
             QChart::AnimationOptions ChartPresenter::animationOptions() const
             {
                 return m_options;
             }
             void ChartPresenter::updateLayout()
             {
                 if (!m_rect.isValid()) return;
                 // recalculate title size
                 QSize titleSize;
                 int titlePadding=0;
                 if (m_titleItem) {
                     titleSize= m_titleItem->boundingRect().size().toSize();
                 }
                 //defaults
                 m_chartMargins = QRect(QPoint(m_minLeftMargin>m_marginBig?m_minLeftMargin:m_marginBig,m_marginBig),QPoint(m_marginBig,m_minBottomMargin>m_marginBig?m_minBottomMargin:m_marginBig));
                 titlePadding = m_chartMargins.top()/2;
                 QLegend* legend = m_chart->d_ptr->m_legend;
                 // recalculate legend position
                 if (legend->isAttachedToChart() && legend->isEnabled()) {
                     QRect legendRect;
                     // Reserve some space for legend
                     switch (legend->alignment()) {
-                        case QLegend::AlignmentTop: {
+                    case QLegend::AlignmentTop: {
-                            int ledgendSize = legend->minHeight();
+                        int ledgendSize = legend->minHeight();
-                            int topPadding = 2*m_marginTiny + titleSize.height() + ledgendSize + m_marginTiny;
+                        int topPadding = 2*m_marginTiny + titleSize.height() + ledgendSize + m_marginTiny;
-                            m_chartMargins = QRect(QPoint(m_chartMargins.left(),topPadding),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
+                        m_chartMargins = QRect(QPoint(m_chartMargins.left(),topPadding),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
-                            m_legendMargins = QRect(QPoint(m_chartMargins.left(),topPadding - (ledgendSize + m_marginTiny)),QPoint(m_chartMargins.right(),m_rect.height()-topPadding + m_marginTiny));
+                        m_legendMargins = QRect(QPoint(m_chartMargins.left(),topPadding - (ledgendSize + m_marginTiny)),QPoint(m_chartMargins.right(),m_rect.height()-topPadding + m_marginTiny));
-                            titlePadding = m_marginTiny + m_marginTiny;
+                        titlePadding = m_marginTiny + m_marginTiny;
-                            break;
+                        break;
+                    }
-                        case QLegend::AlignmentBottom: {
+                    case QLegend::AlignmentBottom: {
-                            int ledgendSize = legend->minHeight();
+                        int ledgendSize = legend->minHeight();
-                            int bottomPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minBottomMargin;
+                        int bottomPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minBottomMargin;
-                            m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(m_chartMargins.right(),bottomPadding));
+                        m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(m_chartMargins.right(),bottomPadding));
-                            m_legendMargins = QRect(QPoint(m_chartMargins.left(),m_rect.height()-bottomPadding + m_marginTiny + m_minBottomMargin),QPoint(m_chartMargins.right(),m_marginTiny + m_marginSmall));
+                        m_legendMargins = QRect(QPoint(m_chartMargins.left(),m_rect.height()-bottomPadding + m_marginTiny + m_minBottomMargin),QPoint(m_chartMargins.right(),m_marginTiny + m_marginSmall));
-                            titlePadding = m_chartMargins.top()/2;
+                        titlePadding = m_chartMargins.top()/2;
-                            break;
+                        break;
+                    }
-                        case QLegend::AlignmentLeft: {
+                    case QLegend::AlignmentLeft: {
-                            int ledgendSize = legend->minWidth();
+                        int ledgendSize = legend->minWidth();
-                            int leftPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minLeftMargin;
+                        int leftPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minLeftMargin;
-                            m_chartMargins = QRect(QPoint(leftPadding,m_chartMargins.top()),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
+                        m_chartMargins = QRect(QPoint(leftPadding,m_chartMargins.top()),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
-                            m_legendMargins = QRect(QPoint(m_marginTiny + m_marginSmall,m_chartMargins.top()),QPoint(m_rect.width()-leftPadding + m_marginTiny + m_minLeftMargin,m_chartMargins.bottom()));
+                        m_legendMargins = QRect(QPoint(m_marginTiny + m_marginSmall,m_chartMargins.top()),QPoint(m_rect.width()-leftPadding + m_marginTiny + m_minLeftMargin,m_chartMargins.bottom()));
-                            titlePadding = m_chartMargins.top()/2;
+                        titlePadding = m_chartMargins.top()/2;
-                            break;
+                        break;
+                    }
-                        case QLegend::AlignmentRight: {
+                    case QLegend::AlignmentRight: {
-                            int ledgendSize = legend->minWidth();
+                        int ledgendSize = legend->minWidth();
-                            int rightPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny;
+                        int rightPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny;
-                            m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(rightPadding,m_chartMargins.bottom()));
+                        m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(rightPadding,m_chartMargins.bottom()));
-                            m_legendMargins = QRect(QPoint(m_rect.width()- rightPadding+ m_marginTiny ,m_chartMargins.top()),QPoint(m_marginTiny + m_marginSmall,m_chartMargins.bottom()));
+                        m_legendMargins = QRect(QPoint(m_rect.width()- rightPadding+ m_marginTiny ,m_chartMargins.top()),QPoint(m_marginTiny + m_marginSmall,m_chartMargins.bottom()));
-                            titlePadding = m_chartMargins.top()/2;
+                        titlePadding = m_chartMargins.top()/2;
-                            break;
+                        break;
+                    }
-                        default: {
+                    default: {
-                            break;
+                        break;
+                    }
                     }
                 }
                 if(m_rect.width()<2*(m_chartMargins.top()+m_chartMargins.bottom()) || m_rect.height()< 2*(m_chartMargins.top() + m_chartMargins.bottom()))
                 {
                     m_chart->setMinimumSize(2*(m_chartMargins.top()+m_chartMargins.bottom()),2*(m_chartMargins.top() + m_chartMargins.bottom()));
                     return;
                 }
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),titlePadding);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(m_rect.adjusted(m_marginTiny,m_marginTiny, -m_marginTiny, -m_marginTiny));
                 }
                 QRectF chartRect = m_rect.adjusted(m_chartMargins.left(),m_chartMargins.top(),-m_chartMargins.right(),-m_chartMargins.bottom());
                 legend->setGeometry(m_rect.adjusted(m_legendMargins.left(),m_legendMargins.top(),-m_legendMargins.right(),-m_legendMargins.bottom()));
-               if(m_chartRect!=chartRect){
+                if(m_chartRect!=chartRect){
-                   m_chartRect=chartRect;
+                    m_chartRect=chartRect;
-                   emit geometryChanged(m_chartRect);
+                    emit geometryChanged(m_chartRect);
+                }
             }
             void ChartPresenter::createChartBackgroundItem()
             {
                 if (!m_backgroundItem) {
                     m_backgroundItem = new ChartBackground(rootItem());
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void ChartPresenter::createChartTitleItem()
             {
                 if (!m_titleItem) {
                     m_titleItem = new QGraphicsSimpleTextItem(rootItem());
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             #include "moc_chartpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartpresenter_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTPRESENTER_H_
+            #ifndef CHARTPRESENTER_H
-            #define CHARTPRESENTER_H_
+            #define CHARTPRESENTER_H
             #include "qchartglobal.h"
             #include "chartbackground_p.h" //TODO fix me
             #include "qchart.h" //becouse of QChart::ChartThemeId //TODO
             #include "qchartaxis.h"
             #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Chart;
             class QSeries;
             class ChartDataSet;
             class Domain;
             class Axis;
             class ChartTheme;
             class ChartAnimator;
             class ChartPresenter: public QObject
             {
                 Q_OBJECT
             public:
                 enum ZValues {
                     BackgroundZValue = -1,
                     ShadesZValue,
                     GridZValue,
                     LineChartZValue,
                     BarSeriesZValue,
                     ScatterSeriesZValue,
                     PieSeriesZValue,
                     AxisZValue,
                     LegendZValue
                 };
                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();
                 ChartAnimator* animator() const { return m_animator; }
                 ChartTheme *chartTheme() const { return m_chartTheme; }
                 ChartDataSet *dataSet() const { return m_dataset; }
                 QGraphicsItem* rootItem() const { return m_chart; }
                 void setTheme(QChart::ChartTheme theme,bool force = true);
                 QChart::ChartTheme theme();
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
                 void scroll(int dx,int dy);
                 void setGeometry(const QRectF& rect);
                 QRectF chartGeometry() const { return m_chartRect; }
                 void setMinimumMarginHeight(Axis* axis, qreal height);
                 void setMinimumMarginWidth(Axis* axis, qreal width);
                 qreal minimumLeftMargin() const { return m_minLeftMargin; }
                 qreal minimumBottomMargin() const { return m_minBottomMargin; }
             public: //TODO: fix me
                 void resetAllElements();
                 void createChartBackgroundItem();
                 void createChartTitleItem();
                 QRectF margins() const { return m_chartMargins;}
             public Q_SLOTS:
                 void handleSeriesAdded(QSeries* series,Domain* domain);
                 void handleSeriesRemoved(QSeries* series);
                 void handleAxisAdded(QChartAxis* axis,Domain* domain);
                 void handleAxisRemoved(QChartAxis* axis);
                 void updateLayout();
             Q_SIGNALS:
                 void geometryChanged(const QRectF& rect);
             private:
                 QChart* m_chart;
                 ChartAnimator* m_animator;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
                 QMap<QSeries*,Chart*> m_chartItems;
                 QMap<QChartAxis*,Axis*> m_axisItems;
                 QRectF m_rect;
                 QRectF m_chartRect;
                 QChart::AnimationOptions m_options;
                 qreal m_minLeftMargin;
                 qreal m_minBottomMargin;
             public: //TODO: fixme
                 ChartBackground* m_backgroundItem;
                 QGraphicsSimpleTextItem* m_titleItem;
                 int m_marginBig;
                 int m_marginSmall;
                 int m_marginTiny;
                 QRectF m_chartMargins;
                 QRectF m_legendMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTPRESENTER_H_ */

src/domain_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef DOMAIN_H_
+            #ifndef DOMAIN_H
-            #define DOMAIN_H_
+            #define DOMAIN_H
             #include "qchartglobal.h"
             #include <QRectF>
             #include <QSizeF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain: public QObject {
                 Q_OBJECT
             public:
                 explicit Domain(QObject* object=0);
                 virtual ~Domain();
                 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY, int tickXCount, int tickYCount);
                 void setRangeX(qreal min, qreal max);
                 void setRangeX(qreal min, qreal max, int tickCount);
                 void setRangeY(qreal min, qreal max);
                 void setRangeY(qreal min, qreal max, int tickCount);
                 void setMinX(qreal min);
                 void setMaxX(qreal max);
                 void setMinY(qreal min);
                 void setMaxY(qreal max);
                 qreal minX() const { return m_minX; }
                 qreal maxX() const { return m_maxX; }
                 qreal minY() const { return m_minY; }
                 qreal maxY() const { return m_maxY; }
                 qreal spanX() const;
                 qreal spanY() const;
                 bool isEmpty() const;
                 int tickXCount() const {return m_tickXCount;}
                 int tickYCount() const {return m_tickYCount;}
                 friend bool operator== (const Domain &domain1, const Domain &domain2);
                 friend bool operator!= (const Domain &domain1, const Domain &domain2);
                 friend QDebug operator<<(QDebug dbg, const Domain &domain);
                 void zoomIn(const QRectF& rect, const QSizeF& size);
                 void zoomOut(const QRectF& rect, const QSizeF& size);
                 void move(int dx,int dy,const QSizeF& size);
             Q_SIGNALS:
                 void domainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void rangeXChanged(qreal min, qreal max, int tickXCount);
                 void rangeYChanged(qreal min, qreal max, int tickYCount);
             public Q_SLOTS:
                 void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,bool niceNumbers = false);
                 void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,bool niceNumbers = false);
             private:
                 void looseNiceNumbers(qreal &min, qreal &max, int &ticksCount);
                 qreal niceNumber(qreal x,bool celing);
             private:
                 qreal m_minX;
                 qreal m_maxX;
                 qreal m_minY;
                 qreal m_maxY;
                 int m_tickXCount;
                 int m_tickYCount;
                 bool m_niceNumbers;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/legend/legendscroller_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 LEGENDSCROLLER_P_H_
+            #ifndef LEGENDSCROLLER_P_H
-            #define LEGENDSCROLLER_P_H_
+            #define LEGENDSCROLLER_P_H
             #include "qlegend.h"
             #include "scroller_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class LegendScroller: public QLegend, public Scroller
             {
             public:
                 LegendScroller(QChart *chart):QLegend(chart)
                 {
                 }
                 void setOffset(const QPointF& point)
                 {
                     QLegend::setOffset(point);
                 }
                 QPointF offset() const
                 {
                     return QLegend::offset();
                 }
                 void mousePressEvent(QGraphicsSceneMouseEvent* event){
                     Scroller::mousePressEvent(event);
                     //QLegend::mousePressEvent(event);
                 }
                 void mouseMoveEvent(QGraphicsSceneMouseEvent* event){
                     Scroller::mouseMoveEvent(event);
                     //QLegend::mouseMoveEvent(event);
                 }
                 void mouseReleaseEvent(QGraphicsSceneMouseEvent* event){
                     Scroller::mouseReleaseEvent(event);
                     //QLegend::mouseReleaseEvent(event);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/legend/qlegend_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QLEGEND_P_H_
+            #ifndef QLEGEND_P_H
-            #define QLEGEND_P_H_
+            #define QLEGEND_P_H
             #include "qlegend.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartPresenter;
             class QLegendPrivate : public QObject
             {
                 Q_OBJECT
             public:
                 QLegendPrivate(ChartPresenter *chart,QLegend *q);
                 ~QLegendPrivate();
                 void setOffset(qreal x, qreal y);
                 void updateLayout();
             public Q_SLOTS:
                 void handleSeriesAdded(QSeries *series, Domain *domain);
                 void handleSeriesRemoved(QSeries *series);
                 void handleUpdateSeries(); //TODO remove this function
             private:
                 QLegend *q_ptr;
                 ChartPresenter *m_presenter;
                 QGraphicsItemGroup* m_markers;
                 QLegend::Alignments m_alignment;
                 QBrush m_brush;
                 QPen m_pen;
                 QRectF m_rect;
                 qreal m_offsetX;
                 qreal m_offsetY;
                 qreal m_minWidth;
                 qreal m_minHeight;
                 qreal m_width;
                 qreal m_height;
                 bool m_attachedToChart;
                 bool m_backgroundVisible;
             friend class QLegend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/linechart/qlineseries.h +5 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef QLINESERIES_H_
+            #ifndef QLINESERIES_H
-            #define QLINESERIES_H_
+            #define QLINESERIES_H
             #include <qchartglobal.h>
             #include <qxyseries.h>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLineSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QLineSeries : public QXYSeries
             {
             public:
                 explicit QLineSeries(QObject *parent=0);
-            	~QLineSeries();
+                ~QLineSeries();
-            	QSeries::QSeriesType type() const;
+                QSeries::QSeriesType type() const;
             protected:
-            	QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0);
+                QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0);
             private:
                 Q_DECLARE_PRIVATE(QLineSeries);
                 Q_DISABLE_COPY(QLineSeries);
                 friend class LineChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/linechart/qlineseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QLINESERIES_P_H_
+            #ifndef QLINESERIES_P_H
-            #define QLINESERIES_P_H_
+            #define QLINESERIES_P_H
             #include "qxyseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLineSeriesPrivate: public QXYSeriesPrivate
             {
             public:
                 QLineSeriesPrivate(QLineSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
             private:
                 Q_DECLARE_PUBLIC(QLineSeries);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartview.cpp +218 -219

@@ -1,219 +1,218
1	/****************************************************************************	1	/****************************************************************************
2	**	2	**
3	** Copyright (C) 2012 Digia Plc	3	** Copyright (C) 2012 Digia Plc
4	** All rights reserved.	4	** All rights reserved.
5	** For any questions to Digia, please use contact form at http://qt.digia.com	5	** For any questions to Digia, please use contact form at http://qt.digia.com
6	**	6	**
7	** This file is part of the Qt Commercial Charts Add-on.	7	** This file is part of the Qt Commercial Charts Add-on.
8	**	8	**
9	** $QT_BEGIN_LICENSE$	9	** $QT_BEGIN_LICENSE$
10	** Licensees holding valid Qt Commercial licenses may use this file in	10	** Licensees holding valid Qt Commercial licenses may use this file in
11	** accordance with the Qt Commercial License Agreement provided with the	11	** accordance with the Qt Commercial License Agreement provided with the
12	** Software or, alternatively, in accordance with the terms contained in	12	** Software or, alternatively, in accordance with the terms contained in
13	** a written agreement between you and Digia.	13	** a written agreement between you and Digia.
14	**	14	**
15	** If you have questions regarding the use of this file, please use	15	** If you have questions regarding the use of this file, please use
16	** contact form at http://qt.digia.com	16	** contact form at http://qt.digia.com
17	** $QT_END_LICENSE$	17	** $QT_END_LICENSE$
18	**	18	**
19	****************************************************************************/	19	****************************************************************************/
20		20
21	#include "qchartview.h"	21	#include "qchartview.h"
22	#include "qchart_p.h"	22	#include "qchartview_p.h"
23	#include "qchart~~view~~_p.h"	23	#include "qchart_p.h"
24	#include <QGraphicsScene>	24	#include <QGraphicsScene>
25	#include <QRubberBand>	25	#include <QRubberBand>
26		26
27		27	/*!
28	/*!	28	\enum QChartView::RubberBand
29	\enum QChartView::RubberBand	29
30		30	This enum describes the different types of rubber bands that can be used for zoom rect selection
31	This enum describes the different types of rubber bands that can be used for zoom rect selection	31
32		32	\value NoRubberBand
33	\value NoRubberBand	33	\value VerticalRubberBand
34	\value ~~Vertic~~alRubberBand	34	\value HorizonalRubberBand
35	\value ~~Horizonal~~RubberBand	35	\value RectangleRubberBand
36	\value RectangleRubberBand	36	*/
37	*/	37
38		38	/*!
39	/*!	39	\class QChartView
40	\class QChartView	40	\brief Standalone charting widget.
41	\brief Standalone charting widget.	41
42		42	QChartView is a standalone widget that can display charts. It does not require separate
43	QChartView is a standalone widget that can display charts. It does not require separate	43	QGraphicsScene to work. It manages the graphical representation of different types of
44	QGraphicsScene to work. It manages the graphical representation of different types of	44	QChartSeries and other chart related objects like QChartAxis and QChartLegend. If you want to
45	QChartSeries and other chart related objects like QChartAxis and QChartLegend. If you want to	45	display a chart in your existing QGraphicsScene, you can use the QChart class instead.
46	display a chart in your existing QGraphicsScene, you can use the QChart class instead.	46
47		47	\sa QChart
48	\sa QChart	48	*/
49	*/	49
50		50	QTCOMMERCIALCHART_BEGIN_NAMESPACE
51	QTCOMMERCIALCHART_BEGIN_NAMESPACE	51
52		52	/*!
53	/*!	53	Constructs a chartView object which is a child of a\a parent.
54	Constructs a chartView object which is a child of a\a parent.	54	*/
55	*/	55	QChartView::QChartView(QChart chart,QWidget parent) :
56	QChartView::QChartView(QChart chart,QWidget parent) :	56	QGraphicsView(parent),
57	QGraphicsView(parent),	57	d_ptr(new QChartViewPrivate())
58	d_ptr(new QChartViewPrivate())	58	{
59	{	59	Q_ASSERT(chart);
60	Q_ASSERT(chart);	60	d_ptr->m_scene = new QGraphicsScene(this);
61	d_ptr->m_scene = new QGraphicsScene(this);	61	d_ptr->m_chart = chart;
62	d_ptr->m_chart = chart;	62	setFrameShape(QFrame::NoFrame);
63	setFrameShape(QFrame::NoFrame);	63	setBackgroundRole(QPalette::Window);
64	setBackgroundRole(QPalette::Window);	64	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
65	set~~Horizont~~alScrollBarPolicy(Qt::ScrollBarAlwaysOff);	65	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
66	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);	66	setScene(d_ptr->m_scene);
67	~~setScene~~(d_ptr->m_scene);	67	d_ptr->m_scene->addItem(chart);
68	d_ptr->m_scene->addItem(chart);	68	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
69	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);	69	}
70	}	70
71		71
72		72	/*!
73	/*!	73	Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
74	Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.	74	*/
75	*/	75	QChartView::~QChartView()
76	QChartView::~QChartView()	76	{
77	{	77	}
78	}	78
79		79	/*!
80	/*!	80	Returns the pointer to the associated chart
81	Returns the pointer to the associated chart	81	*/
82	*/	82	QChart* QChartView::chart() const
83	QChart* QChartView::chart() const	83	{
84	{	84	return d_ptr->m_chart;
85	return d_ptr->m_chart;	85	}
86	}	86
87		87	/*!
88	/*!	88	Sets the RubberBandPlicy to \a rubberBand. Selected policy determines the way zooming is performed.
89	Sets the RubberBandPlicy to \a rubberBand. Selected policy determines the way zooming is performed.	89	*/
90	*/	90	void QChartView::setRubberBand(const RubberBands& rubberBand)
91	void QChartView::setRubberBand(const RubberBands& rubberBand)	91	{
92	{	92	d_ptr->m_rubberBandFlags=rubberBand;
93	d_ptr->m_rubberBandFlags=rubberBand;	93
94		94	if (!d_ptr->m_rubberBandFlags) {
95	if (!d_ptr->m_rubberBand~~Flags~~) {	95	delete d_ptr->m_rubberBand;
96	~~delete~~ d_ptr->m_rubberBand;	96	d_ptr->m_rubberBand=0;
97	d_ptr->m_rubberBand=0;	97	return;
98	return;	98	}
99	}	99
100		100	if (!d_ptr->m_rubberBand) {
101	if (!d_ptr->m_rubberBand) {	101	d_ptr->m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
102	d_ptr->m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);	102	d_ptr->m_rubberBand->setEnabled(true);
103	d_ptr->m_rubberBand->setEnabled(true);	103	}
104	}	104	}
105	}	105
106		106	/*!
107	/*!	107	Returns the RubberBandPolicy that is currently being used by the widget.
108	Returns the RubberBandPolicy that is currently being used by the widget.	108	*/
109	*/	109	QChartView::RubberBands QChartView::rubberBand() const
110	QChartView::RubberBands QChartView::rubberBand() const	110	{
111	{	111	return d_ptr->m_rubberBandFlags;
112	return d_ptr->m_rubberBandFlags;	112	}
113	}	113
114		114	/*!
115	/*!	115	If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.
116	If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.	116	If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is passed to QGraphicsView::mousePressEvent() implementation.
117	If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is passed to QGraphicsView::mousePressEvent() implementation.	117	*/
118	*/	118	void QChartView::mousePressEvent(QMouseEvent *event)
119	void QChartView::mousePressEvent(QMouseEvent *event)	119	{
120	{	120	if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
121	if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {	121
122		122	int padding = d_ptr->m_chart->margins().top();
123	int padding = d_ptr->m_chart->margins().top();	123	QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
124	QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);	124
125		125	if (rect.contains(event->pos())) {
126	if (rect.contains(event->pos())) {	126	d_ptr->m_rubberBandOrigin = event->pos();
127	d_ptr->m_rubberBandOrigin = event->pos();	127	d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin, QSize()));
128	d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin, QSize()));	128	d_ptr->m_rubberBand->show();
129	d_ptr->m_rubberBand->show();	129	event->accept();
130	event->accept();	130	}
131	}	131	}
132	}	132	else {
133	else {	133	QGraphicsView::mousePressEvent(event);
134	QGraphicsView::mousePressEvent(event);	134	}
135	}	135	}
136	}	136
137		137	/*!
138	/*!	138	If RubberBand rectange specification has been initiated in pressEvent then \a event data is used to update RubberBand geometry.
139	If RubberBand rectange specification has been initiated in pressEvent then \a event data is used to update RubberBand geometry.	139	In other case the defualt QGraphicsView::mouseMoveEvent implementation is called.
140	In other case the defualt QGraphicsView::mouseMoveEvent implementation is called.	140	*/
141	*/	141	void QChartView::mouseMoveEvent(QMouseEvent *event)
142	void QChartView::mouseMoveEvent(QMouseEvent *event)	142	{
143	{	143	if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isVisible()) {
144	if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isVisible()) {	144	QRectF margins = d_ptr->m_chart->margins();
145	QRectF ~~margins~~ = d_ptr->m_chart->~~margins~~();	145	QRectF geometry = d_ptr->m_chart->geometry();
146	QRectF geometry = d_ptr->m_chart->geometry();	146	QRectF rect =geometry.adjusted(margins.left(),margins.top(),-margins.right(),-margins.bottom());
147	QRectF rect =geometry.adjusted(margins.left(),margins.top(),-margins.right(),-margins.bottom());	147	int width = event->pos().x() - d_ptr->m_rubberBandOrigin.x();
148	int ~~width~~ = event->pos().x() - d_ptr->m_rubberBandOrigin.x();	148	int height = event->pos().y() - d_ptr->m_rubberBandOrigin.y();
149	int height = event->pos().y() - d_ptr->m_rubberBandOrigin.y();	149	if (!d_ptr->m_rubberBandFlags.testFlag(VerticalRubberBand)) {
150	if (!d_ptr->m_rubberBandFlags.testFlag(VerticalRubberBand)) {	150	d_ptr->m_rubberBandOrigin.setY(rect.top());
151	d_ptr->m_rubberBandOrigin.setY(rect.top());	151	height = rect.height();
152	height = rect.height();	152	}
153	}	153	if (!d_ptr->m_rubberBandFlags.testFlag(HorizonalRubberBand)) {
154	if (!d_ptr->m_rubberBandFlags.testFlag(HorizonalRubberBand)) {	154	d_ptr->m_rubberBandOrigin.setX(rect.left());
155	d_ptr->m_rubberBandOrigin.setX(rect.left());	155	width= rect.width();
156	width= rect.width();	156	}
157	}	157	d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin.x(),d_ptr->m_rubberBandOrigin.y(), width,height).normalized());
158	d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin.x(),d_ptr->m_rubberBandOrigin.y(), width,height).normalized());	158	}
159	}	159	else {
160	else {	160	QGraphicsView::mouseMoveEvent(event);
161	QGraphicsView::mouseMoveEvent(event);	161	}
162	}	162	}
163	}	163
164		164	/*!
165	/*!	165	If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand
166	If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand	166	If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.
167	If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.	167	*/
168	*/	168	void QChartView::mouseReleaseEvent(QMouseEvent *event)
169	void QChartView::mouseReleaseEvent(QMouseEvent *event)	169	{
170	{	170	if(d_ptr->m_rubberBand) {
171	if(d_ptr->m_rubberBand) {	171	if (event->button() == Qt::LeftButton && d_ptr->m_rubberBand->isVisible()) {
172	if (event->button() == Qt::LeftButton && d_ptr->m_rubberBand->isVisible()) {	172	d_ptr->m_rubberBand->hide();
173	d_ptr->m_rubberBand->~~hide~~();	173	QRect rect = d_ptr->m_rubberBand->geometry();
174	~~QRect~~ ~~rect~~ = d_ptr->m_~~rubberBand~~->~~geometry~~();	174	d_ptr->m_chart->zoomIn(rect);
175	d_ptr->m_chart->zoomIn(rect);	175	event->accept();
176	event->accept();	176	}
177	}	177
178		178	if(event->button()==Qt::RightButton){
179	if(event->button()==Qt::RightButton){	179	d_ptr->m_chart->zoomOut();
180	d_ptr->m_chart->zoomOut();	180	event->accept();
181	event->accept();	181	}
182	}	182	}
183	}	183	else {
184	else {	184	QGraphicsView::mouseReleaseEvent(event);
185	QGraphicsView::mouseReleaseEvent(event);	185	}
186	}	186	}
187	}	187
188		188	/*!
189	/*!	189	Resizes and updates the chart area using the \a event data
190	Resizes and updates the chart area using the \a event data	190	*/
191	*/	191	void QChartView::resizeEvent(QResizeEvent *event)
192	void QChartView::resizeEvent(QResizeEvent *event)	192	{
193	{	193	QGraphicsView::resizeEvent(event);
194	QGraphicsView::resizeEvent(event);	194	d_ptr->m_chart->resize(size());
195	d_ptr->m_chart->~~res~~ize(size());	195	setMinimumSize(d_ptr->m_chart->minimumSize().toSize());
196	set~~MinimumSize~~(d_ptr->m_chart->~~minimumSize().toSize~~());	196	setSceneRect(d_ptr->m_chart->geometry());
197	setSceneRect(d_ptr->m_chart->geometry());	197	}
198	}	198
199		199	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
200	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	200
201		201	QChartViewPrivate::QChartViewPrivate():
202	QChartViewPrivate::QChartViewPrivate():	202	m_scene(0),
203	m_~~scene~~(0),	203	m_chart(0),
204	m_~~chart~~(0),	204	m_presenter(0),
205	m_presenter(0),	205	m_rubberBand(0),
206	m_rubberBand(0),	206	m_rubberBandFlags(QChartView::NoRubberBand)
207	m_rubberBandFlags(QChartView::NoRubberBand)	207	{
208	{	208
209		209	}
210	}	210
211		211	QChartViewPrivate::~QChartViewPrivate()
212	QChartViewPrivate::~QChartViewPrivate()	212	{
213	{	213
214		214	}
215	}	215
216		216	#include "moc_qchartview.cpp"
217	#include "moc_qchartview.cpp"	217
218		218	QTCOMMERCIALCHART_END_NAMESPACE
219	QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview_p.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QCHARTVIEW_P_H
             #define QCHARTVIEW_P_H
             #include "qchartview.h"
             class QGraphicsScene;
+            class ChartPresenter;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             struct QChartViewPrivate {
                 QChartViewPrivate();
                 ~QChartViewPrivate();
                 QGraphicsScene *m_scene;
                 QChart *m_chart;
                 ChartPresenter *m_presenter;
                 QPoint m_rubberBandOrigin;
                 QRubberBand *m_rubberBand;
                 QChartView::RubberBands m_rubberBandFlags;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QSERIES_P_H_
+            #ifndef QSERIES_P_H
-            #define QSERIES_P_H_
+            #define QSERIES_P_H
             #include "qseries.h"
             class QAbstractItemModel;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain;
             class ChartPresenter;
             class Chart;
             class LegendMarker;
             class QLegend;
             class QSeriesPrivate : public QObject
             {
             public:
                 QSeriesPrivate(QSeries *q);
                 ~QSeriesPrivate();
                 virtual void scaleDomain(Domain& domain) = 0;
                 virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
                 virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
             protected:
                 QSeries *q_ptr;
                 QAbstractItemModel *m_model;
                 QString m_name;
                 friend class QSeries;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/scatterseries/qscatterseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QSCATTERSERIES_P_H_
+            #ifndef QSCATTERSERIES_P_H
-            #define QSCATTERSERIES_P_H_
+            #define QSCATTERSERIES_P_H
             #include "qxyseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate: public QXYSeriesPrivate
             {
             public:
                 QScatterSeriesPrivate(QScatterSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
             private:
                 QScatterSeries::MarkerShape m_shape;
                 qreal m_size;
                 Q_DECLARE_PUBLIC(QScatterSeries);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/scatterseries/scatterchartitem_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef SCATTERPRESENTER_H
+            #ifndef SCATTERCHARTITEM_H
-            #define SCATTERPRESENTER_H
+            #define SCATTERCHARTITEM_H
             #include "qchartglobal.h"
             #include "xychartitem_p.h"
             #include <QGraphicsEllipseItem>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeries;
             class Marker;
             class ScatterChartItem : public XYChartItem
             {
                 Q_OBJECT
             public:
                 explicit ScatterChartItem(QScatterSeries *series, ChartPresenter *presenter);
             public:
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 void setPen(const QPen &pen);
                 void setBrush(const QBrush &brush);
                 void markerSelected(Marker *item);
             public Q_SLOTS:
                 void handleUpdated();
             private:
                 void createPoints(int count);
                 void deletePoints(int count);
             protected:
                 void setLayout(QVector<QPointF> &points);
             private:
                 QScatterSeries *m_series;
                 QGraphicsItemGroup m_items;
                 int m_shape;
                 int m_size;
                 QRectF m_rect;
             };
             class Marker: public QAbstractGraphicsShapeItem
             {
             public:
                Marker(QAbstractGraphicsShapeItem *item , ScatterChartItem *parent) : QAbstractGraphicsShapeItem(0) ,m_item(item), m_parent(parent), m_index(-1)
                {
                }
                ~Marker()
                {
                    delete m_item;
                }
                void setIndex(int index)
                {
                    m_index=index;
                }
                int index() const
                {
                    return m_index;
                }
                QPainterPath shape() const
                {
                    return m_item->shape();
                }
                QRectF boundingRect() const
                {
                    return m_item->boundingRect();
                }
                bool contains(const QPointF &point) const
                {
                    return m_item->contains(point);
                }
                void setPen(const QPen &pen)
                {
                    m_item->setPen(pen);
                }
                void setBrush(const QBrush &brush)
                {
                    m_item->setBrush(brush);
                }
                void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                {
                    m_item->paint(painter,option,widget);
                }
             protected:
                void mousePressEvent(QGraphicsSceneMouseEvent *event)
                {
                    Q_UNUSED(event)
                    m_parent->markerSelected(this);
                }
             private:
                QAbstractGraphicsShapeItem* m_item;
                ScatterChartItem* m_parent;
                int m_index;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // SCATTERPRESENTER_H

src/scroller_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 SCROLLER_P_H_
+            #ifndef SCROLLER_P_H
-            #define SCROLLER_P_H_
+            #define SCROLLER_P_H
             #include "qchartglobal.h"
             #include <QBasicTimer>
             #include <QTime>
             #include <QPointF>
             class QGraphicsSceneMouseEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Scroller;
             class QLegend;
             class ScrollTicker : public QObject
             {
             public:
                 ScrollTicker(Scroller *scroller,QObject *parent=0);
                 void start(int interval);
                 void stop();
             protected:
                 void timerEvent(QTimerEvent *event);
             private:
                 QBasicTimer m_timer;
                 Scroller *m_scroller;
             };
             class Scroller
             {
             public:
                 enum State {
                     Idle,
                     Pressed,
                     Move,
                     Scroll,
                     Stop
                 };
                 Scroller();
                 virtual ~Scroller();
                 virtual void setOffset(const QPointF& point) = 0;
                 virtual QPointF offset() const = 0;
             public:
                 void scrollTick();
             public:
                 void mousePressEvent(QGraphicsSceneMouseEvent* event);
                 void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
                 void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
             private:
                 void calculateSpeed(const QPointF& position);
                 void lowerSpeed(QPointF& speed,qreal maxSpeed=100);
             private:
                 ScrollTicker m_ticker;
                 State m_state;
                 QTime m_timeStamp;
                 QPointF m_press;
                 QPointF m_offset;
                 QPointF m_speed;
                 QPointF m_distance;
                 QPointF m_fraction;
                 int m_moveThreshold;
                 int m_timeTreshold;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* SCROLLER_P_H_ */

src/splinechart/qsplineseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QSPLINESERIES_P_H_
+            #ifndef QSPLINESERIES_P_H
-            #define QSPLINESERIES_P_H_
+            #define QSPLINESERIES_P_H
             #include "qlineseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QSplineSeriesPrivate: public QLineSeriesPrivate
             {
                 Q_OBJECT
             public:
                 Chart* createGraphics(ChartPresenter* presenter);
                 QSplineSeriesPrivate(QSplineSeries* q);
                 void calculateControlPoints();
                 QList<qreal> getFirstControlPoints(QList<qreal> rhs);
             public Q_SLOTS:
                 void updateControlPoints();
             public:
                 QList<QPointF> m_controlPoints;
             private:
                 Q_DECLARE_PUBLIC(QSplineSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemeblueicy_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTTHEMEBLUECEICY_P_H
+            #ifndef CHARTTHEMEBLUEICY_P_H
-            #define CHARTTHEMEBLUECEICY_P_H
+            #define CHARTTHEMEBLUEICY_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBlueIcy: public ChartTheme
             {
             public:
                 ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x3daeda);
                     m_seriesColors << QRgb(0x2685bf);
                     m_seriesColors << QRgb(0x0c2673);
                     m_seriesColors << QRgb(0x5f3dba);
                     m_seriesColors << QRgb(0x2fa3b4);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_titleBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
                     m_axisLabelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemelight_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef CHARTTHEMEHIGHLIGHT_P_H
+            #ifndef CHARTTHEMELIGHT_P_H
-            #define CHARTTHEMEHIGHLIGHT_P_H
+            #define CHARTTHEMELIGHT_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeLight: public ChartTheme
             {
             public:
                 ChartThemeLight() : ChartTheme(QChart::ChartThemeLight)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x209fdf);
                     m_seriesColors << QRgb(0x99ca53);
                     m_seriesColors << QRgb(0xf6a625);
                     m_seriesColors << QRgb(0x6d5fd5);
                     m_seriesColors << QRgb(0xbf593e);
                     generateSeriesGradients();
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
                     m_axisLabelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/xychart/qxyseries.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #ifndef QXYSERIES_H_
+            #ifndef QXYSERIES_H
-            #define QXYSERIES_H_
+            #define QXYSERIES_H
             #include <qchartglobal.h>
             #include <qseries.h>
             #include <QPen>
             #include <QBrush>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QSeries
             {
                 Q_OBJECT
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d,QObject *parent = 0);
                 ~QXYSeries();
             public:
                 void append(qreal x, qreal y);
                 void append(const QPointF &point);
                 void append(const QList<QPointF> points);
                 void replace(qreal x,qreal y);
                 void replace(const QPointF &point);
                 void remove(qreal x);
                 void remove(qreal x, qreal y);
                 void remove(const QPointF &point);
                 void removeAll();
                 int count() const;
                 qreal x(int pos) const;
                 qreal y(int pos) const;
                 QList<QPointF> data();
                 QXYSeries& operator << (const QPointF &point);
                 QXYSeries& operator << (const QList<QPointF> points);
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPointsVisible(bool visible);
                 bool pointsVisible() const;
                 bool setModel(QAbstractItemModel *model);
                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                 virtual void setModelMappingRange(int first, int count = 0);
                 int mapFirst() const;
                 int mapCount() const;
             private Q_SLOTS:
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                 void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
                 void modelDataAdded(QModelIndex parent, int start, int end);
                 void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
                 void modelDataRemoved(QModelIndex parent, int start, int end);
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void selected();
             private:
                 Q_DECLARE_PRIVATE(QXYSeries);
                 Q_DISABLE_COPY(QXYSeries);
                 friend class XYLegendMarker;
                 friend class XYChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/xychart/qxyseries_p.h +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial 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 QXYSERIES_P_H_
+            #ifndef QXYSERIES_P_H
-            #define QXYSERIES_P_H_
+            #define QXYSERIES_P_H
             #include "qseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeries;
             class QXYSeriesPrivate: public QSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QXYSeriesPrivate(QXYSeries* q);
                 void scaleDomain(Domain& domain);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
             Q_SIGNALS:
                 void updated();
                 void pointReplaced(int index);
                 void pointRemoved(int index);
                 void pointAdded(int index);
             protected:
                 QVector<qreal> m_x;
                 QVector<qreal> m_y;
                 QPen m_pen;
                 QBrush m_brush;
                 int m_mapX;
                 int m_mapY;
                 int m_mapFirst;
                 int m_mapCount;
                 bool m_mapLimited;
                 Qt::Orientation m_mapOrientation;
                 int tempItemsRemoved;
                 bool m_pointsVisible;
             private:
                 Q_DECLARE_PUBLIC(QXYSeries);
                 friend class QScatterSeries;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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