From 2be531470d54fa56307e392ad5bdfbc02048a744 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 19 Dec 2019 23:00:18 -0500
Subject: renamed ToLower() to avoid confusion with in-place vs copy pre-hashed
 file lookup in DirectoryEntry

---
 src/filetreemodel.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/filetreemodel.cpp')

diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index 9332b354..ed62b8ae 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -17,9 +17,13 @@ void trace(F&&)
 }
 
 
-FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent)
-  : QAbstractItemModel(parent), m_core(core), m_flags(NoFlags)
+FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent) :
+  QAbstractItemModel(parent), m_core(core),
+  m_root(nullptr, 0, L"", L"", FileTreeItem::Directory, L"", L"<root>"),
+  m_flags(NoFlags)
 {
+  m_root.setExpanded(true);
+
   connect(&m_iconPendingTimer, &QTimer::timeout, [&]{ updatePendingIcons(); });
 
   connect(
@@ -33,21 +37,6 @@ FileTreeModel::FileTreeModel(OrganizerCore& core, QObject* parent)
     });
 }
 
-void FileTreeModel::setFlags(Flags f)
-{
-  m_flags = f;
-}
-
-bool FileTreeModel::showConflicts() const
-{
-  return (m_flags & Conflicts);
-}
-
-bool FileTreeModel::showArchives() const
-{
-  return (m_flags & Archives) && m_core.getArchiveParsing();
-}
-
 void FileTreeModel::refresh()
 {
   if (m_root.hasChildren()) {
@@ -56,13 +45,24 @@ void FileTreeModel::refresh()
   } else {
     TimeThis tt("FileTreeModel::fill()");
     beginResetModel();
-    m_root = {nullptr, 0, L"", L"", FileTreeItem::Directory, L"", L"<root>"};
-    m_root.setExpanded(true);
+    m_root.clear();
     fill(m_root, *m_core.directoryStructure(), L"");
     endResetModel();
   }
 }
 
+void FileTreeModel::clear()
+{
+  beginResetModel();
+  m_root.clear();
+  endResetModel();
+}
+
+bool FileTreeModel::showArchives() const
+{
+  return (m_flags & Archives) && m_core.getArchiveParsing();
+}
+
 void FileTreeModel::ensureLoaded(FileTreeItem* item) const
 {
   if (!item) {
@@ -426,7 +426,7 @@ void FileTreeModel::updateFiles(
       continue;
     }
 
-    if (auto f=parentEntry.findFile(item->filenameWsLowerCase(), true)) {
+    if (auto f=parentEntry.findFile(item->key())) {
       if (shouldShowFile(*f)) {
         // file still exists
         trace([&]{ log::debug("{} still exists", item->debugName()); });
-- 
cgit v1.3.1