diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-06-07 09:00:10 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2021-06-07 10:29:55 +0200 |
commit | e68e73a1aaddba471e3755755a29986be790743a (patch) | |
tree | 4c50d44ae5105540a5e527ea1b1c16a64f44d063 | |
parent | ab81aa11060c004879c1dc11139bc09cbfca47cc (diff) |
Use empty string instead of QString("")
Fixes deprecation warnings like
declarativebarseries.cpp(38): warning C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
There is an API difference between a QString() and an empty string,
(QString::isNull), but a good API shouldn't rely on this.
Change-Id: I341b066758ce05a7578ebad8bb9c1df3f2ea5370
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r-- | src/chartsqml2/declarativeareaseries.cpp | 2 | ||||
-rw-r--r-- | src/chartsqml2/declarativebarseries.cpp | 5 | ||||
-rw-r--r-- | src/chartsqml2/declarativeboxplotseries.cpp | 4 | ||||
-rw-r--r-- | src/chartsqml2/declarativeboxplotseries_p.h | 2 | ||||
-rw-r--r-- | src/chartsqml2/declarativechart_p.h | 3 | ||||
-rw-r--r-- | src/chartsqml2/declarativepieseries.cpp | 2 | ||||
-rw-r--r-- | src/chartsqml2/declarativescatterseries.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/chartsqml2/declarativeareaseries.cpp b/src/chartsqml2/declarativeareaseries.cpp index 8a21d28f..f4913403 100644 --- a/src/chartsqml2/declarativeareaseries.cpp +++ b/src/chartsqml2/declarativeareaseries.cpp @@ -104,7 +104,7 @@ void DeclarativeAreaSeries::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QAreaSeries::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index f0243334..89ad3a8d 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -34,8 +34,7 @@ QT_BEGIN_NAMESPACE -DeclarativeBarSet::DeclarativeBarSet(QObject *parent) - : QBarSet("", parent) +DeclarativeBarSet::DeclarativeBarSet(QObject *parent) : QBarSet(QString(), parent) { connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int,int))); connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int,int))); @@ -131,7 +130,7 @@ void DeclarativeBarSet::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QBarSet::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index e588c413..bf0a6534 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -372,7 +372,7 @@ void DeclarativeBoxSet::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QBoxSet::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } @@ -492,7 +492,7 @@ void DeclarativeBoxPlotSeries::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QBoxPlotSeries::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } diff --git a/src/chartsqml2/declarativeboxplotseries_p.h b/src/chartsqml2/declarativeboxplotseries_p.h index 2585f0e4..c002b84e 100644 --- a/src/chartsqml2/declarativeboxplotseries_p.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -72,7 +72,7 @@ public: // duplicate from QBoxSet }; public: - explicit DeclarativeBoxSet(const QString label = "", QObject *parent = 0); + explicit DeclarativeBoxSet(const QString label = QString(), QObject *parent = 0); QVariantList values(); void setValues(QVariantList values); QString brushFilename() const; diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h index c6056030..17976faa 100644 --- a/src/chartsqml2/declarativechart_p.h +++ b/src/chartsqml2/declarativechart_p.h @@ -193,7 +193,8 @@ public: public: Q_INVOKABLE QAbstractSeries *series(int index); Q_INVOKABLE QAbstractSeries *series(QString seriesName); - Q_INVOKABLE QAbstractSeries *createSeries(int type, QString name = "", QAbstractAxis *axisX = 0, QAbstractAxis *axisY = 0); + Q_INVOKABLE QAbstractSeries *createSeries(int type, QString name = QString(), + QAbstractAxis *axisX = 0, QAbstractAxis *axisY = 0); Q_INVOKABLE void removeSeries(QAbstractSeries *series); Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); } Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index 362e3202..1ae3fa15 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -64,7 +64,7 @@ void DeclarativePieSlice::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QPieSlice::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } diff --git a/src/chartsqml2/declarativescatterseries.cpp b/src/chartsqml2/declarativescatterseries.cpp index 5f8756fd..c8357e2f 100644 --- a/src/chartsqml2/declarativescatterseries.cpp +++ b/src/chartsqml2/declarativescatterseries.cpp @@ -115,7 +115,7 @@ void DeclarativeScatterSeries::handleBrushChanged() // the brush file name needs to be cleared. if (!m_brushFilename.isEmpty() && QScatterSeries::brush().textureImage() != m_brushImage) { m_brushFilename.clear(); - emit brushFilenameChanged(QString("")); + emit brushFilenameChanged(QString()); } } |