HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r676:2e47e5550be5

Getting rid of friend classes in pie API

Jani Honkonen -

r676:2e47e5550be5

parent child

Context file:

r676:2e47e5550be5

Collapse all files

src/piechart/piechartitem.cpp +1 -1

             PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
-                PieSliceData sliceData = slice->d_ptr->m_data;
+                PieSliceData sliceData = slice->data_ptr()->m_data;
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
                 sliceData.m_angleSpan = slice->endAngle() - slice->startAngle();

src/piechart/qpieseries.cpp +7 -7

                     bool isChanged = false;
                     qreal percentage = s->value() / m_total;
-                    if (s->d_ptr->m_data.m_percentage != percentage) {
+                    if (s->data_ptr()->m_data.m_percentage != percentage) {
-                        s->d_ptr->m_data.m_percentage = percentage;
+                        s->data_ptr()->m_data.m_percentage = percentage;
                         isChanged = true;
                     }
                     qreal sliceSpan = pieSpan * percentage;
-                    if (s->d_ptr->m_data.m_angleSpan != sliceSpan) {
+                    if (s->data_ptr()->m_data.m_angleSpan != sliceSpan) {
-                        s->d_ptr->m_data.m_angleSpan = sliceSpan;
+                        s->data_ptr()->m_data.m_angleSpan = sliceSpan;
                         isChanged = true;
                     }
-                    if (s->d_ptr->m_data.m_startAngle != sliceAngle) {
+                    if (s->data_ptr()->m_data.m_startAngle != sliceAngle) {
-                        s->d_ptr->m_data.m_startAngle = sliceAngle;
+                        s->data_ptr()->m_data.m_startAngle = sliceAngle;
                         isChanged = true;
                     }
                     sliceAngle += sliceSpan;
                 // emit signals
                 foreach (QPieSlice* s, changed)
-                    emit s->changed();
+                    emit s->data_ptr()->changed();
             }
             void QPieSeriesPrivate::sliceChanged()

src/piechart/qpieseries.h +4 -1

                 void pieSizeChanged();
             private:
-                friend class QPieSlice;
                 QPieSeriesPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
+            public:
+                typedef QPieSeriesPrivate * const DataPtr;
+                inline DataPtr &data_ptr() { return d_ptr; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpieslice.cpp +2 -1

                     QPieSeries *series = qobject_cast<QPieSeries*>(parent());
                     if (series)
-                        series->d_ptr->updateDerivativeData(); // will emit changed()
+                        series->data_ptr()->updateDerivativeData(); // will emit changed()
                     else
                         emit changed();
                 }
             }
             #include "moc_qpieslice.cpp"
+            #include "moc_qpiesliceprivate_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpieslice.h +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlicePrivate;
-            class QPieSeriesPrivate;
-            class PieChartItem;
             class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject
             {
                 void changed();
             private:
-                friend class QPieSeriesPrivate; // TODO: get rid of this
-                friend class PieChartItem; // TODO: get rid of this
                 QPieSlicePrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieSlice)
                 Q_DISABLE_COPY(QPieSlice)
+            public:
+                typedef QPieSlicePrivate * const DataPtr;
+                inline DataPtr &data_ptr() { return d_ptr; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpiesliceprivate_p.h +14 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QPieSlicePrivate
+            class QPieSlicePrivate : public QObject
             {
+                Q_OBJECT
                 Q_DECLARE_PUBLIC(QPieSlice)
             public:
-                QPieSlicePrivate(QPieSlice *parent):q_ptr(parent) {}
+                QPieSlicePrivate(QPieSlice *parent)
+                    :QObject(parent),
+                    q_ptr(parent)
+                {
+                    connect(this, SIGNAL(changed()), q_ptr, SIGNAL(changed()));
+                }
                 ~QPieSlicePrivate() {}
-                QPieSlice * const q_ptr;
+            Q_SIGNALS:
+                void changed();
+            public:
+                friend class QPieSeriesPrivate;
+                QPieSlice * const q_ptr;
                 PieSliceData m_data;
             };

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