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

Silence warnings about unused "type" variable in cafPdm*.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-04-01 08:30:01 +02:00
committed by Magne Sjaastad
parent 3f4778509d
commit 6de9288597
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafProjectDataModel/cafPdmObject.h
View File

@@ -105,7 +105,8 @@ class PdmObjectCapability;
\
static bool chekingThePresenceOfHeaderAndSourceInitMacros = \
Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class(); \
this->isInheritedFromPdmUiObject(); \
Q_UNUSED(chekingThePresenceOfHeaderAndSourceInitMacros); \
this->isInheritedFromPdmUiObject(); \
this->isInheritedFromPdmXmlSerializable(); \
\
AddXmlCapabilityToField(field); \
@@ -126,7 +127,8 @@ class PdmObjectCapability;
\
static bool chekingThePresenceOfHeaderAndSourceInitMacros = \
Error_You_forgot_to_add_the_macro_CAF_PDM_XML_HEADER_INIT_and_or_CAF_PDM_XML_SOURCE_INIT_to_your_cpp_file_for_this_class(); \
this->isInheritedFromPdmUiObject(); \
Q_UNUSED(chekingThePresenceOfHeaderAndSourceInitMacros); \
this->isInheritedFromPdmUiObject(); \
this->isInheritedFromPdmXmlSerializable(); \
\
AddXmlCapabilityToField(field); \

24
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl
View File

@@ -77,8 +77,8 @@ bool caf::PdmFieldXmlCap<FieldType>::resolveReferences()
QString dataString = xmlStream.text().toString();
// Make stream point to end of element
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
// This resolving can NOT be done here.
@@ -157,8 +157,8 @@ bool caf::PdmFieldXmlCap<FieldType>::resolveReferences()
QString dataString = xmlStream.text().toString();
// Make stream point to end of element
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
// This resolving can NOT be done here.
@@ -303,8 +303,8 @@ void caf::PdmFieldXmlCap< caf::PdmChildField<DataType*> >::readFieldData(QXmlStr
// Make stream point to endElement of this field
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
}
@@ -392,8 +392,8 @@ void caf::PdmFieldXmlCap< caf::PdmChildArrayField<DataType*> >::readFieldData(QX
xmlStream.skipCurrentElement();
// Jump off the end element, and head for next start element (or the final EndElement of the field)
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
continue;
@@ -408,8 +408,8 @@ void caf::PdmFieldXmlCap< caf::PdmChildArrayField<DataType*> >::readFieldData(QX
xmlStream.skipCurrentElement();
// Jump off the end element, and head for next start element (or the final EndElement of the field)
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
continue;
@@ -424,8 +424,8 @@ void caf::PdmFieldXmlCap< caf::PdmChildArrayField<DataType*> >::readFieldData(QX
// Jump off the end element, and head for next start element (or the final EndElement of the field)
// Qt reports a character token between EndElements and StartElements so skip it
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
}
}

8
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.h
View File

@@ -62,8 +62,8 @@ void PdmFieldReader<DataType>::readFieldData(DataType & fieldValue, QXmlStreamRe
data >> fieldValue;
// Make stream point to end of element
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
}
@@ -110,8 +110,8 @@ struct PdmFieldReader< PdmPointer<DataType> >
QString dataString = xmlStream.text().toString();
// Make stream point to end of element
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
QXmlStreamReader::TokenType type = xmlStream.readNext();
Q_UNUSED(type);
PdmFieldIOHelper::skipCharactersAndComments(xmlStream);
if (dataString != "NULL")