Skip to content
Permalink
Browse files
Add c++20 todo for replacing equality operators with default implemen…
…tations
  • Loading branch information
nyalldawson authored and PeterPetrik committed Jul 2, 2021
1 parent c8156b0 commit d677040973fd9026085f557d36938508c8c01230
Showing with 7 additions and 1 deletion.
  1. +7 −1 src/core/symbology/qgsstyle.cpp
@@ -2755,6 +2755,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
{
// skip the symbol, should already be present
e = e.nextSiblingElement();
continue;
}

@@ -2810,6 +2811,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
{
// skip the ramp, should already be present
e = e.nextSiblingElement();
continue;
}

@@ -2859,6 +2861,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
{
// skip the format, should already be present
e = e.nextSiblingElement();
continue;
}

@@ -2901,9 +2904,10 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
while ( !e.isNull() )
{
const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt();
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
if ( !( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) )
{
// skip the settings, should already be present
e = e.nextSiblingElement();
continue;
}

@@ -2950,6 +2954,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
{
// skip the shape, should already be present
e = e.nextSiblingElement();
continue;
}

@@ -2995,6 +3000,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion )
if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion )
{
// skip the symbol, should already be present
e = e.nextSiblingElement();
continue;
}

0 comments on commit d677040

Please sign in to comment.