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

#1260 Replaced assert() with CAF_ASSERT() in AppFwk

Browse Source
This commit is contained in:
Magne Sjaastad
2017-03-08 08:19:51 +01:00
parent a16a0a3bb5
commit 6791600d03
63 changed files with 198 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp
View File

@@ -1,13 +1,12 @@
#include "cafPdmUiObjectHandle.h"
#include "cafAssert.h"
#include "cafPdmFieldHandle.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiOrdering.h"
#include "cafPdmUiTreeOrdering.h"
#include <assert.h>
namespace caf
{
@@ -28,7 +27,7 @@ PdmUiObjectHandle* uiObj(PdmObjectHandle* obj)
{
if (!obj) return NULL;
PdmUiObjectHandle* uiObject = obj->capability<PdmUiObjectHandle>();
assert(uiObject);
CAF_ASSERT(uiObject);
return uiObject;
}
@@ -84,7 +83,7 @@ void PdmUiObjectHandle::objectEditorAttribute(QString uiConfigName, PdmUiEditorA
//--------------------------------------------------------------------------------------------------
PdmUiTreeOrdering* PdmUiObjectHandle::uiTreeOrdering(QString uiConfigName /*= ""*/)
{
assert(this); // This method actually is possible to call on a NULL ptr without getting a crash, so we assert instead.
CAF_ASSERT(this); // This method actually is possible to call on a NULL ptr without getting a crash, so we assert instead.
PdmUiTreeOrdering* uiTreeOrdering = new PdmUiTreeOrdering(NULL, m_owner);
@@ -231,7 +230,7 @@ void PdmUiObjectHandle::updateUiIconFromToggleField()
PdmUiObjectHandle* PdmObjectHandle::uiCapability() const
{
PdmUiObjectHandle* uiField = capability<PdmUiObjectHandle>();
assert(uiField);
CAF_ASSERT(uiField);
return uiField;
}