HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2793:f83d776d3813

0

examples/charts/qmloscilloscope/datasource.h +1 -1

             public:
                 explicit DataSource(QQuickView *appViewer, QObject *parent = 0);
-            signals:
+            Q_SIGNALS:
             public slots:
                 void generateData(int type, int rowCount, int colCount);

0

plugins/designer/qchartsplugin.cpp +1 -1

                 QString myNewLine = QStringLiteral("\n");
             #endif
                 return QStringLiteral("<QtCharts/QChartView>") + myNewLine
-                        + QStringLiteral("#include <chartsnamespace.h>");
+                        + QStringLiteral("#include <QtCharts/chartsnamespace.h>");
             }
             QString QChartsPlugin::group() const

0

src/charts/barchart/vertical/bar/barchartitem_p.h +1 -1

             public:
                 BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();

0

src/charts/barchart/vertical/percent/percentbarchartitem_p.h +1 -1

                 PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
                 void handleUpdatedBars();
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();

0

src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +1 -1

             public:
                 StackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item =0);
-            private slots:
+            private Q_SLOTS:
                 void handleLabelsPositionChanged();
                 void positionLabels();

0

src/charts/boxplotchart/qboxplotseries_p.h +1 -1

                 void updatedLayout();
                 void restructuredBoxes();
-            private slots:
+            private Q_SLOTS:
                 void handleSeriesChange(QAbstractSeries *series);
                 void handleSeriesRemove(QAbstractSeries *series);

0

src/charts/chartpresenter_p.h +1 -1

                 void handleAxisAdded(QAbstractAxis *axis);
                 void handleAxisRemoved(QAbstractAxis *axis);
-            signals:
+            Q_SIGNALS:
                 void plotAreaChanged(const QRectF &plotArea);
             private:

0

src/charts/chartsnamespace.h +3 0

             // this is needed by the designer plugin.
+            #ifdef QT_CHARTS_USE_NAMESPACE
             QT_CHARTS_USE_NAMESPACE
+            #endif
             #endif /* CHARTSNAMESPACE_H */

0

src/charts/piechart/qpieseries_p.h +1 -1

                 static QPieSeriesPrivate *fromSeries(QPieSeries *series);
-            signals:
+            Q_SIGNALS:
                 void calculatedDataChanged();
                 void pieSizeChanged();
                 void pieStartAngleChanged();

0

src/charts/qchart.h +1 -1

                 ChartType chartType() const;
-            signals:
+            Q_SIGNALS:
                 void plotAreaChanged(const QRectF &plotArea);
             protected:

0

src/chartsqml2/declarativeaxes.h +1 -1

                 void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); }
                 void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); }
-            signals:
+            Q_SIGNALS:
                 void axisXChanged(QAbstractAxis *axis);
                 void axisYChanged(QAbstractAxis *axis);
                 void axisXTopChanged(QAbstractAxis *axis);

	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