summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-03-10 19:12:50 +0100
committerMarc Mutz <marc.mutz@kdab.com>2017-03-11 01:20:37 +0000
commit83a3deda6d9cca88e74041858e31262e832da582 (patch)
treee6aaa4b4dba10b6dbfab8655080ac226f5becb6f
parent54c920f3735d5302e1f6af7768c6a06f1dcd333f (diff)
Remove uses of QString::null
It's going to be deprecated. Change-Id: I9d176c802f27abf5c817dba8bedf9e5fcd911eca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp8
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis.cpp2
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis.cpp2
-rw-r--r--tests/manual/chartviewer/charts/axis/categoryaxis.cpp2
-rw-r--r--tests/manual/chartviewer/charts/axis/valueaxis.cpp2
-rw-r--r--tests/manual/chartviewer/charts/font/font.cpp2
-rw-r--r--tests/manual/chartviewer/charts/pieseries/donutchart.cpp2
-rw-r--r--tests/manual/chartviewer/charts/pieseries/piechart.cpp2
-rw-r--r--tests/manual/chartviewer/charts/size/sizecharts.cpp2
-rw-r--r--tests/manual/chartviewer/charts/xyseries/areachart.cpp2
-rw-r--r--tests/manual/chartviewer/charts/xyseries/linechart.cpp2
-rw-r--r--tests/manual/chartviewer/charts/xyseries/scatterchart.cpp2
-rw-r--r--tests/manual/chartviewer/charts/xyseries/splinechart.cpp2
13 files changed, 16 insertions, 16 deletions
diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
index efa02c15..2026359e 100644
--- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -270,7 +270,7 @@ void QBarCategoryAxis::remove(const QString &category)
d->updateCategoryDomain();
}
} else {
- setRange(QString::null, QString::null);
+ setRange(QString(), QString());
}
emit categoriesChanged();
emit countChanged();
@@ -339,7 +339,7 @@ void QBarCategoryAxis::clear()
{
Q_D(QBarCategoryAxis);
d->m_categories.clear();
- setRange(QString::null, QString::null);
+ setRange(QString(), QString());
emit categoriesChanged();
emit countChanged();
}
@@ -354,8 +354,8 @@ void QBarCategoryAxis::setCategories(const QStringList &categories)
{
Q_D(QBarCategoryAxis);
d->m_categories.clear();
- d->m_minCategory = QString::null;
- d->m_maxCategory = QString::null;
+ d->m_minCategory = QString();
+ d->m_maxCategory = QString();
d->m_min = 0;
d->m_max = 0;
d->m_count = 0;
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
index 8efe1139..47bed00f 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
@@ -380,7 +380,7 @@ QLogValueAxisPrivate::QLogValueAxisPrivate(QLogValueAxis *q)
m_base(10),
m_tickCount(0),
m_minorTickCount(0),
- m_labelFormat(QString::null)
+ m_labelFormat()
{
}
diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp
index 2b775e2a..e8f9698f 100644
--- a/src/charts/axis/valueaxis/qvalueaxis.cpp
+++ b/src/charts/axis/valueaxis/qvalueaxis.cpp
@@ -354,7 +354,7 @@ QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q)
m_max(0),
m_tickCount(5),
m_minorTickCount(0),
- m_format(QString::null),
+ m_format(),
m_applying(false)
{
diff --git a/tests/manual/chartviewer/charts/axis/categoryaxis.cpp b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp
index 37a2535f..ee42bb34 100644
--- a/tests/manual/chartviewer/charts/axis/categoryaxis.cpp
+++ b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp
@@ -37,7 +37,7 @@ class CategoryLineChart: public Chart
public:
QString name() { return QObject::tr("CategoryAxis"); }
QString category() { return QObject::tr("Axis"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/axis/valueaxis.cpp b/tests/manual/chartviewer/charts/axis/valueaxis.cpp
index 996c28d6..00a6baef 100644
--- a/tests/manual/chartviewer/charts/axis/valueaxis.cpp
+++ b/tests/manual/chartviewer/charts/axis/valueaxis.cpp
@@ -38,7 +38,7 @@ class ValueAxis: public Chart
public:
QString name() { return "ValueAxis"; }
QString category() { return QObject::tr("Axis"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/font/font.cpp b/tests/manual/chartviewer/charts/font/font.cpp
index f29db8fb..713b28c8 100644
--- a/tests/manual/chartviewer/charts/font/font.cpp
+++ b/tests/manual/chartviewer/charts/font/font.cpp
@@ -37,7 +37,7 @@ public:
FontChart(int fontSize): m_fontSize(fontSize) {};
QString name() { return QObject::tr("Font") + " " + QString::number(m_fontSize); }
QString category() { return QObject::tr("Font"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/pieseries/donutchart.cpp b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp
index 9bd4ef4a..8e297e6a 100644
--- a/tests/manual/chartviewer/charts/pieseries/donutchart.cpp
+++ b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp
@@ -36,7 +36,7 @@ class DonutChart: public Chart
public:
QString name() { return QObject::tr("DonutChart"); }
QString category() { return QObject::tr("PieSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/pieseries/piechart.cpp b/tests/manual/chartviewer/charts/pieseries/piechart.cpp
index ba63ea42..32d0aa4b 100644
--- a/tests/manual/chartviewer/charts/pieseries/piechart.cpp
+++ b/tests/manual/chartviewer/charts/pieseries/piechart.cpp
@@ -36,7 +36,7 @@ class PieChart: public Chart
public:
QString name() { return QObject::tr("PieChart"); }
QString category() { return QObject::tr("PieSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/size/sizecharts.cpp b/tests/manual/chartviewer/charts/size/sizecharts.cpp
index 5112c902..22197d99 100644
--- a/tests/manual/chartviewer/charts/size/sizecharts.cpp
+++ b/tests/manual/chartviewer/charts/size/sizecharts.cpp
@@ -37,7 +37,7 @@ class SizeChart: public Chart
public:
QString name() { return QObject::tr("PlotArea"); }
QString category() { return QObject::tr("Size"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/xyseries/areachart.cpp b/tests/manual/chartviewer/charts/xyseries/areachart.cpp
index aadd93ce..3faa7031 100644
--- a/tests/manual/chartviewer/charts/xyseries/areachart.cpp
+++ b/tests/manual/chartviewer/charts/xyseries/areachart.cpp
@@ -37,7 +37,7 @@ class AreaChart: public Chart
public:
QString name() { return QObject::tr("AreaChart"); }
QString category() { return QObject::tr("XYSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/xyseries/linechart.cpp b/tests/manual/chartviewer/charts/xyseries/linechart.cpp
index ca5e8407..2e23c2b6 100644
--- a/tests/manual/chartviewer/charts/xyseries/linechart.cpp
+++ b/tests/manual/chartviewer/charts/xyseries/linechart.cpp
@@ -36,7 +36,7 @@ class LineChart: public Chart
public:
QString name() { return QObject::tr("LineChart"); }
QString category() { return QObject::tr("XYSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp
index 54f5a5cc..deb366f6 100644
--- a/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp
+++ b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp
@@ -36,7 +36,7 @@ class ScatterChart: public Chart
public:
QString name() { return QObject::tr("ScatterChart"); }
QString category() { return QObject::tr("XYSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{
diff --git a/tests/manual/chartviewer/charts/xyseries/splinechart.cpp b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp
index 699b2afa..3e9db5cd 100644
--- a/tests/manual/chartviewer/charts/xyseries/splinechart.cpp
+++ b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp
@@ -36,7 +36,7 @@ class SplineChart: public Chart
public:
QString name() { return QObject::tr("SplineChart"); }
QString category() { return QObject::tr("XYSeries"); }
- QString subCategory() { return QString::null; }
+ QString subCategory() { return QString(); }
QChart *createChart(const DataTable &table)
{