HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r822:924499b21823

Polish QPieSlice API by removing the DataPtr stuff

Jani Honkonen -

r822:924499b21823

parent child

Context file:

r822:924499b21823

src/charttheme.cpp +4 -4

                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     QPieSlice *s = series->slices().at(i);
-                    PieSliceData data = *s->data_ptr();
+                    PieSliceData data = PieSliceData::data(s);
                     if (data.m_slicePen.isThemed() || force) {
                         data.m_slicePen = penColor;
                         data.m_labelFont.setThemed(true);
                     }
-                    if (*s->data_ptr() != data) {
+                    if (PieSliceData::data(s) != data) {
-                        *s->data_ptr() = data;
+                        PieSliceData::data(s) = data;
-                        emit s->data_ptr()->emitChangedSignal(s);
+                        emit PieSliceData::data(s).emitChangedSignal(s);
                     }
                 }
             }

src/piechart/piechartitem.cpp +1 -1

             PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
             	// TODO: This function is kid of useless now. Refactor.
-                PieSliceData sliceData = *slice->data_ptr();
+                PieSliceData sliceData = PieSliceData::data(slice);
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
                 return sliceData;

src/piechart/pieslicedata_p.h +6 0

                     emit s->changed();
                 }
+                static PieSliceData &data(QPieSlice *slice)
+                {
+                    Q_ASSERT(slice);
+                    return *slice->d;
+                }
                 qreal m_value;
                 Themed<QPen> m_slicePen;

src/piechart/qpieseries.cpp +4 -4

                 QVector<QPieSlice*> changed;
                 foreach (QPieSlice* s, m_slices) {
-                    PieSliceData data = *s->data_ptr();
+                    PieSliceData data = PieSliceData::data(s);
                     data.m_percentage = s->value() / m_total;
                     data.m_angleSpan = pieSpan * data.m_percentage;
                     data.m_startAngle = sliceAngle;
                     sliceAngle += data.m_angleSpan;
-                    if (*s->data_ptr() != data) {
+                    if (PieSliceData::data(s) != data) {
-                        *s->data_ptr() = data;
+                        PieSliceData::data(s) = data;
                         changed << s;
                     }
                 }
                 // emit signals
                 foreach (QPieSlice* s, changed)
-                    s->data_ptr()->emitChangedSignal(s);
+                    PieSliceData::data(s).emitChangedSignal(s);
             }
             void QPieSeriesPrivate::sliceChanged()

src/piechart/qpieslice.h 0 -4

                 friend class PieSliceData;
                 PieSliceData * const d;
                 Q_DISABLE_COPY(QPieSlice)
-            public:
-                typedef PieSliceData * const DataPtr;
-                inline DataPtr &data_ptr() { return d; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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