Skip to content
Snippets Groups Projects
Commit 0ae746ae authored by Dmitri Naumov's avatar Dmitri Naumov Committed by Dmitri Naumov
Browse files

Convert QString and SensorDataType to std::string.

parent 8d12df48
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,8 @@ public: ...@@ -36,7 +36,8 @@ public:
QFile file(fileName); QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) 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; return false;
} }
......
...@@ -119,8 +119,8 @@ int XmlPrjInterface::readFile(const QString& fileName) ...@@ -119,8 +119,8 @@ int XmlPrjInterface::readFile(const QString& fileName)
} }
if (meshes_node.nodeName() != "mesh") if (meshes_node.nodeName() != "mesh")
{ {
ERR("Expected an XML element node named 'mesh' got '%s'.", ERR("Expected an XML element node named 'mesh' got '{s}'.",
meshes_node.nodeName().data()) meshes_node.nodeName().toStdString());
return 0; return 0;
} }
if (meshes_node.childNodes().count() != 1) if (meshes_node.childNodes().count() != 1)
......
...@@ -85,8 +85,8 @@ const std::vector<float>* SensorData::getTimeSeries(SensorDataType time_series_n ...@@ -85,8 +85,8 @@ const std::vector<float>* SensorData::getTimeSeries(SensorDataType time_series_n
return _data_vecs[i]; return _data_vecs[i];
} }
} }
ERR("Error in SensorData::getTimeSeries() - Time series '%d' not found.", ERR("Error in SensorData::getTimeSeries() - Time series '{s}' not found.",
time_series_name); convertSensorDataType2String(time_series_name));
return nullptr; return nullptr;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment