summaryrefslogtreecommitdiff
path: root/src/modinfowithconflictinfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/modinfowithconflictinfo.h')
-rw-r--r--src/modinfowithconflictinfo.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 3adbb998..abc9f223 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -59,7 +59,7 @@ protected:
*
* @return true if the content is valid, false otherwise.
**/
- virtual bool doTestValid() const;
+ virtual bool doIsValid() const;
/**
* @brief Compute the contents for this mod.
@@ -135,16 +135,9 @@ protected:
private:
- /**
- * @return a file tree for this mod.
- */
- std::shared_ptr<const MOBase::IFileTree> updateFileTree() const;
-
- MOShared::MemoizedLocked<
- std::shared_ptr<const MOBase::IFileTree>,
- decltype(&ModInfoWithConflictInfo::updateFileTree)> m_FileTree;
- MOShared::MemoizedLocked<bool, decltype(&ModInfoWithConflictInfo::doTestValid)> m_Valid;
- MOShared::MemoizedLocked<std::vector<EContent>, decltype(&ModInfoWithConflictInfo::doGetContents)> m_Contents;
+ MOShared::MemoizedLocked<std::shared_ptr<const MOBase::IFileTree>> m_FileTree;
+ MOShared::MemoizedLocked<bool> m_Valid;
+ MOShared::MemoizedLocked<std::vector<EContent>> m_Contents;
MOShared::DirectoryEntry **m_DirectoryStructure;