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 CAF code changes to build on both Qt4 and Qt5

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-26 09:53:12 +01:00
parent 398a59d0a6
commit cc7269c717
17 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafFilePath.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <QMetaType>
#include <QString>
class QTextStream;

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp
View File

@@ -129,7 +129,7 @@ TEST(PdmReferenceHelperTest, ReferenceFrommRootToField)
QString refString = caf::PdmReferenceHelper::referenceFromRootToField(ihd1, &s3->m_dir);
QString expectedString = "m_dir m_simpleObjPtrField 2";
EXPECT_STREQ(expectedString.toAscii(), refString.toAscii());
EXPECT_STREQ(expectedString.toLatin1(), refString.toLatin1());
delete ihd1;
}
@@ -160,7 +160,7 @@ TEST(PdmReferenceHelperTest, ReferenceFrommRootToObject)
QString refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3);
QString expectedString = "m_simpleObjPtrField 2";
EXPECT_STREQ(expectedString.toAscii(), refString.toAscii());
EXPECT_STREQ(expectedString.toLatin1(), refString.toLatin1());
ReferenceSimpleObj* ihd2 = new ReferenceSimpleObj;
SimpleObj* s4 = new SimpleObj;