HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r775:02f25710c73d

0

demos/chartthemes/themewidget.h +1 -1

                 explicit ThemeWidget(QWidget *parent = 0);
                 ~ThemeWidget();
-            private slots:
+            private Q_SLOTS:
                 void updateUI();
             private:

0

qmlplugin/declarativebarseries.h +2 -2

                 void setBarCategories(QStringList categories);
                 QStringList barCategories();
-            signals:
+            Q_SIGNALS:
-            public slots:
+            public Q_SLOTS:
             public:
                 QChart *m_chart;

0

qmlplugin/declarativepieseries.h +3 -3

                 explicit DeclarativePieSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QPieSlice> data();
-            signals:
+            Q_SIGNALS:
-            public slots:
+            public Q_SLOTS:
                 static void appendData(QDeclarativeListProperty<QPieSlice> *list,
                                        QPieSlice *element);
-            private slots:
+            private Q_SLOTS:
                 void setParentForSeries();
             private:

0

qmlplugin/declarativexyseries.h +3 -3

             public:
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
-            signals:
+            Q_SIGNALS:
-            public slots:
+            public Q_SLOTS:
                 static void appendPoints(QDeclarativeListProperty<DeclarativeXyPoint> *list,
                                        DeclarativeXyPoint *element);
-            private slots:
+            private Q_SLOTS:
             public:
                 QSeries::QSeriesType m_seriesType;

0

src/areachart/areachartitem_p.h +2 -2

             protected:
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
-            signals:
+            Q_SIGNALS:
                 void clicked(const QPointF &point);
-            public slots:
+            public Q_SLOTS:
                 void handleUpdated();
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);

0

src/areachart/qareaseries.h +1 -1

             //    void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
             //    void setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
-            signals:
+            Q_SIGNALS:
                 void updated();
                 void clicked(const QPointF &point);

0

src/axis/axisitem_p.h +1 -1

                 inline QRectF geometry() const { return m_rect; }
                 inline QVector<qreal> layout() { return m_layoutVector; }
-            public slots:
+            public Q_SLOTS:
                 void handleAxisUpdated();
                 void handleAxisCategoriesUpdated();
                 void handleRangeChanged(qreal min , qreal max,int tickCount);

0

src/axis/qchartaxis.h +2 -2

                 void show();
                 void hide();
-            signals:
+            Q_SIGNALS:
             	void minChanged(qreal min);
             	void maxChanged(qreal max);
             	void rangeChanged(qreal min, qreal max);
             	void updated();
             	void changed(qreal min, qreal max, int tickCount,bool niceNumbers);
             //internal slot
-            public slots:
+            public Q_SLOTS:
             	void handleAxisRangeChanged(qreal min, qreal max,int count);
             private:

0

src/axis/qchartaxiscategories.h +1 -1

                 int count();
             //internal signal
-            signals:
+            Q_SIGNALS:
                 void updated();
             private:

0

src/barchart/barchartitem_p.h +1 -3

                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
-            private slots:
-            public:
                 virtual QVector<QRectF> calculateLayout();
                 void applyLayout(const QVector<QRectF> &layout);
                 void setLayout(const QVector<QRectF> &layout);
                 QRectF geometry() const { return m_rect;}
-            public slots:
+            public Q_SLOTS:
                 void handleModelChanged(int index);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);

0

src/barchart/barchartmodel_p.h +2 -2

                 QString categoryName(int category);
-            signals:
+            Q_SIGNALS:
                 void modelUpdated();
-            public slots:
+            public Q_SLOTS:
             private:

0

src/barchart/qbarseries.h +1 -1

                 BarChartModel& model();
                 // <--- TO PIMPL
-            signals:
+            Q_SIGNALS:
                 //void changed(int index);
                 void clicked(QBarSet *barset, QString category);        // Up to user of api, what to do with these signals
                 void rightClicked(QBarSet *barset, QString category);

0

src/chart_p.h +1 -1

             public:
                 explicit Chart(ChartPresenter *presenter);
-            public slots:
+            public Q_SLOTS:
                 virtual void handleGeometryChanged(const QRectF& rect);
                 virtual void handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY);
                 virtual void rangeXChanged(qreal min, qreal max, int tickXCount);

0

src/chartpresenter_p.h +2 -2

                 void createConnections();
                 void resetAllElements();
-            public slots:
+            public Q_SLOTS:
                 void handleSeriesAdded(QSeries* series,Domain* domain);
                 void handleSeriesRemoved(QSeries* series);
                 void handleAxisAdded(QChartAxis* axis,Domain* domain);
                 void handleAxisRemoved(QChartAxis* axis);
                 void handleGeometryChanged();
-            signals:
+            Q_SIGNALS:
                 void geometryChanged(const QRectF& rect);
             private:

0

src/domain_p.h +2 -2

                 void zoomOut(const QRectF& rect, const QSizeF& size);
                 void move(int dx,int dy,const QSizeF& size);
-            signals:
+            Q_SIGNALS:
                 void domainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void rangeXChanged(qreal min, qreal max, int tickXCount);
                 void rangeYChanged(qreal min, qreal max, int tickYCount);
-            public slots:
+            public Q_SLOTS:
                 void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,bool niceNumbers = false);
                 void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,bool niceNumbers = false);

0

src/legendscrollbutton_p.h +2 -2

                 virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-            signals:
+            Q_SIGNALS:
                 void clicked(QGraphicsSceneMouseEvent* event);
-            public slots:
+            public Q_SLOTS:
             private:

0

src/linechart/linechartitem_p.h +1 -1

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-            public slots:
+            public Q_SLOTS:
                 void handleUpdated();
             protected:

0

src/qlegend.h +2 -2

                 void setSize(const QSizeF size);
                 void setPos(const QPointF &pos);
-            signals:
+            Q_SIGNALS:
                 // for interactions.
                 void clicked(QSeries *series, Qt::MouseButton button);
                 void clicked(QBarSet *barset, Qt::MouseButton button);
                 void clicked(QPieSlice *slice, Qt::MouseButton button);
-            public slots:
+            public Q_SLOTS:
                 // PIMPL --->
                 void handleSeriesAdded(QSeries *series, Domain *domain);
                 void handleSeriesRemoved(QSeries *series);

0

src/scatterseries/scatterchartitem_p.h +1 -1

                 void markerSelected(Marker *item);
-            public slots:
+            public Q_SLOTS:
                 void handleUpdated();
             private:

0

src/splinechart/qsplineseries.h +1 -1

                 void calculateControlPoints();
                 QList<qreal> getFirstControlPoints(QList<qreal> rhs);
-            private slots:
+            private Q_SLOTS:
                 void updateControlPoints();
             private:

0

src/splinechart/splinechartitem_p.h +1 -1

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-            public slots:
+            public Q_SLOTS:
                 void handleUpdated();
             protected:

0

src/xychart/qxyseries.h +2 -2

                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                 virtual void setModelMappingShift(int first, int count = 0);
-            private slots:
+            private Q_SLOTS:
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                 void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
                 void modelDataAdded(QModelIndex parent, int start, int end);
                 void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
                 void modelDataRemoved(QModelIndex parent, int start, int end);
-            signals:
+            Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void updated();
                 void pointReplaced(int index);

0

src/xychart/xychartitem_p.h +2 -2

                 QRectF clipRect() const { return m_clipRect;}
-            public slots:
+            public Q_SLOTS:
                 void handlePointAdded(int index);
                 void handlePointRemoved(int index);
                 void handlePointReplaced(int index);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);
-            signals:
+            Q_SIGNALS:
                 void clicked(const QPointF& point);
             protected:

	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