Merge branch 'polish_filemodel_errorhandling' into 'master'

Polish filemodel errorhandling See merge request mer-core/nemo-qml-plugin-filemanager!39
sailfishos · Jan 26, 2021 · 7d57db0 · 7d57db0
2 parents 17c4b7f + 5e5f279
commit 7d57db0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/plugin/filemodel.cpp b/src/plugin/filemodel.cpp
@@ -90,6 +90,7 @@ QVector<StatFileInfo> directoryEntries(const QDir &dir)
 
 FileModel::FileModel(QObject *parent) :
     QAbstractListModel(parent),
+    m_errorType(NoError),
     m_sortBy(SortByName),
     m_directorySort(SortDirectoriesWithFiles),
     m_sortOrder(Qt::AscendingOrder),

diff --git a/tests/auto/tst_filemodel.qml b/tests/auto/tst_filemodel.qml
@@ -35,13 +35,10 @@ import QtQuick 2.0
 import Nemo.FileManager 1.0
 
 Item {
-    property int lastError
-
     FileModel {
         id: fileModel
         path: "folder"
         active: true
-        onError: lastError = error
     }
 
     Repeater {
@@ -175,11 +172,11 @@ Item {
         }
 
         function test_errors() {
-            compare(lastError, FileModel.NoError)
+            compare(fileModel.errorType, FileModel.NoError)
 
             fileModel.path = "hiddenfolder"
             wait(0)
-            compare(lastError, FileModel.ErrorReadNoPermissions)
+            compare(fileModel.errorType, FileModel.ErrorReadNoPermissions)
         }
     }
 }