HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1213:7e0a0b1297ee

pie: make slice added/removed signals public (again)

Jani Honkonen -

r1213:7e0a0b1297ee

parent child

Context file:

r1213:7e0a0b1297ee

Collapse all files

src/legend/qlegend.cpp +8 -10

                  if(series->type() == QAbstractSeries::SeriesTypePie)
                  {
                      QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                     QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*pieSeries);
-                     QObject::connect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
-                     QObject::connect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                     QObject::connect(pieSeries, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                     QObject::connect(pieSeries, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                  }
                  updateLayout();
                  if(series->type() == QAbstractSeries::SeriesTypePie)
                  {
                      QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                     QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*pieSeries);
-                     QObject::disconnect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
-                     QObject::disconnect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                     QObject::disconnect(pieSeries, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                     QObject::disconnect(pieSeries, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                  }
                  updateLayout();
              void QLegendPrivate::handleUpdatePieSeries()
              {
                  //TODO: reimplement to be optimal
-                 QPieSeriesPrivate* d = qobject_cast<QPieSeriesPrivate *> (sender());
-                 Q_ASSERT(d->q_func());
-                 handleSeriesRemoved(d->q_func());
-                 handleSeriesAdded(d->q_func(), 0);
+                 QPieSeries* series = qobject_cast<QPieSeries *> (sender());
+                 Q_ASSERT(series);
+                 handleSeriesRemoved(series);
+                 handleSeriesAdded(series, 0);
              }
              #include "moc_qlegend.cpp"

src/piechart/piechartitem.cpp +2 -2

              {
                  Q_ASSERT(series);
+                 connect(series, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
+                 connect(series, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
                  QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*series);
-                 connect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
-                 connect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
                  connect(d, SIGNAL(piePositionChanged()), this, SLOT(updateLayout()));
                  connect(d, SIGNAL(pieSizeChanged()), this, SLOT(updateLayout()));

src/piechart/qpieseries.cpp +4 -4

                      connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
                  }
-                 emit d->added(slices);
+                 emit added(slices);
                  return true;
              }
                  connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
                  connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                 emit d->added(QList<QPieSlice*>() << slice);
+                 emit added(QList<QPieSlice*>() << slice);
                  return true;
              }
                  d->updateDerivativeData();
-                 emit d->removed(QList<QPieSlice*>() << slice);
+                 emit removed(QList<QPieSlice*>() << slice);
                  delete slice;
                  slice = 0;
                  d->updateDerivativeData();
-                 emit d->removed(slices);
+                 emit removed(slices);
              }
              /*!

src/piechart/qpieseries.h +2 0

                  QPieModelMapper* modelMapper() const;
              Q_SIGNALS:
+                 void added(QList<QPieSlice*> slices);
+                 void removed(QList<QPieSlice*> slices);
                  void clicked(QPieSlice* slice);
                  void hovered(QPieSlice* slice, bool state);

src/piechart/qpieseries_p.h 0 -2

                  static QPieSeriesPrivate* seriesData(QPieSeries &series);
              Q_SIGNALS:
-                 void added(QList<QPieSlice*> slices);
-                 void removed(QList<QPieSlice*> slices);
                  void piePositionChanged();
                  void pieSizeChanged();

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