HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r217:97e8d42197e7

moved presenter to private headers. code cleanup

sauimone -

r217:97e8d42197e7

parent child

Context file:

r217:97e8d42197e7

src/barchart/barpresenter.h +4 -4

-            #ifndef QBARGROUP_H
+            #ifndef BARPRESENTER_H
-            #define QBARGROUP_H
+            #define BARPRESENTER_H
             #include "barpresenterbase.h"
             #include "qbarchartseries.h"
             private:
-                // From BarGroupBase
+                // From BarPresenterBase
                 void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QBARGROUP_H
+            #endif // BARPRESENTER_H

src/barchart/barpresenterbase.cpp 0 -10

@@ -46,17 +46,7 void BarPresenterBase::setBarWidth( int w )
46	{	46	{
47	mBarDefaultWidth = w;	47	mBarDefaultWidth = w;
48	}	48	}
49	/*
50	void BarGroupBase::resetBrushes()
51	{
52	mBrushes.clear();
53	}
54		49
55	void BarGroupBase::addBrush(QBrush brush)
56	{
57	mBrushes.append(brush);
58	}
59	*/
60	void BarPresenterBase::dataChanged()	50	void BarPresenterBase::dataChanged()
61	{	51	{
62	// TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?	52	// TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?

src/barchart/barpresenterbase.h +3 -8

-            #ifndef BARGROUPBASE_H
+            #ifndef BARPRESENTERBASE_H
-            #define BARGROUPBASE_H
+            #define BARPRESENTERBASE_H
             #include "chartitem_p.h"
             #include "barchartmodel_p.h"
                 // TODO: these may change with layout awarness.
                 void setBarWidth( int w );
-            //    void resetBrushes();
-            //    void addBrush(QBrush brush);
                 void setPen(QPen pen);
                 QPen pen();
                 void setBrush(QBrush brush);
                 QBrush brush();
                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
                 virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
                 BarChartModel& mModel;
                 QPen mPen;
-            //    QList<QBrush> mBrushes;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // BARGROUPBASE_H
+            #endif // BARPRESENTERBASE_H

src/barchart/percentbarpresenter.h +3 -3

-            #ifndef PERCENTBARGROUP_H
+            #ifndef PERCENTBARPRESENTER_H
-            #define PERCENTBARGROUP_H
+            #define PERCENTBARPRESENTER_H
             #include "chartitem_p.h"
             #include "bar_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // PERCENTBARGROUP_H
+            #endif // PERCENTBARPRESENTER_H

src/barchart/qbarchartseries.h 0 -3

             class QBarCategory;
             class QBarSet;
-            class BarPresenter;
             class BarChartModel;
             // Container for series
             private:
-                BarPresenter* mBarGroup;
                 BarChartModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarchartseries.h 0 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PercentBarPresenter;
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
             private:
-                PercentBarPresenter* mPercentBarGroup;
                 BarChartModel* mModel;
             };

src/barchart/qstackedbarchartseries.h 0 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class StackedBarPresenter;
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
             private:
-                StackedBarPresenter* mStackedBarGroup;
                 BarChartModel* mModel;
             };

src/src.pro +4 -4

                 barchart/bar_p.h \
                 barchart/separator_p.h \
                 barchart/barchartmodel_p.h \
+                barchart/barpresenter.h \
+                barchart/stackedbarpresenter.h \
+                barchart/percentbarpresenter.h \
+                barchart/barpresenterbase.h \
                 axisitem_p.h \
                 chartitem_p.h \
                 charttheme_p.h \
                 domain_p.h
             PUBLIC_HEADERS += linechart/qlinechartseries.h \
                 barchart/qbarchartseries.h \
-                barchart/barpresenter.h \
                 barchart/qstackedbarchartseries.h \
-                barchart/stackedbarpresenter.h \
                 barchart/qpercentbarchartseries.h \
-                barchart/percentbarpresenter.h \
-                barchart/barpresenterbase.h \
                 barchart/qbarset.h \
                 barchart/qbarcategory.h \
                 qchartseries.h \

General Comments 0

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

No TODOs yet

	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