Changed creation of QFileSystemModel. Object will now be created when the user first...

[lamexp/LameXP.git] / src / Model_FileSystem.cpp

diff --git a/src/Model_FileSystem.cpp b/src/Model_FileSystem.cpp
index a135408..507967e 100644 (file)
--- a/src/Model_FileSystem.cpp
+++ b/src/Model_FileSystem.cpp
@@ -153,6 +153,7 @@ QFileSystemModelEx::QFileSystemModelEx()
 
 QFileSystemModelEx::~QFileSystemModelEx()
 {
+       removeAllFromCache();
        LAMEXP_DELETE(m_myIconProvider);
 }
 
@@ -160,27 +161,16 @@ bool QFileSystemModelEx::hasChildren(const QModelIndex &parent) const
 {
        if(parent.isValid())
        {
-               return /*(QFileSystemModel::rowCount(parent) > 0) ||*/ hasSubfoldersCached(filePath(parent));
+               return hasSubfoldersCached(filePath(parent).toLower()); //return (QDir(QFileSystemModel::filePath(parent)).entryList(QDir::Dirs | QDir::NoDotAndDotDot).count() > 0);
        }
-       
        return true;
 }
 
-int QFileSystemModelEx::rowCount(const QModelIndex &parent) const
-{
-       if(parent.isValid())
-       {
-               removeFromCache(filePath(parent));
-       }
-
-       return QFileSystemModel::rowCount(parent);
-}
-
 void QFileSystemModelEx::fetchMore(const QModelIndex &parent)
 {
        if(parent.isValid())
        {
-               removeFromCache(filePath(parent));
+               removeFromCache(filePath(parent).toLower());
        }
 
        QFileSystemModel::fetchMore(parent);
@@ -191,7 +181,8 @@ QModelIndex QFileSystemModelEx::index(const QString &path, int column) const
        QFileInfo info(path);
        if(info.exists() && info.isDir())
        {
-               QStringList parts = QDir::fromNativeSeparators(info.canonicalFilePath()).split('/', QString::SkipEmptyParts);
+               QString fullPath = QDir::fromNativeSeparators(info.canonicalFilePath());
+               QStringList parts = fullPath.split('/', QString::SkipEmptyParts);
                for(int i = 2; i <= parts.count(); i++)
                {
                        QFileInfo currentPath(((QStringList) parts.mid(0, i)).join("/"));
@@ -200,11 +191,26 @@ QModelIndex QFileSystemModelEx::index(const QString &path, int column) const
                                return QModelIndex();
                        }
                }
-               return QFileSystemModel::index(path, column);
+               QModelIndex index = QFileSystemModel::index(fullPath, column);
+               if(index.isValid())
+               {
+                       QModelIndex temp = index;
+                       while(temp.isValid())
+                       {
+                               removeFromCache(filePath(temp).toLower());
+                               temp = temp.parent();
+                       }
+                       return index;
+               }
        }
        return QModelIndex();
 }
 
+void QFileSystemModelEx::flushCache(void)
+{
+       removeAllFromCache();
+}
+
 /* ------------------------ */
 /*  STATIC FUNCTIONS BELOW  */
 /* ------------------------ */
@@ -219,7 +225,7 @@ bool QFileSystemModelEx::FindFirstFileExInfoBasicOK = false;
 bool QFileSystemModelEx::hasSubfoldersCached(const QString &path)
 {
        QMutexLocker lock(&s_hasSubfolderMutex);
-       
+
        if(s_hasSubfolderCache.contains(path))
        {
                return s_hasSubfolderCache.value(path);
@@ -236,14 +242,23 @@ void QFileSystemModelEx::removeFromCache(const QString &path)
        s_hasSubfolderCache.remove(path);
 }
 
+void QFileSystemModelEx::removeAllFromCache(void)
+{
+       QMutexLocker lock(&s_hasSubfolderMutex);
+       s_hasSubfolderCache.clear();
+}
+
 bool QFileSystemModelEx::hasSubfolders(const QString &path)
 {
        if(!FindFirstFileExInitialized)
        {
-               QLibrary Kernel32Lib("kernel32.dll");
-               FindFirstFileExPtr = Kernel32Lib.resolve("FindFirstFileExW");
-               DWORD osVersionNo = lamexp_get_os_version();
-               FindFirstFileExInfoBasicOK = LAMEXP_MIN_OS_VER(osVersionNo, 6, 1);
+               QLibrary kernel32Lib("kernel32.dll");
+               if(kernel32Lib.load())
+               {
+                       FindFirstFileExPtr = kernel32Lib.resolve("FindFirstFileExW");
+                       DWORD osVersionNo = lamexp_get_os_version();
+                       FindFirstFileExInfoBasicOK = LAMEXP_MIN_OS_VER(osVersionNo, 6, 1);
+               }
                FindFirstFileExInitialized = true;
        }