##// END OF EJS Templates
Cleanup; removed left over .h file and squashed warnings
Tero Ahola -
r121:4c25bd6a036a
parent child
Show More
@@ -11,6 +11,7 BarChartSeries::BarChartSeries(QObject *parent)
11 bool BarChartSeries::setData(QAbstractItemModel* model)
11 bool BarChartSeries::setData(QAbstractItemModel* model)
12 {
12 {
13 mModel = model;
13 mModel = model;
14 return true;
14 }
15 }
15
16
16 int BarChartSeries::min()
17 int BarChartSeries::min()
@@ -8,9 +8,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
8 BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
8 BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
9 ChartItem(parent)
9 ChartItem(parent)
10 ,mSeries(series)
10 ,mSeries(series)
11 ,mBarDefaultWidth(10)
11 ,mLayoutSet(false)
12 ,mLayoutSet(false)
12 ,mLayoutDirty(true)
13 ,mLayoutDirty(true)
13 ,mBarDefaultWidth(10)
14 {
14 {
15 dataChanged();
15 dataChanged();
16 }
16 }
@@ -14,6 +14,7 PercentBarChartSeries::PercentBarChartSeries(QObject *parent) :
14 bool PercentBarChartSeries::setData(QAbstractItemModel* model)
14 bool PercentBarChartSeries::setData(QAbstractItemModel* model)
15 {
15 {
16 mModel = model;
16 mModel = model;
17 return true;
17 }
18 }
18
19
19 int PercentBarChartSeries::min()
20 int PercentBarChartSeries::min()
@@ -6,11 +6,11
6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
6 QTCOMMERCIALCHART_BEGIN_NAMESPACE
7
7
8 PercentBarGroup::PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent) :
8 PercentBarGroup::PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent) :
9 ChartItem(parent)
9 ChartItem(parent)
10 ,mSeries(series)
10 ,mSeries(series)
11 ,mLayoutSet(false)
11 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
12 ,mLayoutDirty(true)
12 ,mLayoutSet(false)
13 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
13 ,mLayoutDirty(true)
14 {
14 {
15 dataChanged();
15 dataChanged();
16 }
16 }
@@ -12,6 +12,7 StackedBarChartSeries::StackedBarChartSeries(QObject *parent) :
12 bool StackedBarChartSeries::setData(QAbstractItemModel* model)
12 bool StackedBarChartSeries::setData(QAbstractItemModel* model)
13 {
13 {
14 mModel = model;
14 mModel = model;
15 return true;
15 }
16 }
16
17
17 int StackedBarChartSeries::min()
18 int StackedBarChartSeries::min()
@@ -7,13 +7,13
7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
8
8
9 StackedBarGroup::StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent) :
9 StackedBarGroup::StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent) :
10 ChartItem(parent)
10 ChartItem(parent)
11 ,mSeries(series)
11 ,mSeries(series)
12 ,mLayoutSet(false)
12 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
13 ,mLayoutDirty(true)
13 ,mLayoutSet(false)
14 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
14 ,mLayoutDirty(true)
15 ,mTheme(0)
15 ,mTheme(0)
16 ,mSeparatorsVisible(true)
16 ,mSeparatorsVisible(true)
17 {
17 {
18 dataChanged();
18 dataChanged();
19 }
19 }
@@ -11,9 +11,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
11
11
12 QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
12 QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
13 ChartItem(parent),
13 ChartItem(parent),
14 m_boundingRect(),
14 m_markerColor(QColor()),
15 m_markerColor(QColor()),
15 m_visibleChartArea(),
16 m_visibleChartArea()
16 m_boundingRect()
17 {
17 {
18 if (parent)
18 if (parent)
19 m_boundingRect = parent->boundingRect();
19 m_boundingRect = parent->boundingRect();
@@ -1,7 +1,6
1 #include <QtGui/QApplication>
1 #include <QtGui/QApplication>
2 #include <QDeclarativeEngine>
2 #include <QDeclarativeEngine>
3 #include "qmlapplicationviewer.h"
3 #include "qmlapplicationviewer.h"
4 #include "chart.h"
5
4
6 Q_DECL_EXPORT int main(int argc, char *argv[])
5 Q_DECL_EXPORT int main(int argc, char *argv[])
7 {
6 {
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now