Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9406998

Browse files
TurboGraphxBeigegithub-actions[bot]
authored andcommittedApr 24, 2023
Fixes #52375. Removes duplicate encoding aliases returned by QgsVectorDataProvider::availableEncodings()
1 parent 8f94e5d commit 9406998

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed
 

‎src/core/vector/qgsvectordataprovider.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,11 @@ static bool _compareEncodings( const QString &s1, const QString &s2 )
660660
return s1.toLower() < s2.toLower();
661661
}
662662

663+
static bool _removeDuplicateEncodings( const QString &s1, const QString &s2 )
664+
{
665+
return ( s1.toLower() == s2.toLower() );
666+
}
667+
663668
QStringList QgsVectorDataProvider::availableEncodings()
664669
{
665670
static std::once_flag initialized;
@@ -718,8 +723,10 @@ QStringList QgsVectorDataProvider::availableEncodings()
718723
smEncodings << "System";
719724
#endif
720725

721-
// Do case-insensitive sorting of encodings
726+
// Do case-insensitive sorting of encodings then remove duplicates
722727
std::sort( sEncodings.begin(), sEncodings.end(), _compareEncodings );
728+
const auto last = std::unique( sEncodings.begin(), sEncodings.end(), _removeDuplicateEncodings );
729+
sEncodings.erase( last, sEncodings.end() );
723730

724731
} );
725732

0 commit comments

Comments
 (0)
Please sign in to comment.