Collection: Make sure RunQuery does not access collection items

- Rename `QueryOptions` to `CollectionFilterOptions`.
- Create new class `CollectionQueryOptions` for passing options from model to `CollectionQuery`.
- Rename `Directory` to `CollectionDirectory`.

Fixes #1095

tests/src/collectionbackend_test.cpp

@@ -83,7 +83,7 @@ TEST_F(CollectionBackendTest, AddDirectory) {
 
   // Check the signal was emitted correctly
   ASSERT_EQ(1, spy.count());
-  Directory dir = spy[0][0].value<Directory>();
+  CollectionDirectory dir = spy[0][0].value<Directory>();
   EXPECT_EQ(QFileInfo("/tmp").canonicalFilePath(), dir.path);
   EXPECT_EQ(1, dir.id);
   EXPECT_EQ(0, spy[0][1].value<SubdirectoryList>().size());
@@ -93,7 +93,7 @@ TEST_F(CollectionBackendTest, AddDirectory) {
 TEST_F(CollectionBackendTest, RemoveDirectory) {
 
   // Add a directory
-  Directory dir;
+  CollectionDirectory dir;
   dir.id = 1;
   dir.path = "/tmp";
   backend_->AddDirectory(dir.path);

tests/src/metatypes_env.h

@@ -28,16 +28,16 @@
 
 #include "core/song.h"
 #include "core/songloader.h"
-#include "collection/directory.h"
+#include "collection/collectiondirectory.h"
 
 class MetatypesEnvironment : public ::testing::Environment {
  public:
   MetatypesEnvironment() = default;
   void SetUp() override {
-    qRegisterMetaType<Directory>("Directory");
-    qRegisterMetaType<DirectoryList>("DirectoryList");
-    qRegisterMetaType<Subdirectory>("Subdirectory");
-    qRegisterMetaType<SubdirectoryList>("SubdirectoryList");
+    qRegisterMetaType<CollectionDirectory>("Directory");
+    qRegisterMetaType<CollectionDirectoryList>("DirectoryList");
+    qRegisterMetaType<CollectionSubdirectory>("Subdirectory");
+    qRegisterMetaType<CollectionSubdirectoryList>("SubdirectoryList");
     qRegisterMetaType<SongList>("SongList");
     qRegisterMetaType<QModelIndex>("QModelIndex");
     qRegisterMetaType<SongLoader::Result>("SongLoader::Result");