Merge branch 'qprogressbar' into 'master'

Increment some new Qt progress bars the canonical way

See merge request OpenMW/openmw!4698

Author: psi29a

apps/launcher/datafilespage.cpp

@@ -365,15 +365,15 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
 
     QIcon containsDataIcon(":/images/openmw-plugin.png");
 
-    QProgressDialog progressBar("Adding data directories", {}, 0, directories.count(), this);
+    QProgressDialog progressBar("Adding data directories", {}, 0, static_cast<int>(directories.size()), this);
     progressBar.setWindowModality(Qt::WindowModal);
-    progressBar.setValue(0);
 
     std::unordered_set<QString> visitedDirectories;
-    for (const Config::SettingValue& currentDir : directories)
+    for (qsizetype i = 0; i < directories.size(); ++i)
     {
-        progressBar.setValue(progressBar.value() + 1);
+        progressBar.setValue(static_cast<int>(i));
 
+        const Config::SettingValue& currentDir = directories.at(i);
         if (!visitedDirectories.insert(currentDir.value).second)
             continue;
 
@@ -436,6 +436,7 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
         }
         item->setToolTip(tooltip.join('\n'));
     }
+    progressBar.setValue(progressBar.maximum());
     mSelector->sortFiles();
 
     QList<Config::SettingValue> selectedArchives = mGameSettings.getArchiveList();

components/config/gamesettings.cpp

@@ -38,19 +38,19 @@ void Config::GameSettings::validatePaths()
 
     mDataDirs.clear();
 
-    QProgressDialog progressBar("Validating paths", {}, 0, paths.count() + 1);
+    QProgressDialog progressBar("Validating paths", {}, 0, static_cast<int>(paths.size() + 1));
     progressBar.setWindowModality(Qt::WindowModal);
     progressBar.setValue(0);
 
     for (const auto& dataDir : paths)
     {
-        progressBar.setValue(progressBar.value() + 1);
         if (QDir(dataDir.value).exists())
         {
             SettingValue copy = dataDir;
             copy.value = QDir(dataDir.value).canonicalPath();
             mDataDirs.append(copy);
         }
+        progressBar.setValue(progressBar.value() + 1);
     }
 
     // Do the same for data-local