From 0ae746ae595bc9b9c2c734aded077eed5079cbf8 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 3 Dec 2019 17:53:50 +0100
Subject: [PATCH] Convert QString and SensorDataType to std::string.
---
Applications/FileIO/XmlIO/Qt/XmlLutReader.h | 3 ++-
Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp | 4 ++--
GeoLib/SensorData.cpp | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
index b861efffd1e..4cbd0e74721 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlLutReader.h
@@ -36,7 +36,8 @@ public:
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
- ERR("XmlLutReader::readFromFile(): Can't open xml-file %s.", fileName.data());
+ ERR("XmlLutReader::readFromFile(): Can't open xml-file {s}.",
+ fileName.toStdString());
return false;
}
diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
index d2d73642c0b..1c6817bf9c3 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
@@ -119,8 +119,8 @@ int XmlPrjInterface::readFile(const QString& fileName)
}
if (meshes_node.nodeName() != "mesh")
{
- ERR("Expected an XML element node named 'mesh' got '%s'.",
- meshes_node.nodeName().data())
+ ERR("Expected an XML element node named 'mesh' got '{s}'.",
+ meshes_node.nodeName().toStdString());
return 0;
}
if (meshes_node.childNodes().count() != 1)
diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp
index 693e26ecbe4..9604040cfa4 100644
--- a/GeoLib/SensorData.cpp
+++ b/GeoLib/SensorData.cpp
@@ -85,8 +85,8 @@ const std::vector<float>* SensorData::getTimeSeries(SensorDataType time_series_n
return _data_vecs[i];
}
}
- ERR("Error in SensorData::getTimeSeries() - Time series '%d' not found.",
- time_series_name);
+ ERR("Error in SensorData::getTimeSeries() - Time series '{s}' not found.",
+ convertSensorDataType2String(time_series_name));
return nullptr;
}
--
GitLab