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

Janitor: Several code hygiene adjustments (#9981)

Browse Source 
* Include all libraries in APP_FWK_LIBRARIES
* Several fixes detected by Static Code Analysis
* Remove unused code
* Add .clang.tidy
* Use QElapsedTimer
* Use horizontalAdvance
* Avoid | between enum of different classes
* Avoid illegal character
* Renaming and reorder of constructor initialization
This commit is contained in:
Magne Sjaastad
2023-03-23 15:49:06 +01:00
committed by GitHub
parent 2abfd08bd9
commit d23c6b4bb6
34 changed files with 114 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h
View File

@@ -329,7 +329,8 @@ private:
private:
EnumMapper()
: m_defaultValueIsSet( false )
: m_defaultValue( T() )
, m_defaultValueIsSet( false )
{
}

6
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmDataValueField.h
View File

@@ -72,7 +72,11 @@ public:
};
typedef DataType FieldDataType;
PdmDataValueField() {}
PdmDataValueField()
: m_fieldValue( DataType() )
, m_defaultFieldValue( DataType() )
{
}
PdmDataValueField( const PdmDataValueField& other ) { m_fieldValue = other.m_fieldValue; }
explicit PdmDataValueField( const DataType& fieldValue ) { m_fieldValue = fieldValue; }
~PdmDataValueField() override {}

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
View File

@@ -66,8 +66,8 @@ IconProvider::IconProvider( const QString& iconResourceString, const QSize& pref
//--------------------------------------------------------------------------------------------------
caf::IconProvider::IconProvider( const QPixmap& pixmap )
: m_active( true )
, m_pixmap( new QPixmap( pixmap ) )
, m_preferredSize( pixmap.size() )
, m_pixmap( new QPixmap( pixmap ) )
{
}

1
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUi3dObjectEditorHandle.cpp
View File

@@ -47,6 +47,7 @@ namespace caf
///
//--------------------------------------------------------------------------------------------------
PdmUi3dObjectEditorHandle::PdmUi3dObjectEditorHandle()
: m_isInComparisonView( false )
{
}

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp
View File

@@ -83,7 +83,9 @@ void PdmUiFieldHandle::notifyFieldChanged( const QVariant& oldFieldValue, const
{
PdmUiEditorHandle* editorContainingThisField = editorForThisField->topMostContainingEditor();
bool editorContainingThisFieldIsNotUpdated = !uiObjHandle->hasEditor( editorContainingThisField );
bool editorContainingThisFieldIsNotUpdated = false;
if ( uiObjHandle )
editorContainingThisFieldIsNotUpdated = !uiObjHandle->hasEditor( editorContainingThisField );
if ( noOwnerObject || editorContainingThisFieldIsNotUpdated )
{

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
View File

@@ -61,6 +61,7 @@ PdmUiItemInfo::PdmUiItemInfo( const QString& uiName,
, m_isReadOnly( false )
, m_labelAlignment( LEFT )
, m_isCustomContextMenuEnabled( false )
, m_notifyAllFieldsInMultiFieldChangedEvents( -1 )
{
}
@@ -84,6 +85,7 @@ PdmUiItemInfo::PdmUiItemInfo( const QString& uiName,
, m_isReadOnly( false )
, m_labelAlignment( LEFT )
, m_isCustomContextMenuEnabled( false )
, m_notifyAllFieldsInMultiFieldChangedEvents( -1 )
{
}

8
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmFieldIoHelper.cpp
View File

@@ -9,10 +9,9 @@ namespace caf
//--------------------------------------------------------------------------------------------------
void PdmFieldIOHelper::skipCharactersAndComments( QXmlStreamReader& xmlStream )
{
QXmlStreamReader::TokenType type;
while ( !xmlStream.atEnd() && xmlStream.isCharacters() || xmlStream.isComment() )
while ( !xmlStream.atEnd() && ( xmlStream.isCharacters() || xmlStream.isComment() ) )
{
type = xmlStream.readNext();
xmlStream.readNext();
}
}
@@ -21,10 +20,9 @@ void PdmFieldIOHelper::skipCharactersAndComments( QXmlStreamReader& xmlStream )
//--------------------------------------------------------------------------------------------------
void PdmFieldIOHelper::skipComments( QXmlStreamReader& xmlStream )
{
QXmlStreamReader::TokenType type;
while ( !xmlStream.atEnd() && xmlStream.isComment() )
{
type = xmlStream.readNext();
xmlStream.readNext();
}
}

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

@@ -290,8 +290,11 @@ void caf::PdmFieldXmlCap<caf::PdmChildField<DataType*>>::readFieldData( QXmlStre
std::cout << "Line " << xmlStream.lineNumber()
<< ": Warning: Unknown object type with class name: " << className.toLatin1().data()
<< " found while reading the field : " << m_field->keyword().toLatin1().data() << std::endl;
std::cout << " Expected class name: " << xmlObject->classKeyword().toLatin1().data()
<< std::endl;
if ( xmlObject )
{
std::cout << " Expected class name: " << xmlObject->classKeyword().toLatin1().data();
}
std::cout << std::endl;
xmlStream.skipCurrentElement(); // Skip to the endelement of the object we was supposed to read
xmlStream.skipCurrentElement(); // Skip to the endelement of this field

3
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldReaderWriter.cpp
View File

@@ -16,8 +16,7 @@ void PdmFieldReader<QString>::readFieldData( QString& field, QXmlStreamReader& x
field = xmlStream.text().toString();
// Make stream point to end of element
QXmlStreamReader::TokenType type;
type = xmlStream.readNext();
xmlStream.readNext();
PdmFieldIOHelper::skipCharactersAndComments( xmlStream );
}

18
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp
View File

@@ -84,8 +84,7 @@ void PdmXmlObjectHandle::readFields( QXmlStreamReader& xmlStream, PdmObjectFacto
// readFieldData assumes that the xmlStream points to first token of field content.
// After reading, the xmlStream is supposed to point to the first token after the field
// content. (typically an "endElement")
QXmlStreamReader::TokenType tt;
tt = xmlStream.readNext();
xmlStream.readNext();
xmlFieldHandle->readFieldData( xmlStream, objectFactory );
}
else
@@ -179,9 +178,8 @@ void PdmXmlObjectHandle::readObjectFromXmlString( const QString& xmlString, PdmO
QXmlStreamReader inputStream( xmlString );
QXmlStreamReader::TokenType tt;
tt = inputStream.readNext(); // Start of document
tt = inputStream.readNext();
inputStream.readNext(); // Start of document
inputStream.readNext();
QString classKeyword = inputStream.name().toString();
CAF_ASSERT( classKeyword == this->classKeyword() );
@@ -197,9 +195,8 @@ PdmObjectHandle* PdmXmlObjectHandle::readUnknownObjectFromXmlString( const QStri
{
QXmlStreamReader inputStream( xmlString );
QXmlStreamReader::TokenType tt;
tt = inputStream.readNext(); // Start of document
tt = inputStream.readNext();
inputStream.readNext(); // Start of document
inputStream.readNext();
QString classKeyword = inputStream.name().toString();
PdmObjectHandle* newObject = objectFactory->create( classKeyword );
@@ -243,9 +240,8 @@ caf::PdmObjectHandle* PdmXmlObjectHandle::copyAndCastByXmlSerialization( const Q
QXmlStreamReader inputStream( xmlString );
QXmlStreamReader::TokenType tt;
tt = inputStream.readNext(); // Start of document
tt = inputStream.readNext();
inputStream.readNext(); // Start of document
inputStream.readNext();
QString classKeyword = inputStream.name().toString();
CAF_ASSERT( classKeyword == sourceClassKeyword );