@@ -26,7 +26,7 | |||
|
26 | 26 | #include "declarativepieseries.h" |
|
27 | 27 | #include "declarativesplineseries.h" |
|
28 | 28 | #include "declarativescatterseries.h" |
|
29 |
#include "qbarcategor |
|
|
29 | #include "qbarcategoryaxis.h" | |
|
30 | 30 | |
|
31 | 31 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
32 | 32 |
@@ -23,7 +23,7 | |||
|
23 | 23 | #include "qchart.h" |
|
24 | 24 | #include "qabstractaxis.h" |
|
25 | 25 | #include "qvalueaxis.h" |
|
26 |
#include "qbarcategor |
|
|
26 | #include "qbarcategoryaxis.h" | |
|
27 | 27 | #include "declarativechart.h" |
|
28 | 28 | #include "declarativexypoint.h" |
|
29 | 29 | #include "declarativelineseries.h" |
@@ -2,13 +2,13 | |||
|
2 | 2 | |
|
3 | 3 | INCLUDEPATH += $$PWD \ |
|
4 | 4 | $$PWD/valueaxis \ |
|
5 |
$$PWD/categor |
|
|
5 | $$PWD/barcategoryaxis \ | |
|
6 | 6 | $$PWD/intervalsaxis \ |
|
7 | 7 | $$PWD/datetimeaxis |
|
8 | 8 | |
|
9 | 9 | DEPENDPATH += $$PWD \ |
|
10 | 10 | $$PWD/valueaxis \ |
|
11 |
$$PWD/categor |
|
|
11 | $$PWD/barcategoryaxis \ | |
|
12 | 12 | $$PWD/intervalsaxis \ |
|
13 | 13 | $$PWD/datetimeaxis |
|
14 | 14 | |
@@ -18,9 +18,9 SOURCES += \ | |||
|
18 | 18 | $$PWD/valueaxis/chartvalueaxisx.cpp \ |
|
19 | 19 | $$PWD/valueaxis/chartvalueaxisy.cpp \ |
|
20 | 20 | $$PWD/valueaxis/qvalueaxis.cpp \ |
|
21 |
$$PWD/categor |
|
|
22 |
$$PWD/categor |
|
|
23 |
$$PWD/categor |
|
|
21 | $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \ | |
|
22 | $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \ | |
|
23 | $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \ | |
|
24 | 24 | $$PWD/intervalsaxis/chartintervalsaxisx.cpp \ |
|
25 | 25 | $$PWD/intervalsaxis/chartintervalsaxisy.cpp \ |
|
26 | 26 | $$PWD/intervalsaxis/qintervalsaxis.cpp \ |
@@ -34,9 +34,9 PRIVATE_HEADERS += \ | |||
|
34 | 34 | $$PWD/valueaxis/chartvalueaxisx_p.h \ |
|
35 | 35 | $$PWD/valueaxis/chartvalueaxisy_p.h \ |
|
36 | 36 | $$PWD/valueaxis/qvalueaxis_p.h \ |
|
37 |
$$PWD/categor |
|
|
38 |
$$PWD/categor |
|
|
39 |
$$PWD/categor |
|
|
37 | $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \ | |
|
38 | $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \ | |
|
39 | $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \ | |
|
40 | 40 | $$PWD/intervalsaxis/chartintervalsaxisx_p.h \ |
|
41 | 41 | $$PWD/intervalsaxis/chartintervalsaxisy_p.h \ |
|
42 | 42 | $$PWD/intervalsaxis/qintervalsaxis_p.h \ |
@@ -47,6 +47,6 PRIVATE_HEADERS += \ | |||
|
47 | 47 | PUBLIC_HEADERS += \ |
|
48 | 48 | $$PWD/qabstractaxis.h \ |
|
49 | 49 | $$PWD/valueaxis/qvalueaxis.h \ |
|
50 |
$$PWD/categor |
|
|
50 | $$PWD/barcategoryaxis/qbarcategoryaxis.h \ | |
|
51 | 51 | $$PWD/intervalsaxis/qintervalsaxis.h \ |
|
52 | 52 | $$PWD/datetimeaxis/qdatetimeaxis.h |
@@ -18,9 +18,9 | |||
|
18 | 18 | ** |
|
19 | 19 | ****************************************************************************/ |
|
20 | 20 | |
|
21 |
#include "chartcategor |
|
|
21 | #include "chartbarcategoryaxisx_p.h" | |
|
22 | 22 | #include "chartpresenter_p.h" |
|
23 |
#include "qbarcategor |
|
|
23 | #include "qbarcategoryaxis_p.h" | |
|
24 | 24 | #include <QDebug> |
|
25 | 25 | #include <qmath.h> |
|
26 | 26 |
|
1 | NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisx_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h |
@@ -18,9 +18,9 | |||
|
18 | 18 | ** |
|
19 | 19 | ****************************************************************************/ |
|
20 | 20 | |
|
21 |
#include "chartcategor |
|
|
21 | #include "chartbarcategoryaxisy_p.h" | |
|
22 | 22 | #include "chartpresenter_p.h" |
|
23 |
#include "qbarcategor |
|
|
23 | #include "qbarcategoryaxis_p.h" | |
|
24 | 24 | #include <qmath.h> |
|
25 | 25 | |
|
26 | 26 | static int label_padding = 5; |
|
1 | NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisy_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h |
@@ -18,10 +18,10 | |||
|
18 | 18 | ** |
|
19 | 19 | ****************************************************************************/ |
|
20 | 20 | |
|
21 |
#include "qbarcategor |
|
|
22 |
#include "qbarcategor |
|
|
23 |
#include "chartcategor |
|
|
24 |
#include "chartcategor |
|
|
21 | #include "qbarcategoryaxis.h" | |
|
22 | #include "qbarcategoryaxis_p.h" | |
|
23 | #include "chartbarcategoryaxisx_p.h" | |
|
24 | #include "chartbarcategoryaxisy_p.h" | |
|
25 | 25 | #include "domain_p.h" |
|
26 | 26 | #include "chartdataset_p.h" |
|
27 | 27 | #include <qmath.h> |
@@ -465,7 +465,7 void QBarCategoryAxisPrivate::intializeDomain(Domain* domain) | |||
|
465 | 465 | } |
|
466 | 466 | } |
|
467 | 467 | |
|
468 |
#include "moc_qbarcategor |
|
|
469 |
#include "moc_qbarcategor |
|
|
468 | #include "moc_qbarcategoryaxis.cpp" | |
|
469 | #include "moc_qbarcategoryaxis_p.cpp" | |
|
470 | 470 | |
|
471 | 471 | QTCOMMERCIALCHART_END_NAMESPACE |
|
1 | NO CONTENT: file renamed from src/axis/categoriesaxis/qbarcategoriesaxis.h to src/axis/barcategoryaxis/qbarcategoryaxis.h |
@@ -30,7 +30,7 | |||
|
30 | 30 | #ifndef QBARCATEGORIESAXIS_P_H |
|
31 | 31 | #define QBARCATEGORIESAXIS_P_H |
|
32 | 32 | |
|
33 |
#include "qbarcategor |
|
|
33 | #include "qbarcategoryaxis.h" | |
|
34 | 34 | #include "qabstractaxis_p.h" |
|
35 | 35 | |
|
36 | 36 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
@@ -22,7 +22,7 | |||
|
22 | 22 | #include "qhorizontalbarseries_p.h" |
|
23 | 23 | #include "horizontalbarchartitem_p.h" |
|
24 | 24 | #include "horizontalbaranimation_p.h" |
|
25 |
#include "qbarcategor |
|
|
25 | #include "qbarcategoryaxis.h" | |
|
26 | 26 | |
|
27 | 27 | #include "chartdataset_p.h" |
|
28 | 28 | #include "charttheme_p.h" |
@@ -27,7 +27,7 | |||
|
27 | 27 | #include "chartdataset_p.h" |
|
28 | 28 | #include "charttheme_p.h" |
|
29 | 29 | #include "qvalueaxis.h" |
|
30 |
#include "qbarcategor |
|
|
30 | #include "qbarcategoryaxis.h" | |
|
31 | 31 | |
|
32 | 32 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
33 | 33 |
@@ -25,7 +25,7 | |||
|
25 | 25 | #include "charttheme_p.h" |
|
26 | 26 | #include "baranimation_p.h" |
|
27 | 27 | #include "qvalueaxis.h" |
|
28 |
#include "qbarcategor |
|
|
28 | #include "qbarcategoryaxis.h" | |
|
29 | 29 | |
|
30 | 30 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
31 | 31 |
@@ -21,7 +21,7 | |||
|
21 | 21 | #include "chartdataset_p.h" |
|
22 | 22 | #include "qchart.h" |
|
23 | 23 | #include "qvalueaxis.h" |
|
24 |
#include "qbarcategor |
|
|
24 | #include "qbarcategoryaxis.h" | |
|
25 | 25 | #include "qvalueaxis_p.h" |
|
26 | 26 | #include "qintervalsaxis.h" |
|
27 | 27 | #include "qdatetimeaxis.h" |
@@ -23,7 +23,7 SUBDIRS += \ | |||
|
23 | 23 | qvalueaxis \ |
|
24 | 24 | qintervalsaxis \ |
|
25 | 25 | qdatetimeaxis \ |
|
26 |
qbarcategor |
|
|
26 | qbarcategoryaxis | |
|
27 | 27 | |
|
28 | 28 | test_private:{ |
|
29 | 29 | SUBDIRS += domain chartdataset |
@@ -21,7 +21,7 | |||
|
21 | 21 | #include <QtTest/QtTest> |
|
22 | 22 | #include <qabstractaxis.h> |
|
23 | 23 | #include <qvalueaxis.h> |
|
24 |
#include <qbarcategor |
|
|
24 | #include <qbarcategoryaxis.h> | |
|
25 | 25 | #include <qlineseries.h> |
|
26 | 26 | #include <qareaseries.h> |
|
27 | 27 | #include <qscatterseries.h> |
@@ -2,4 +2,4 | |||
|
2 | 2 | error( "Couldn't find the auto.pri file!" ) |
|
3 | 3 | } |
|
4 | 4 | HEADERS += ../qabstractaxis/tst_qabstractaxis.h |
|
5 |
SOURCES += tst_qbarcategor |
|
|
5 | SOURCES += tst_qbarcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp |
@@ -21,7 +21,7 | |||
|
21 | 21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
22 | 22 | #include <qbarseries.h> |
|
23 | 23 | #include <qbarset.h> |
|
24 |
#include <qbarcategor |
|
|
24 | #include <qbarcategoryaxis.h> | |
|
25 | 25 | |
|
26 | 26 | class tst_QBarCategoriesAxis: public tst_QAbstractAxis |
|
27 | 27 | { |
@@ -34,8 +34,8 public slots: | |||
|
34 | 34 | void cleanup(); |
|
35 | 35 | |
|
36 | 36 | private slots: |
|
37 |
void qbarcategor |
|
|
38 |
void qbarcategor |
|
|
37 | void qbarcategoryaxis_data(); | |
|
38 | void qbarcategoryaxis(); | |
|
39 | 39 | |
|
40 | 40 | void append_data(); |
|
41 | 41 | void append(); |
@@ -129,11 +129,11 void tst_QBarCategoriesAxis::cleanup() | |||
|
129 | 129 | tst_QAbstractAxis::cleanup(); |
|
130 | 130 | } |
|
131 | 131 | |
|
132 |
void tst_QBarCategoriesAxis::qbarcategor |
|
|
132 | void tst_QBarCategoriesAxis::qbarcategoryaxis_data() | |
|
133 | 133 | { |
|
134 | 134 | } |
|
135 | 135 | |
|
136 |
void tst_QBarCategoriesAxis::qbarcategor |
|
|
136 | void tst_QBarCategoriesAxis::qbarcategoryaxis() | |
|
137 | 137 | { |
|
138 | 138 | qabstractaxis(); |
|
139 | 139 | QBarCategoryAxis axis; |
@@ -645,5 +645,5 void tst_QBarCategoriesAxis::autoscale() | |||
|
645 | 645 | |
|
646 | 646 | |
|
647 | 647 | QTEST_MAIN(tst_QBarCategoriesAxis) |
|
648 |
#include "tst_qbarcategor |
|
|
648 | #include "tst_qbarcategoryaxis.moc" | |
|
649 | 649 |
General Comments 0
You need to be logged in to leave comments.
Login now