From 03fc2b0dc25ae00322c6681d99f48857ecf77935 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Mon, 25 May 2020 17:57:07 +0200
Subject: Update ModInfo classes following MemoizedLocked changes.

---
 src/modinfowithconflictinfo.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/modinfowithconflictinfo.h')

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;
 
-- 
cgit v1.3.1