revert "clean: reduce implicit int -> (q)sizetype conversion warn…

…ings (#2127)" (#2155)

src/article_maker.cc

@@ -535,13 +535,13 @@ void ArticleRequest::altSearchFinished()
 int ArticleRequest::findEndOfCloseDiv( const QString & str, int pos )
 {
   for ( ;; ) {
-    const auto n1 = str.indexOf( "</div>", pos );
+    const int n1 = str.indexOf( "</div>", pos );
     if ( n1 <= 0 ) {
       return n1;
     }
 
     // will there be some custom tags starts with <div but not <div> ,such as <divider>
-    const auto n2 = str.indexOf( RX::Html::startDivTag, pos );
+    const int n2 = str.indexOf( RX::Html::startDivTag, pos );
     if ( n2 <= 0 || n2 > n1 ) {
       return n1 + 6;
     }
@@ -569,7 +569,7 @@ bool ArticleRequest::isCollapsable( Dictionary::DataRequest & req, QString const
       if ( !needExpandOptionalParts ) {
         // Strip DSL optional parts
         for ( ;; ) {
-          const auto pos = text.indexOf( "<div class=\"dsl_opt\"" );
+          const int pos = text.indexOf( "<div class=\"dsl_opt\"" );
           if ( pos > 0 ) {
             const int endPos = findEndOfCloseDiv( text, pos + 1 );
             if ( endPos > pos ) {
@@ -792,7 +792,7 @@ int ArticleRequest::htmlTextSize( QString html )
     html.remove( QRegularExpression( "<link\\s*[^>]*>", QRegularExpression::CaseInsensitiveOption ) )
       .remove( QRegularExpression( R"(<script[\s\S]*?>[\s\S]*?<\/script>)",
                                    QRegularExpression::CaseInsensitiveOption | QRegularExpression::MultilineOption ) );
-  auto size = QTextDocumentFragment::fromHtml( stripStyleSheet ).toPlainText().length();
+  int size = QTextDocumentFragment::fromHtml( stripStyleSheet ).toPlainText().length();
 
   return size;
 }

src/common/utils.hh

@@ -31,7 +31,8 @@ inline bool isCJKChar( ushort ch )
  */
 inline QString rstrip( const QString & str )
 {
-  for ( auto n = str.size() - 1; n >= 0; --n ) {
+  int n = str.size() - 1;
+  for ( ; n >= 0; --n ) {
     if ( !str.at( n ).isSpace() ) {
       return str.left( n + 1 );
     }
@@ -63,15 +64,17 @@ bool endsWithIgnoreCase( QByteArrayView str, QByteArrayView extension );
 inline QString trimNonChar( const QString & str )
 {
   QString remain;
-  for ( auto n = str.size() - 1; n >= 0; --n ) {
+  int n = str.size() - 1;
+  for ( ; n >= 0; --n ) {
     auto c = str.at( n );
     if ( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct() && !c.isNull() ) {
       remain = str.left( n + 1 );
       break;
     }
   }
 
-  for ( auto n = 0; n < remain.size(); n++ ) {
+  n = 0;
+  for ( ; n < remain.size(); n++ ) {
     auto c = remain.at( n );
     if ( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct() ) {
       return remain.mid( n );
@@ -89,7 +92,8 @@ inline QString trimNonChar( const QString & str )
  */
 inline QString rstripnull( const QString & str )
 {
-  for ( auto n = str.size() - 1; n >= 0; --n ) {
+  int n = str.size() - 1;
+  for ( ; n >= 0; --n ) {
     auto c = str.at( n );
     if ( !c.isSpace() && !c.isNull() ) {
       return str.left( n + 1 );
@@ -294,7 +298,7 @@ inline QString getHostBase( QString const & host )
 {
   QStringList domains = host.split( '.' );
 
-  auto left = domains.size();
+  int left = domains.size();
 
   // Skip last <=3-letter domain name
   if ( left && domains[ left - 1 ].size() <= 3 )

src/dict/bgl.cc

@@ -117,7 +117,7 @@ void trimWs( string & word )
       word.clear();
     }
     else {
-      auto end = word.size();
+      unsigned end = word.size();
 
       // Doesn't consist of ws entirely, so must end with just isspace()
       // condition.
@@ -611,7 +611,8 @@ void BglArticleRequest::fixHebString( string & hebStr ) // Hebrew support - conv
 
 void BglArticleRequest::fixHebArticle( string & hebArticle ) // Hebrew support - remove extra chars at the end
 {
-  std::size_t nulls;
+  unsigned nulls;
+
   for ( nulls = hebArticle.size(); nulls > 0
         && ( ( hebArticle[ nulls - 1 ] <= 32 && hebArticle[ nulls - 1 ] >= 0 )
              || ( hebArticle[ nulls - 1 ] >= 65 && hebArticle[ nulls - 1 ] <= 90 ) );
@@ -937,7 +938,7 @@ void BglDictionary::replaceCharsetEntities( string & text )
 
   QRegularExpression oneValueExp( "\\s*([0-9a-fA-F]+)\\s*;" );
   QString result;
-  qsizetype pos = 0;
+  int pos = 0;
 
   QRegularExpressionMatchIterator it = charsetExp.globalMatch( str );
   while ( it.hasNext() ) {

src/dict/btreeidx.cc

@@ -231,7 +231,7 @@ void BtreeWordSearchRequest::findMatches()
     }
   }
 
-  auto initialFoldedSize = folded.size();
+  int initialFoldedSize = folded.size();
 
   int charsLeftToChop = 0;
 
@@ -637,7 +637,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( std::u32string const & ta
       // string lands.
 
       char const ** window = &chainOffsets.front();
-      auto windowSize      = chainOffsets.size();
+      unsigned windowSize  = chainOffsets.size();
 
       for ( ;; ) {
         //qDebug( "window = %u, ws = %u", window - &chainOffsets.front(), windowSize );
@@ -762,7 +762,7 @@ void BtreeIndex::antialias( std::u32string const & str, vector< WordArticleLink
     caseFolded = Folding::trimWhitespaceOrPunct( caseFolded );
   }
 
-  for ( auto x = chain.size(); x--; ) {
+  for ( unsigned x = chain.size(); x--; ) {
     // If after applying case folding to each word they wouldn't match, we
     // drop the entry.
     std::u32string entry =
@@ -896,7 +896,7 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
     abort();
   }
 
-  auto offset = file.tell();
+  uint32_t offset = file.tell();
 
   file.write< uint32_t >( uncompressedData.size() );
   file.write< uint32_t >( compressedSize );
@@ -908,7 +908,7 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
     file.write( (uint32_t)0 );
 
-    auto here = file.tell();
+    uint32_t here = file.tell();
 
     if ( lastLeafLinkOffset ) {
       // Update the previous leaf to have the offset of this one.

src/dict/dictdfiles.cc

@@ -339,7 +339,7 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( std::u32string cons
                                   .replace( refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
         convertedText.erase();
 
-        qsizetype pos = 0;
+        int pos = 0;
 
         QString articleNewString;
         QRegularExpressionMatchIterator it = links.globalMatch( articleString );

src/dict/dictionary.cc

@@ -376,7 +376,7 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
   QRegularExpression reg3( "[,;\\{]" );
 
 
-  qsizetype currentPos = 0;
+  int currentPos = 0;
   QString newCSS;
   QString prefix( "#gdfrom-" );
   prefix += QString::fromLatin1( getId().c_str() );
@@ -399,14 +399,14 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
     if ( ch == '@' ) {
       // @ rules
 
-      qsizetype n = currentPos;
+      int n = currentPos;
       if ( css.mid( currentPos, 7 ).compare( "@import", Qt::CaseInsensitive ) == 0
            || css.mid( currentPos, 10 ).compare( "@font-face", Qt::CaseInsensitive ) == 0
            || css.mid( currentPos, 10 ).compare( "@namespace", Qt::CaseInsensitive ) == 0
            || css.mid( currentPos, 8 ).compare( "@charset", Qt::CaseInsensitive ) == 0 ) {
         // Copy rule as is.
         n      = css.indexOf( ';', currentPos );
-        auto n2 = css.indexOf( '{', currentPos );
+        int n2 = css.indexOf( '{', currentPos );
         if ( n2 > 0 && n > n2 ) {
           n = n2 - 1;
         }
@@ -444,7 +444,7 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
       // Selector declaration block.
       // We copy it up to '}' as is.
 
-      auto n = css.indexOf( '}', currentPos );
+      int n = css.indexOf( '}', currentPos );
       newCSS.append( css.mid( currentPos, n == -1 ? n : n - currentPos + 1 ) );
       if ( n < 0 ) {
         break;
@@ -457,7 +457,7 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
       if ( ch.isLetter() || ch == '*' ) {
         // Check for namespace prefix
         QChar chr;
-        for ( auto i = currentPos; i < css.length(); i++ ) {
+        for ( int i = currentPos; i < css.length(); i++ ) {
           chr = css[ i ];
           if ( chr.isLetterOrNumber() || chr.isMark() || chr == '_' || chr == '-'
                || ( chr == '*' && i == currentPos ) ) {
@@ -479,7 +479,7 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
       // This is some selector.
       // We must to add the isolate prefix to it.
 
-      auto n    = css.indexOf( reg2, currentPos + 1 );
+      int n     = css.indexOf( reg2, currentPos + 1 );
       QString s = css.mid( currentPos, n < 0 ? n : n - currentPos );
       if ( n < 0 ) {
         newCSS.append( s );

src/dict/dictserver.cc

@@ -79,7 +79,7 @@ class DictServerImpl: public QObject
 
   void run( std::function< void() > callback )
   {
-    auto pos = url.indexOf( "://" );
+    int pos = url.indexOf( "://" );
     if ( pos < 0 ) {
       url = "dict://" + url;
     }
@@ -121,7 +121,7 @@ class DictServerImpl: public QObject
           QString authCommand = QString( "AUTH " );
           QString authString  = msgId;
 
-          auto pos = serverUrl.userInfo().indexOf( QRegularExpression( "[:;]" ) );
+          int pos = serverUrl.userInfo().indexOf( QRegularExpression( "[:;]" ) );
           if ( pos > 0 ) {
             authCommand += serverUrl.userInfo().left( pos );
             authString += serverUrl.userInfo().mid( pos + 1 );
@@ -202,7 +202,7 @@ class DictServerDictionary: public Dictionary::Class
 
     dictionaryName = name_;
 
-    auto pos = url.indexOf( "://" );
+    int pos = url.indexOf( "://" );
     if ( pos < 0 ) {
       url = "dict://" + url;
     }
@@ -242,7 +242,7 @@ class DictServerDictionary: public Dictionary::Class
 
         if ( reply.left( 3 ) == "110" ) {
           state        = DictServerState::DB_DATA;
-          auto countPos = reply.indexOf( ' ', 4 );
+          int countPos = reply.indexOf( ' ', 4 );
           // Get databases count
           int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
 
@@ -525,7 +525,7 @@ void DictServerWordSearchRequest::readMatchData( QByteArray & reply )
       continue;
     }
 
-    auto pos = reply.indexOf( ' ' );
+    int pos = reply.indexOf( ' ' );
     if ( pos >= 0 ) {
       QString word = reply.mid( pos + 1 );
       if ( word.endsWith( '\"' ) ) {
@@ -654,7 +654,7 @@ class DictServerArticleRequest: public Dictionary::DataRequest
       }
 
       _articleText = QString::fromUtf8( articleStr.c_str(), articleStr.size() );
-      qsizetype pos;
+      int pos;
       if ( !contentInHtml ) {
         _articleText = _articleText.replace( refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
 
@@ -784,7 +784,7 @@ void DictServerArticleRequest::run()
       auto code = reply.left( 3 );
       if ( reply.left( 3 ) == "150" ) {
         // Articles found
-        auto countPos = reply.indexOf( ' ', 4 );
+        int countPos = reply.indexOf( ' ', 4 );
         // Get articles count,
         // todo ,how to use this count?
         int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
@@ -818,8 +818,8 @@ void DictServerArticleRequest::readData( QByteArray reply )
   }
 
   if ( reply.left( 3 ) == "151" ) {
-    qsizetype pos = 4;
-    qsizetype endPos;
+    int pos = 4;
+    int endPos;
 
     // Skip requested word
     if ( reply[ pos ] == '\"' ) {

src/dict/dsl.cc

@@ -724,9 +724,9 @@ string DslDictionary::getNodeLink( ArticleDom::Node const & node )
   string link;
   if ( !node.tagAttrs.empty() ) {
     QString attrs = QString::fromStdU32String( node.tagAttrs );
-    auto n        = attrs.indexOf( "target=\"" );
+    int n         = attrs.indexOf( "target=\"" );
     if ( n >= 0 ) {
-      auto n_end     = attrs.indexOf( '\"', n + 8 );
+      int n_end      = attrs.indexOf( '\"', n + 8 );
       QString target = attrs.mid( n + 8, n_end > n + 8 ? n_end - ( n + 8 ) : -1 );
       link           = Html::escape( Filetype::simplifyString( string( target.toUtf8().data() ), false ) );
     }
@@ -916,7 +916,7 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       // Find ISO 639-1 code
       string langcode;
       QString attr = QString::fromStdU32String( node.tagAttrs );
-      auto n       = attr.indexOf( "id=" );
+      int n        = attr.indexOf( "id=" );
       if ( n >= 0 ) {
         int id = attr.mid( n + 3 ).toInt();
         if ( id ) {
@@ -926,7 +926,7 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       else {
         n = attr.indexOf( "name=\"" );
         if ( n >= 0 ) {
-          auto n2 = attr.indexOf( '\"', n + 6 );
+          int n2 = attr.indexOf( '\"', n + 6 );
           if ( n2 > 0 ) {
             quint32 id = dslLanguageToId( attr.mid( n + 6, n2 - n - 6 ).toStdU32String() );
             langcode   = LangCoder::intToCode2( id ).toStdString();
@@ -950,7 +950,7 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
     url.setPath( Utils::Url::ensureLeadingSlash( QString::fromStdU32String( nodeStr ) ) );
     if ( !node.tagAttrs.empty() ) {
       QString attr = QString::fromStdU32String( node.tagAttrs ).remove( '\"' );
-      auto n       = attr.indexOf( '=' );
+      int n        = attr.indexOf( '=' );
       if ( n > 0 ) {
         QList< std::pair< QString, QString > > query;
         query.append( std::pair< QString, QString >( attr.left( n ), attr.mid( n + 1 ) ) );
@@ -1295,7 +1295,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     static QString stripTags[ stripTagsNumber ]    = { "s", "url", "!trs", "video", "preview" };
     static QString stripEndTags[ stripTagsNumber ] = { "[/s]", "[/url]", "[/!trs]", "[/video]", "[/preview]" };
 
-    qsizetype pos = 0;
+    int pos = 0;
     while ( pos >= 0 ) {
       pos = text.indexOf( '[', pos, Qt::CaseInsensitive );
       if ( pos >= 0 ) {
@@ -1305,7 +1305,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
           continue;
         }
 
-        auto pos2 = text.indexOf( ']', pos + 1, Qt::CaseInsensitive );
+        int pos2 = text.indexOf( ']', pos + 1, Qt::CaseInsensitive );
         if ( pos2 < 0 ) {
           break;
         }
@@ -1840,17 +1840,17 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               idxHeader.hasAbrv     = 1;
               idxHeader.abrvAddress = chunks.startNewBlock();
 
-              uint32_t sz = (uint32_t)abrv.size();
+              uint32_t sz = abrv.size();
 
               chunks.addToBlock( &sz, sizeof( uint32_t ) );
 
               for ( const auto & i : abrv ) {
                 //              qDebug( "%s:%s", i->first.c_str(), i->second.c_str() );
 
-                sz = (uint32_t)i.first.size();
+                sz = i.first.size();
                 chunks.addToBlock( &sz, sizeof( uint32_t ) );
                 chunks.addToBlock( i.first.data(), sz );
-                sz = (uint32_t)i.second.size();
+                sz = i.second.size();
                 chunks.addToBlock( &sz, sizeof( uint32_t ) );
                 chunks.addToBlock( i.second.data(), sz );
               }

src/dict/gls.cc

@@ -686,7 +686,7 @@ QString & GlsDictionary::filterResource( QString & article )
   QRegularExpression linksReg( R"(<a(\s+[^>]*)href\s*=\s*['"](bword://)?([^'"]+)['"])",
                                QRegularExpression::CaseInsensitiveOption );
 
-  qsizetype pos = 0;
+  int pos = 0;
   QString articleNewText;
   QRegularExpressionMatchIterator it = linksReg.globalMatch( article );
   while ( it.hasNext() ) {
@@ -1111,8 +1111,7 @@ void GlsResourceRequest::run()
       // Correct some url's
 
       QString id = QString::fromUtf8( dict.getId().c_str() );
-
-      qsizetype pos = 0;
+      int pos    = 0;
 
       QRegularExpression links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))", QRegularExpression::CaseInsensitiveOption );