OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: string-related deprecations.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-10-02 11:08:45 +02:00
parent 835cf4a53c
commit 58656f900b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp
View File

@@ -277,7 +277,7 @@ QString caf::PdmPythonGenerator::generate( PdmObjectFactory* factory, std::vecto
QString snake_method_name = camelToSnakeCase( methodName );
if ( classMethodsGenerated[classKeyword][snake_method_name].count() ) continue;
if ( classMethodsGenerated[classKeyword][snake_method_name].length() ) continue;
QStringList inputArgumentStrings;
QStringList outputArgumentStrings;

4
Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp
View File

@@ -66,13 +66,13 @@ QString Utils::toQString(const cvf::String& cvfString)
if (sizeof(wchar_t) == 2)
{
const unsigned short* strPtr = reinterpret_cast<const unsigned short*>(cvfString.c_str());
const char16_t* strPtr = reinterpret_cast<const char16_t*>(cvfString.c_str());
return QString::fromUtf16(strPtr);
}
else if (sizeof(wchar_t) == 4)
{
const unsigned int* strPtr = reinterpret_cast<const unsigned int*>(cvfString.c_str());
const char32_t* strPtr = reinterpret_cast<const char32_t*>(cvfString.c_str());
return QString::fromUcs4(strPtr);
}