HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2277:3866e510c514

Some fixes for Qt5, vs2010 build and qml

Jani Honkonen -

r2277:3866e510c514

parent child

Context file:

r2277:3866e510c514

plugins/declarative/declarativechart.cpp +2 -3

                 connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
                 connect(m_margins, SIGNAL(leftChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
                 connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
-                connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,AbstractDomain*)), this, SLOT(handleSeriesAdded(QAbstractSeries*,AbstractDomain*)));
+                connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*)));
                 connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*)));
             }
-            void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain)
+            void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series)
             {
-                Q_UNUSED(domain)
                 emit seriesAdded(series);
             }

plugins/declarative/declarativechart.h +1 -1

                 void changeMinimumMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
-                void handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain);
+                void handleSeriesAdded(QAbstractSeries *series);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support

src/axis/chartaxis.cpp +3 -3

             void ChartAxis::createItems(int count)
             {
-                if (m_arrow->children().size() == 0){
+                if (m_arrow->childItems().size() == 0){
                     QGraphicsLineItem* arrow = new ArrowItem(this, this);
                     arrow->setPen(m_axis->linePen());
                     m_arrow->addToGroup(arrow);
                 }
-                if (m_intervalAxis && m_grid->children().size() == 0) {
+                if (m_intervalAxis && m_grid->childItems().size() == 0) {
                     for (int i = 0 ; i < 2 ; i  ++){
                         QGraphicsLineItem* item = new QGraphicsLineItem(this);
                         item->setPen(m_axis->gridLinePen());
                         labels << QString::number(value, 'f', n);
                     }
                 } else {
-                    QByteArray array = format.toAscii();
+                    QByteArray array = format.toLatin1();
                     for (int i = firstTick; i < ticks + firstTick; i++) {
                         qreal value = qPow(base, i);
                         labels << QString().sprintf(array, value);

src/piechart/qpieseries.cpp +2 -2

             void QPieSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
-                Q_Q(QPieSeries);
+                //Q_Q(QPieSeries);
-                const QList<QColor>& colors = theme->seriesColors();
+                //const QList<QColor>& colors = theme->seriesColors();
                 const QList<QGradient>& gradients = theme->seriesGradients();
                 for (int i(0); i < m_slices.count(); i++) {

src/qchart.h +1 -1

             class QAbstractSeries;
             class QAbstractAxis;
             class QLegend;
-            struct QChartPrivate;
+            class QChartPrivate;
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {

src/themes/chartthemesystem_p.h +2 -2

                                         GetGValue(colorGradientActiveCaptionRight),
                                         GetBValue(colorGradientActiveCaptionRight));
                     g.setColorAt(1.0, end);
-                    m_seriesColors.append(colorAt(g, 0.5));
+                    m_seriesColors.append(ChartThemeManager::colorAt(g, 0.5));
                     // Generate gradients from the base colors
-                    generateSeriesGradients();
+                    ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background fill color from COLOR_WINDOW
                     QLinearGradient backgroundGradient;

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