[autofix.ci] apply automated fixes

src/common/utils.cc

@@ -4,7 +4,6 @@
 #include <QStyle>
 #include <QMessageBox>
 #include <string>
-
 #include <QBuffer>
 #include <QTextCodec>
 
@@ -31,7 +30,7 @@ std::string c_string( const QString & str )
 
 bool endsWithIgnoreCase( QByteArrayView str, QByteArrayView extension )
 {
-  return ( str.size() > extension.size()) && str.last( extension.size() ).compare( extension, Qt::CaseInsensitive ) );
+  return ( str.size() >= extension.size() ) && str.last( extension.size() ).compare( extension, Qt::CaseInsensitive );
 }
 
 QString escapeAmps( QString const & str )

src/dict/dsl.cc

@@ -1733,18 +1733,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       continue;
     }
 
-    // Make sure it's not an abbreviation file
+    // Make sure it's not an abbreviation file. extSize of ".dsl" or ".dsl.dz"
 
-    int extSize = ( uncompressedDsl ? 4 : 7 );
-
-    if ( fileName.size() - extSize >= 5 ) {
-      auto fileName_without_extension = QByteArrayView( fileName ).chopped( extSize );
-      if ( fileName_without_extension.endsWith( "_abrv" ) ) {
+    if ( int extSize = ( uncompressedDsl ? 4 : 7 ); ( fileName.size() >= ( 5 + extSize ) )
+         && QByteArrayView( fileName ).chopped( extSize ).last( 5 ).compare( "_abrv", Qt::CaseInsensitive ) ) {
       // It is, skip it
       continue;
     }
-    }
-
 
     unsigned atLine = 0; // Indicates current line in .dsl, for debug purposes
 

src/dict/epwing_book.hh

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include "dict/dictionary.hh"
 #include "ex.hh"
 

src/langcoder.cc

@@ -9,7 +9,6 @@
 #include <QLocale>
 #include <QRegularExpression>
 
-
 // Language codes
 
 QMap< QString, GDLangCode > LangCoder::LANG_CODE_MAP = {