diff options
| author | Seth Riley <17361645+Qudix@users.noreply.github.com> | 2020-11-03 18:38:45 -0600 |
|---|---|---|
| committer | Seth Riley <17361645+Qudix@users.noreply.github.com> | 2020-11-03 18:38:45 -0600 |
| commit | 34e1d05c28bf4676ed8d3e97e969187a05d215b6 (patch) | |
| tree | 285a418b970ba5daacf0c307cb98ed59fd31cda1 /src/shared/fileentry.h | |
| parent | 68750575d2f28c873b0d68391a7940e61c2ad2d4 (diff) | |
| parent | a7d4f2a0c40d35d547e93994be3f92b6d43a0833 (diff) | |
Merge branch 'master' of https://github.com/ModOrganizer2/modorganizer into master
Diffstat (limited to 'src/shared/fileentry.h')
| -rw-r--r-- | src/shared/fileentry.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/fileentry.h b/src/shared/fileentry.h index aceeec57..31655bb1 100644 --- a/src/shared/fileentry.h +++ b/src/shared/fileentry.h @@ -54,11 +54,11 @@ public: OriginID getOrigin(bool &archive) const { - archive = (m_Archive.first.length() != 0); + archive = m_Archive.isValid(); return m_Origin; } - const std::pair<std::wstring, int> &getArchive() const + const DataArchiveOrigin &getArchive() const { return m_Archive; } @@ -107,7 +107,7 @@ private: FileIndex m_Index; std::wstring m_Name; OriginID m_Origin; - std::pair<std::wstring, int> m_Archive; + DataArchiveOrigin m_Archive; AlternativesVector m_Alternatives; DirectoryEntry *m_Parent; mutable FILETIME m_FileTime; |