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

System : Replaced tab with four spaces in AppFwk

Browse Source
This commit is contained in:
Magne Sjaastad
2015-10-23 15:21:23 +02:00
parent 4de95c2092
commit fb55b469a0
42 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h
View File

@@ -47,7 +47,7 @@ public:
// Access operators
/*Conversion*/ operator DataType* () const { return m_fieldValue; }
DataType* operator->() const { return m_fieldValue; }
DataType* operator->() const { return m_fieldValue; }
const PdmPointer<DataType>& operator()() const { return m_fieldValue; }
const PdmPointer<DataType>& v() const { return m_fieldValue; }

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.cpp
View File

@@ -72,12 +72,12 @@ bool PdmFieldHandle::hasPtrReferencedObjects()
/*
PdmUiFieldHandle* PdmFieldHandle::uiCapability()
{
return NULL;
return NULL;
}
PdmXmlFieldHandle* PdmFieldHandle::xmlCapability()
{
return NULL;
return NULL;
}
*/

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h
View File

@@ -41,8 +41,8 @@ public:
template <typename CapabilityType>
CapabilityType* capability();
PdmUiFieldHandle* uiCapability();
PdmXmlFieldHandle* xmlCapability();
PdmUiFieldHandle* uiCapability();
PdmXmlFieldHandle* xmlCapability();
private:
PDM_DISABLE_COPY_AND_ASSIGN(PdmFieldHandle);

8
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.cpp
View File

@@ -42,9 +42,9 @@ void PdmObjectHandle::fields(std::vector<PdmFieldHandle*>& fields) const
//--------------------------------------------------------------------------------------------------
void PdmObjectHandle::setAsParentField(PdmFieldHandle* parentField)
{
assert(m_parentField == NULL);
assert(m_parentField == NULL);
m_parentField = parentField;
m_parentField = parentField;
}
//--------------------------------------------------------------------------------------------------
@@ -52,9 +52,9 @@ void PdmObjectHandle::setAsParentField(PdmFieldHandle* parentField)
//--------------------------------------------------------------------------------------------------
void PdmObjectHandle::removeAsParentField(PdmFieldHandle* parentField)
{
assert(m_parentField == parentField);
assert(m_parentField == parentField);
m_parentField = NULL;
m_parentField = NULL;
}

10
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPointer.h
View File

@@ -84,12 +84,12 @@ public :
{ PdmPointerImpl::addReference(&m_object); }
inline ~PdmPointer () { PdmPointerImpl::removeReference(&m_object); }
T* p() const { return static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
bool isNull() const { return !m_object; }
bool notNull() const { return !isNull(); }
T* p() const { return static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
bool isNull() const { return !m_object; }
bool notNull() const { return !isNull(); }
operator T* () const { return static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
T& operator* () const { return *static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
T* operator->() const { return static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
T& operator* () const { return *static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
T* operator->() const { return static_cast<T*>(const_cast<PdmObjectHandle*>(m_object)); }
PdmPointer<T> & operator= ( const PdmPointer<T>& p ) { if (this != &p) PdmPointerImpl::removeReference(&m_object); m_object = p.m_object; PdmPointerImpl::addReference(&m_object); return *this; }
PdmPointer<T> & operator= ( T* p ) { if (m_object != p) PdmPointerImpl::removeReference(&m_object); m_object = p; PdmPointerImpl::addReference(&m_object); return *this; }

10
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.h
View File

@@ -54,16 +54,16 @@ public:
// Access operators
/*Conversion*/ operator DataType* () const { return m_fieldValue; }
DataType* operator->() const { return m_fieldValue; }
DataType* operator->() const { return m_fieldValue; }
const PdmPointer<DataType>& operator()() const { return m_fieldValue; }
const PdmPointer<DataType>& v() const { return m_fieldValue; }
bool operator==(const DataTypePtr& fieldValue) { return m_fieldValue == fieldValue; }
// Child objects
virtual void childObjects(std::vector<PdmObjectHandle*>*);
// Child objects
virtual void childObjects(std::vector<PdmObjectHandle*>*);
// Ptr referenced objects
@@ -76,7 +76,7 @@ private:
friend class PdmFieldXmlCap< PdmPtrField <DataType*> >;
void setRawPtr(PdmObjectHandle* obj);
PdmPointer<DataType> m_fieldValue;
PdmPointer<DataType> m_fieldValue;
// Resolving
QString m_referenceString;

12
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrField.inl
View File

@@ -79,12 +79,12 @@ caf::PdmPtrField<DataType*>& PdmPtrField<DataType*>::operator=(const FieldDataTy
template<typename DataType >
void caf::PdmPtrField<DataType*>::childObjects(std::vector<PdmObjectHandle*>* objects)
{
assert(objects);
PdmObjectHandle* obj = m_fieldValue.rawPtr();
if (obj)
{
objects->push_back(obj);
}
assert(objects);
PdmObjectHandle* obj = m_fieldValue.rawPtr();
if (obj)
{
objects->push_back(obj);
}
}