From 35e0758edaa992779cf9fc42da25277bf2c9f5ef Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 24 Sep 2021 08:35:39 +1000
Subject: [PATCH] Use QgsFileUtils::ensureFileNameHasExtension

---
 src/gui/qgsnewvectorlayerdialog.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
index dfcf98e375da..075f23f03daa 100644
--- a/src/gui/qgsnewvectorlayerdialog.cpp
+++ b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -27,6 +27,7 @@
 #include "qgssettings.h"
 #include "qgsogrprovider.h"
 #include "qgsgui.h"
+#include "qgsfileutils.h"
 
 #include <QPushButton>
 #include <QComboBox>
@@ -282,14 +283,12 @@ void QgsNewVectorLayerDialog::updateExtension()
     if ( geometrytype != QgsWkbTypes::NoGeometry )
     {
       fileName = fileName.replace( fileName.lastIndexOf( QLatin1String( ".dbf" ), -1, Qt::CaseInsensitive ), 4, QLatin1String( ".shp" ) );
-      if ( !fileName.endsWith( QLatin1String( ".shp" ), Qt::CaseInsensitive ) )
-        fileName += QLatin1String( ".shp" );
+      fileName = QgsFileUtils::ensureFileNameHasExtension( fileName, { QStringLiteral( "shp" ) } );
     }
     else
     {
       fileName = fileName.replace( fileName.lastIndexOf( QLatin1String( ".shp" ), -1, Qt::CaseInsensitive ), 4, QLatin1String( ".dbf" ) );
-      if ( !fileName.endsWith( QLatin1String( ".dbf" ), Qt::CaseInsensitive ) )
-        fileName += QLatin1String( ".dbf" );
+      fileName = QgsFileUtils::ensureFileNameHasExtension( fileName, { QStringLiteral( "dbf" ) } );
     }
   }
   setFilename( fileName );