HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1935:beaeb7cee6fe

0

demos/chartthemes/themewidget.h +3 -3

             **
             ****************************************************************************/
-            #ifndef THEMEWINDOW_H_
+            #ifndef THEMEWINDOW_H
-            #define THEMEWINDOW_H_
+            #define THEMEWINDOW_H
             #include <QWidget>
             #include <QChartGlobal>
                 QComboBox *m_legendComboBox;
             };
-            #endif /* THEMEWINDOW_H_ */
+            #endif /* THEMEWINDOW_H */

0

demos/chartviewer/model.h +2 -2

             **
             ****************************************************************************/
-            #ifndef MODEL_H_
+            #ifndef MODEL_H
-            #define MODEL_H_
+            #define MODEL_H
             #include <QList>
             #include <QPair>

0

demos/chartviewer/view.h +2 -2

             **
             ****************************************************************************/
-            #ifndef VIEW_H_
+            #ifndef VIEW_H
-            #define VIEW_H_
+            #define VIEW_H
             #include <QGraphicsView>
             class QGraphicsScene;

0

demos/chartviewer/window.h +2 -2

             **
             ****************************************************************************/
-            #ifndef WINDOW_H_
+            #ifndef WINDOW_H
-            #define WINDOW_H_
+            #define WINDOW_H
             #include "model.h"
             #include <QMainWindow>
             #include <QChartGlobal>

0

demos/dynamicspline/chart.h +3 -3

             **
             ****************************************************************************/
-            #ifndef CHART_H_
+            #ifndef CHART_H
-            #define CHART_H_
+            #define CHART_H
             #include <QChart>
             #include <QTimer>
             };
             //![1]
-            #endif /* CHART_H_ */
+            #endif /* CHART_H */

0

examples/presenterchart/chartview.h +3 -3

             **
             ****************************************************************************/
-            #ifndef CHARTVIEW_H_
+            #ifndef CHARTVIEW_H
-            #define CHARTVIEW_H_
+            #define CHARTVIEW_H
             #include <QChartView>
             #include <QTimer>
             };
             //![1]
-            #endif /* CHARTVIEW_H_ */
+            #endif /* CHARTVIEW_H */

0

plugins/designer/qchartsplugin.h +3 -3

             **
             ****************************************************************************/
-            #ifndef QCHARTSPLUGIN_H_
+            #ifndef QCHARTSPLUGIN_H
-            #define QCHARTSPLUGIN_H_
+            #define QCHARTSPLUGIN_H
             #include <QDesignerCustomWidgetInterface>
                 QWidget *createWidget(QWidget *parent);
             };
-            #endif /* QCHARTSPLUGIN_H_ */
+            #endif /* QCHARTSPLUGIN_H */

0

src/animations/axisanimation_p.h +1 -1

@@ -59,4 +59,4 QTCOMMERCIALCHART_END_NAMESPACE
59		59
60		60
61		61
62	#endif /* AXISITEM_H_ */	62	#endif /* AXISANIMATION_H */

0

src/animations/chartanimation_p.h +1 -3

             QTCOMMERCIALCHART_END_NAMESPACE
+            #endif /* CHARTANIMATION_H */
-            #endif /* AXISITEM_H_ */

0

src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTCATEGORIESAXISX_H
+            #ifndef CHARTBARCATEGORYAXISX_H
-            #define CHARTCATEGORIESAXISX_H
+            #define CHARTBARCATEGORYAXISX_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTCATEGORIESAXISX_H */
+            #endif /* CHARTBARCATEGORYAXISX_H */

0

src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTCATEGORIESAXISY_H
+            #ifndef CHARTBARCATEGORYAXISY_H
-            #define CHARTCATEGORIESAXISY_H
+            #define CHARTBARCATEGORYAXISY_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTCATEGORIESAXISY_H */
+            #endif /* CHARTBARCATEGORYAXISY_H */

0

src/axis/barcategoryaxis/qbarcategoryaxis.cpp +2 -2

                     if(!d->m_categories.isEmpty())
                         setRange(d->m_categories.first(),d->m_categories.last());
                     else
-                        setRange(QString::null,QString::null);
+                        setRange(QString(),QString());
                     emit categoriesChanged();
                 }
             }
             {
                 Q_D(QBarCategoryAxis);
                 d->m_categories.clear();
-                setRange(QString::null,QString::null);
+                setRange(QString(),QString());
                 emit categoriesChanged();
             }

0

src/axis/barcategoryaxis/qbarcategoryaxis.h +3 -3

             **
             ****************************************************************************/
-            #ifndef QBARCATEGORIESAXIS_H
+            #ifndef QBARCATEGORYAXIS_H
-            #define QBARCATEGORIESAXIS_H
+            #define QBARCATEGORYAXIS_H
             #include "qabstractaxis.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QCATEGORIESAXIS_H
+            #endif // QBARCATEGORYAXIS_H

0

src/axis/barcategoryaxis/qbarcategoryaxis_p.h +3 -3

             //
             // We mean it.
-            #ifndef QBARCATEGORIESAXIS_P_H
+            #ifndef QBARCATEGORYAXIS_P_H
-            #define QBARCATEGORIESAXIS_P_H
+            #define QBARCATEGORYAXIS_P_H
             #include "qbarcategoryaxis.h"
             #include "qabstractaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QBARCATEGORIESAXIS_P_H
+            #endif // QBARCATEGORYAXIS_P_H

0

src/axis/categoryaxis/chartcategoryaxisx_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTINTERVALAXISX_H
+            #ifndef CHARTCATEGORYAXISX_H
-            #define CHARTINTERVALAXISX_H
+            #define CHARTCATEGORYAXISX_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTINTERVALAXISX_H */
+            #endif /* CHARTCATEGORYAXISX_H */

0

src/axis/categoryaxis/chartcategoryaxisy_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTINTERVALAXISY_H
+            #ifndef CHARTCATEGORYAXISY_H
-            #define CHARTINTERVALAXISY_H
+            #define CHARTCATEGORYAXISY_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTINTERVALAXISY_H */
+            #endif /* CHARTCATEGORYAXISY_H */

0

src/axis/categoryaxis/qcategoryaxis.cpp +1 -1

             qreal QCategoryAxis::startValue(const QString& categoryLabel) const
             {
                 Q_D(const QCategoryAxis);
-                if (categoryLabel == QString())
+                if (categoryLabel.isEmpty())
                     return d->m_categoryMinimum;
                 else
                     return d->m_categoriesMap.value(categoryLabel).first;

0

src/axis/categoryaxis/qcategoryaxis.h +3 -3

             **
             ****************************************************************************/
-            #ifndef QCATEGORIESAXIS_H
+            #ifndef QCATEGORYAXIS_H
-            #define QCATEGORIESAXIS_H
+            #define QCATEGORYAXIS_H
             #include "qabstractaxis.h"
             #include "qvalueaxis.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QCATEGORIESAXIS_H
+            #endif // QCATEGORYAXIS_H

0

src/axis/chartaxis_p.h +1 -1

@@ -166,4 +166,4 private:
166		166
167	QTCOMMERCIALCHART_END_NAMESPACE	167	QTCOMMERCIALCHART_END_NAMESPACE
168		168
169	#endif /* AXI~~SITEM~~_H_ */	169	#endif /* CHARTAXI_H */

0

src/axis/datetimeaxis/qdatetimeaxis_p.h +3 -3

             //
             // We mean it.
-            #ifndef QVALUESAXIS_P_H
+            #ifndef QDATETIMEAXIS_P_H
-            #define QVALUESAXIS_P_H
+            #define QDATETIMEAXIS_P_H
             #include "qdatetimeaxis.h"
             #include "qabstractaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QVALUESAXIS_P_H
+            #endif // QDATETIMEAXIS_P_H

0

src/axis/qabstractaxis.cpp +3 -3

             /*!
               Sets the minimum value shown on the axis.
-              Depending on the actual axis type the \a min paramter is converted to appropriate type.
+              Depending on the actual axis type the \a min parameter is converted to appropriate type.
               If the conversion is impossible then the function call does nothing
             */
             void QAbstractAxis::setMin(const QVariant &min)
             /*!
               Sets the maximum value shown on the axis.
-              Depending on the actual axis type the \a max paramter is converted to appropriate type.
+              Depending on the actual axis type the \a max parameter is converted to appropriate type.
               If the conversion is impossible then the function call does nothing
             */
             void QAbstractAxis::setMax(const QVariant &max)
             /*!
               Sets the range shown on the axis.
-              Depending on the actual axis type the \a min and \a max paramters are converted to appropriate types.
+              Depending on the actual axis type the \a min and \a max parameters are converted to appropriate types.
               If the conversion is impossible then the function call does nothing.
             */
             void QAbstractAxis::setRange(const QVariant &min, const QVariant &max)

0

src/axis/valueaxis/chartvalueaxisx_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTVALUESAXISX_H
+            #ifndef CHARTVALUEAXISX_H
-            #define CHARTVALUESAXISX_H
+            #define CHARTVALUEAXISX_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTVALUESAXISX_H */
+            #endif /* CHARTVALUEAXISX_H */

0

src/axis/valueaxis/chartvalueaxisy_p.h +3 -3

             //
             // We mean it.
-            #ifndef CHARTVALUESAXISY_H
+            #ifndef CHARTVALUEAXISY_H
-            #define CHARTVALUESAXISY_H
+            #define CHARTVALUEAXISY_H
             #include "chartaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* CHARTVALUESAXISY_H */
+            #endif /* CHARTVALUEAXISY_H */

0

src/axis/valueaxis/qvalueaxis.cpp +1 -2

                 m_min(0),
                 m_max(0),
                 m_tickCount(5),
-                m_niceNumbers(false),
+                m_niceNumbers(false)
-                m_format(QString::null)
             {
             }

0

src/axis/valueaxis/qvalueaxis.h +3 -3

             **
             ****************************************************************************/
-            #ifndef QVALUESAXIS_H
+            #ifndef QVALUEAXIS_H
-            #define QVALUESAXIS_H
+            #define QVALUEAXIS_H
             #include "qabstractaxis.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QVALUESAXIS_H
+            #endif // QVALUEAXIS_H

0

src/axis/valueaxis/qvalueaxis_p.h +3 -3

             //
             // We mean it.
-            #ifndef QVALUESAXIS_P_H
+            #ifndef QVALUEAXIS_P_H
-            #define QVALUESAXIS_P_H
+            #define QVALUEAXIS_P_H
             #include "qvalueaxis.h"
             #include "qabstractaxis_p.h"
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QVALUESAXIS_P_H
+            #endif // QVALUEAXIS_P_H

0

src/barchart/abstractbarchartitem.cpp +4 -4

                         // Bars
                         Bar *bar = new Bar(set,c,this);
                         m_bars.append(bar);
-                        connect(bar, SIGNAL(clicked(int, QBarSet*)), m_series, SIGNAL(clicked(int, QBarSet*)));
+                        connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*)));
-                        connect(bar, SIGNAL(hovered(bool, QBarSet*)), m_series, SIGNAL(hovered(bool, QBarSet*)));
+                        connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
-                        connect(bar, SIGNAL(clicked(int, QBarSet*)), set, SIGNAL(clicked(int)));
+                        connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
-                        connect(bar, SIGNAL(hovered(bool, QBarSet*)), set, SIGNAL(hovered(bool)));
+                        connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));
                         // Labels

0

src/barchart/qabstractbarseries.cpp +1 -1

             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
-                Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
+                Returns true, if all sets were appended successfully. If any of the sets is null or is already appended to series,
                 nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
                 and function returns false.
             */

0

src/barchart/qbarmodelmapper.cpp +2 -2

                             posInBar++;
                             barIndex = barModelIndex(i, posInBar);
                         }
-                        connect(barSet, SIGNAL(valuesAdded(int, int)), this, SLOT(valuesAdded(int, int)));
+                        connect(barSet, SIGNAL(valuesAdded(int,int)), this, SLOT(valuesAdded(int,int)));
-                        connect(barSet, SIGNAL(valuesRemoved(int, int)), this, SLOT(valuesRemoved(int, int)));
+                        connect(barSet, SIGNAL(valuesRemoved(int,int)), this, SLOT(valuesRemoved(int,int)));
                         connect(barSet, SIGNAL(valueChanged(int)), this, SLOT(barValueChanged(int)));
                         connect(barSet, SIGNAL(labelChanged()), this, SLOT(barLabelChanged()));
                         m_series->append(barSet);

0

src/barchart/vertical/bar/barchartitem.cpp 0 -1

             #include "barchartitem_p.h"
             #include "bar_p.h"
-            #include "qbarset_p.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"

0

src/chartbackground_p.h +1 -1

@@ -61,6 +61,6 private:
61		61
62	QTCOMMERCIALCHART_END_NAMESPACE	62	QTCOMMERCIALCHART_END_NAMESPACE
63		63
64	#endif /* CHARTBACKGROUND_H_ */	64	#endif /* CHARTBACKGROUND_H */
65		65
66		66

0

src/chartdataset_p.h +1 -1

@@ -95,4 +95,4 private:
95		95
96	QTCOMMERCIALCHART_END_NAMESPACE	96	QTCOMMERCIALCHART_END_NAMESPACE
97		97
98	#endif /* CHARTENGINE_P_H_ */	98	#endif /* CHARTENGINE_P_H */

0

src/chartitem_p.h +1 -1

@@ -45,4 +45,4 public:
45		45
46	QTCOMMERCIALCHART_END_NAMESPACE	46	QTCOMMERCIALCHART_END_NAMESPACE
47		47
48	#endif /* CHARTITEM_H_ */	48	#endif /* CHARTITEM_H */

0

src/chartlayout_p.h +2 -2

             **
             ****************************************************************************/
-            #ifndef CHARTLAYOUT_H_
+            #ifndef CHARTLAYOUT_H
-            #define CHARTLAYOUT_H_
+            #define CHARTLAYOUT_H
             #include <QGraphicsLayout>
             #include <QMargins>
             #include "qchartglobal.h"

0

src/chartpresenter_p.h +1 -1

@@ -174,4 +174,4 private:
174		174
175	QTCOMMERCIALCHART_END_NAMESPACE	175	QTCOMMERCIALCHART_END_NAMESPACE
176		176
177	#endif /* CHARTPRESENTER_H_ */	177	#endif /* CHARTPRESENTER_H */

0

src/chartsnamespace.h +3 -3

             **
             ****************************************************************************/
-            #ifndef MACROINCLUDE_H_
+            #ifndef CHARTSNAMESPACE_H
-            #define MACROINCLUDE_H_
+            #define MACROINCLUDE_H
             // this is needed by the designer plugin.
             QTCOMMERCIALCHART_USE_NAMESPACE
-            #endif /* MACROINCLUDE_H_ */
+            #endif /* CHARTSNAMESPACE_H */

0

src/legend/legendlayout_p.h +2 -2

             **
             ****************************************************************************/
-            #ifndef LEGENDLAYOUT_H_
+            #ifndef LEGENDLAYOUT_H
-            #define LEGENDLAYOUT_H_
+            #define LEGENDLAYOUT_H
             #include <QGraphicsLayout>
             #include "qchartglobal.h"

0

src/piechart/qpiemodelmapper.cpp +1 -1

             **
             ****************************************************************************/
-            #include "qpiemodelmapper_p.h"
             #include "qpiemodelmapper.h"
+            #include "qpiemodelmapper_p.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include <QAbstractItemModel>

0

src/qchartview_p.h +1 -1

             class QChartViewPrivate {
             public:
-                QChartViewPrivate(QChartView *q,QChart *chart = 0);
+                explicit QChartViewPrivate(QChartView *q, QChart *chart = 0);
                 ~QChartViewPrivate();
             protected:

0

src/scroller_p.h +1 -1

@@ -104,4 +104,4 private:
104		104
105	QTCOMMERCIALCHART_END_NAMESPACE	105	QTCOMMERCIALCHART_END_NAMESPACE
106		106
107	#endif /* SCROLLER_P_H_ */	107	#endif /* SCROLLER_P_H */

0

src/xychart/xychart_p.h +2 -2

             //
             // We mean it.
-            #ifndef XYCHARTITEM_H
+            #ifndef XYCHART_H
-            #define XYCHARTITEM_H
+            #define XYCHART_H
             #include "qchartglobal.h"
             #include "chartitem_p.h"

	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