mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-24 10:23:10 +00:00
Code Issues Releases Wiki Activity

Use dedicated function to convert QString to std::filesystem::path II

Browse source 
Some missed conversions identified in review.
This commit is contained in:
AnyOldName3 2023-01-20 23:39:30 +00:00
parent f757ac642a
commit 438b03908d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/datafilespage.cpp
View file

@ -723,7 +723,7 @@ void Launcher::DataFilesPage::addArchivesFromDir(const QString& path)
for (const auto& fileinfo : dir.entryInfoList()) for (const auto& fileinfo : dir.entryInfoList())
{ {
const auto absPath = fileinfo.absoluteFilePath(); const auto absPath = fileinfo.absoluteFilePath();
if (Bsa::CompressedBSAFile::detectVersion(absPath.toStdString()) == Bsa::BSAVER_UNKNOWN) if (Bsa::CompressedBSAFile::detectVersion(Files::pathFromQString(absPath)) == Bsa::BSAVER_UNKNOWN)
continue; continue;
const auto fileName = fileinfo.fileName(); const auto fileName = fileinfo.fileName();

3
apps/launcher/utils/cellnameloader.cpp
View file

@ -1,6 +1,7 @@
#include "cellnameloader.hpp" #include "cellnameloader.hpp"
#include <components/esm3/loadcell.hpp> #include <components/esm3/loadcell.hpp>
#include <components/files/qtconversion.hpp>
QSet<QString> CellNameLoader::getCellNames(QStringList& contentPaths) QSet<QString> CellNameLoader::getCellNames(QStringList& contentPaths)
{ {
@ -12,7 +13,7 @@ QSet<QString> CellNameLoader::getCellNames(QStringList& contentPaths)
{ {
if (contentPath.endsWith(".omwscripts", Qt::CaseInsensitive)) if (contentPath.endsWith(".omwscripts", Qt::CaseInsensitive))
continue; continue;
esmReader.open(contentPath.toStdString()); esmReader.open(Files::pathFromQString(contentPath));
// Loop through all records // Loop through all records
while (esmReader.hasMoreRecs()) while (esmReader.hasMoreRecs())