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

#3752 ResInsight code changes to build on both Qt4 and Qt5

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-26 09:53:43 +01:00
parent ddb546d877
commit 5c66b901c3
19 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -355,7 +355,7 @@ void RifEclipseInputFileTools::findKeywordsOnFile(const QString &fileName, std::
lineLength = data.readLine(buf, sizeof(buf));
if (lineLength > 0)
{
line = QString::fromAscii(buf);
line = QString::fromLatin1(buf);
if (line.size() && line[0].isLetter())
{
RifKeywordAndFilePos keyPos;
@@ -400,7 +400,7 @@ void RifEclipseInputFileTools::parseAndReadPathAliasKeyword(const QString &fileN
qint64 lineLength = data.readLine(buf, sizeof(buf));
if (lineLength > 0)
{
line = QString::fromAscii(buf);
line = QString::fromLatin1(buf);
if (line.size() && (line[0].isLetter() || foundPathsKeyword))
{
line = line.trimmed();