From cd25e56e1e25285fe00c7f41fd1e33b7023a594f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Traizet?= <cedric.traizet@c-s.fr>
Date: Thu, 27 Aug 2020 15:47:57 +0200
Subject: [PATCH] WRG: fix deprecation warnings from Qt
---
.../MonteverdiCore/include/mvdHistogramModel.h | 6 +++---
.../Visualization/MonteverdiCore/src/mvdHistogramModel.cxx | 4 ++--
.../MonteverdiGui/src/mvdHistogramPlotPicker.cxx | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h b/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
index 6286b28b9c..5a7f30e4ea 100644
--- a/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
+++ b/Modules/Visualization/MonteverdiCore/include/mvdHistogramModel.h
@@ -433,9 +433,9 @@ HistogramModel
template <typename TImageModel>
void HistogramModel::template_BuildModel_M(BuildContext*)
{
- QTime lMain;
- QTime lPass1;
- QTime lPass2;
+ QElapsedTimer lMain;
+ QElapsedTimer lPass1;
+ QElapsedTimer lPass2;
lMain.start();
diff --git a/Modules/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx b/Modules/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx
index e72f6d7b3a..658600e642 100644
--- a/Modules/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx
+++ b/Modules/Visualization/MonteverdiCore/src/mvdHistogramModel.cxx
@@ -332,7 +332,7 @@ void HistogramModel::virtual_Read(QIODevice* device)
qDebug() << tr("%1: Reading histogram...").arg(QDateTime::currentDateTime().toString(Qt::ISODate));
- QTime time;
+ QElapsedTimer time;
time.start();
@@ -385,7 +385,7 @@ void HistogramModel::virtual_Write(QIODevice& device) const
qDebug() << tr("%1: Writing histogram...").arg(QDateTime::currentDateTime().toString(Qt::ISODate));
- QTime time;
+ QElapsedTimer time;
time.start();
#if 0
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdHistogramPlotPicker.cxx b/Modules/Visualization/MonteverdiGui/src/mvdHistogramPlotPicker.cxx
index baf0cdb134..badc027e16 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdHistogramPlotPicker.cxx
+++ b/Modules/Visualization/MonteverdiGui/src/mvdHistogramPlotPicker.cxx
@@ -214,10 +214,10 @@ QwtText HistogramPlotPicker::trackerTextF(const QPointF& point) const
return QwtPlotPicker::trackerTextF(point);
if (!isActive())
- return QwtText(QString().sprintf("%.4f, %.4f", point.x(), point.y()));
+ return QwtText(QString("%.4f, %.4f").arg(point.x()).arg(point.y()));
QString text;
- text.sprintf("%.4f", point.x());
+ text = QString("%.4f").arg(point.x());
CountType start = 0;
CountType stop = 0;
@@ -232,7 +232,7 @@ QwtText HistogramPlotPicker::trackerTextF(const QPointF& point) const
Find(m_PlotCurves[i], point.x(), c0, c1, cf);
- text.append(QString().sprintf("\n[%.4f; %.4f[, %.0f", c0, c1, cf));
+ text.append(QString("\n[%.4f; %.4f[, %.0f").arg(c0).arg(c1).arg(cf));
}
return text;
--
GitLab