AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-18 08:56:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OpenMW:master' into master

Browse Source
This commit is contained in:
Andy Lanzone 2025-06-02 00:47:04 -07:00 committed by GitHub
commit 43b5176367
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/contentselector/model/contentmodel.cpp
View File

@ -424,7 +424,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
file->setFilePath(info.absoluteFilePath()); file->setFilePath(info.absoluteFilePath());
if (add) if (add)
addFile(newFile.release()); addFile(newFile.release());
setNew(file->fileName(), newfiles); setNew(file, newfiles);
continue; continue;
} }
@ -480,7 +480,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf
// Put the file in the table // Put the file in the table
if (add) if (add)
addFile(newFile.release()); addFile(newFile.release());
setNew(file->fileName(), newfiles); setNew(file, newfiles);
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
@ -619,17 +619,12 @@ bool ContentSelectorModel::ContentModel::isNew(const QString& filepath) const
return it.value(); return it.value();
} }
void ContentSelectorModel::ContentModel::setNew(const QString& filepath, bool isNew) void ContentSelectorModel::ContentModel::setNew(const EsmFile* file, bool isNew)
{ {
if (filepath.isEmpty())
return;
const EsmFile* file = item(filepath);
if (!file) if (!file)
return; return;
mNewFiles[filepath] = isNew; mNewFiles[file->fileName()] = isNew;
} }
void ContentSelectorModel::ContentModel::setNonUserContent(const QStringList& fileList) void ContentSelectorModel::ContentModel::setNonUserContent(const QStringList& fileList)

2
components/contentselector/model/contentmodel.hpp
View File

@ -61,7 +61,7 @@ namespace ContentSelectorModel
bool isEnabled(const QModelIndex& index) const; bool isEnabled(const QModelIndex& index) const;
bool setCheckState(const EsmFile* file, bool isChecked); bool setCheckState(const EsmFile* file, bool isChecked);
bool isNew(const QString& filepath) const; bool isNew(const QString& filepath) const;
void setNew(const QString& filepath, bool isChecked); void setNew(const EsmFile* file, bool isChecked);
void setNonUserContent(const QStringList& fileList); void setNonUserContent(const QStringList& fileList);
void setContentList(const QStringList& fileList); void setContentList(const QStringList& fileList);
ContentFileList checkedItems() const; ContentFileList checkedItems() const;