HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1032:f1315a97f81e

config.pri +1 -1

                     }
                 }
-            }else {
+            } else {
                 CONFIG += qtcommercialchart

examples/customchart/main.cpp +2 -2

             //![3]
             //![4]
-                QChartAxisCategories* categoriesX = chart->axisX()->categories();
+                QAxisCategories* categoriesX = chart->axisX()->categories();
                 categoriesX->insert(1,"low");
                 categoriesX->insert(5,"optimal");
                 categoriesX->insert(10,"high");
-                QChartAxisCategories* categoriesY = chart->axisY()->categories();
+                QAxisCategories* categoriesY = chart->axisY()->categories();
                 categoriesY->insert(1,"slow");
                 categoriesY->insert(5,"med");
                 categoriesY->insert(10,"fast");

src/axis/axis.pri +3 -3

             SOURCES += \
                 $$PWD/chartaxis.cpp \
                 $$PWD/qaxis.cpp \
-                $$PWD/qchartaxiscategories.cpp
+                $$PWD/qaxiscategories.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartaxis_p.h \
                 $$PWD/qaxis_p.h \
-                $$PWD/qchartaxiscategories_p.h
+                $$PWD/qaxiscategories_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qaxis.h \
-                $$PWD/qchartaxiscategories.h   
  No newline at end of file
+                $$PWD/qaxiscategories.h   
  No newline at end of file

src/axis/chartaxis.cpp +2 -2

             #include "chartaxis_p.h"
             #include "qaxis.h"
             #include "qaxis_p.h"
-            #include "qchartaxiscategories_p.h"
+            #include "qaxiscategories_p.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
                 Q_ASSERT(max>=min);
                 Q_ASSERT(ticks>1);
-                QChartAxisCategories* categories = m_chartAxis->categories();
+                QAxisCategories* categories = m_chartAxis->categories();
                 bool category = categories->count()>0;

src/axis/qaxis.cpp +1 -1

                 return d_ptr->m_niceNumbers;
             }
-            QChartAxisCategories* QAxis::categories()
+            QAxisCategories* QAxis::categories()
             {
                 return &d_ptr->m_category;
             }

src/axis/qaxis.h +2 -2

             #define QAXIS_H
             #include <qchartglobal.h>
-            #include <qchartaxiscategories.h>
+            #include <qaxiscategories.h>
             #include <QPen>
             #include <QFont>
                 void setNiceNumbersEnabled(bool enable = true);
                 bool niceNumbersEnabled() const;
-                QChartAxisCategories* categories();
+                QAxisCategories* categories();
                 void show();
                 void hide();

src/axis/qaxis_p.h +1 -1

                 qreal m_max;
                 int m_ticksCount;
-                QChartAxisCategories m_category;
+                QAxisCategories m_category;
                 bool m_niceNumbers;

src/axis/qaxiscategories.cpp ~~src/axis/qchartaxiscategories.cpp~~ renamed +16 -16

             **
             ****************************************************************************/
-            #include "qchartaxiscategories.h"
+            #include "qaxiscategories.h"
-            #include "qchartaxiscategories_p.h"
+            #include "qaxiscategories_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QChartAxisCategories::QChartAxisCategories():
+            QAxisCategories::QAxisCategories():
-            d_ptr(new QChartAxisCategoriesPrivate(this))
+            d_ptr(new QAxisCategoriesPrivate(this))
             {
             }
-            QChartAxisCategories::~QChartAxisCategories()
+            QAxisCategories::~QAxisCategories()
             {
             }
-            void QChartAxisCategories::insert(const QBarCategories &categories)
+            void QAxisCategories::insert(const QBarCategories &categories)
             {
                 int i=1;
                 foreach (const QString& string , categories) {
                 emit d_ptr->updated();
             }
-            void QChartAxisCategories::insert(qreal value,QString label)
+            void QAxisCategories::insert(qreal value,QString label)
             {
                 d_ptr->m_map.insert(value,label);
                 emit d_ptr->updated();
             }
-            void QChartAxisCategories::remove(qreal value)
+            void QAxisCategories::remove(qreal value)
             {
                 d_ptr->m_map.remove(value);
                 emit d_ptr->updated();
             }
-            void QChartAxisCategories::clear()
+            void QAxisCategories::clear()
             {
                 d_ptr->m_map.clear();
                 emit d_ptr->updated();
             }
-            int QChartAxisCategories::count()
+            int QAxisCategories::count()
             {
                 return d_ptr->m_map.count();
             }
-            QList<qreal> QChartAxisCategories::values() const
+            QList<qreal> QAxisCategories::values() const
             {
                 return d_ptr->m_map.keys();
             }
-            QString QChartAxisCategories::label(qreal value) const
+            QString QAxisCategories::label(qreal value) const
             {
                 return d_ptr->m_map.value(value);
             }
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QChartAxisCategoriesPrivate::QChartAxisCategoriesPrivate(QChartAxisCategories *q):
+            QAxisCategoriesPrivate::QAxisCategoriesPrivate(QAxisCategories *q):
             q_ptr(q)
             {
             }
-            QChartAxisCategoriesPrivate::~QChartAxisCategoriesPrivate()
+            QAxisCategoriesPrivate::~QAxisCategoriesPrivate()
             {
             }
-            #include "moc_qchartaxiscategories.cpp"
+            #include "moc_qaxiscategories.cpp"
-            #include "moc_qchartaxiscategories_p.cpp"
+            #include "moc_qaxiscategories_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qaxiscategories.h ~~src/axis/qchartaxiscategories.h~~ renamed +7 -7

             **
             ****************************************************************************/
-            #ifndef QCHARTAXISCATEGORIES_H
+            #ifndef QAXISCATEGORIES_H
-            #define QCHARTAXISCATEGORIES_H
+            #define QAXISCATEGORIES_H
             #include <qchartglobal.h>
             #include <qbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QChartAxisCategoriesPrivate;
+            class QAxisCategoriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QChartAxisCategories : public QObject
+            class QTCOMMERCIALCHART_EXPORT QAxisCategories : public QObject
             {
                 Q_OBJECT
             private:
-                QChartAxisCategories();
+                QAxisCategories();
             public:
-                ~QChartAxisCategories();
+                ~QAxisCategories();
                 void insert(const QBarCategories &category);
                 void insert(qreal value,QString label);
                 int count();
             private:
-                QScopedPointer<QChartAxisCategoriesPrivate> d_ptr;
+                QScopedPointer<QAxisCategoriesPrivate> d_ptr;
                 friend class QAxisPrivate;
                 friend class ChartAxis;
             };

src/axis/qaxiscategories_p.h ~~src/axis/qchartaxiscategories_p.h~~ renamed +8 -8

             //
             // We mean it.
-            #ifndef QCHARTAXISCATEGORIES_P_H
+            #ifndef QAXISCATEGORIES_P_H
-            #define QCHARTAXISCATEGORIES_P_H
+            #define QAXISCATEGORIES_P_H
-            #include "qchartaxiscategories.h"
+            #include "qaxiscategories.h"
             #include <QMap>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QChartAxisCategoriesPrivate : public QObject
+            class QAxisCategoriesPrivate : public QObject
             {
                 Q_OBJECT
             public:
-                QChartAxisCategoriesPrivate(QChartAxisCategories *q);
+                QAxisCategoriesPrivate(QAxisCategories *q);
-                ~QChartAxisCategoriesPrivate();
+                ~QAxisCategoriesPrivate();
             Q_SIGNALS:
                 void updated();
             private:
-                QChartAxisCategories *q_ptr;
+                QAxisCategories *q_ptr;
                 QMap<qreal,QString> m_map;
-                friend class QChartAxisCategories;
+                friend class QAxisCategories;
             };

src/barchart/barchartitem.cpp 0 -2

             #include "qbarseries.h"
             #include "qbarseries_p.h"
             #include "qchart.h"
-            //#include "qchartaxis.h"
-            #include "qchartaxiscategories.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include "chartdataset_p.h"

src/barchart/barchartitem_p.h +1 -1

             class Bar;
             class BarLabel;
-            class QChartAxisCategories;
+            class QAxisCategories;
             class QChart;
             //typedef QVector<QRectF> BarLayout;

src/chartdataset.cpp +1 -1

             void ChartDataSet::setupCategories(QBarSeries* series)
             {
-               QChartAxisCategories* categories = axisX()->categories();
+               QAxisCategories* categories = axisX()->categories();
                categories->clear();
                categories->insert(series->categories());
             }

	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