Address some review comments

Author: Sploder12

include/multipass/vm_image_vault_utils.h

@@ -52,7 +52,7 @@ class ImageVaultUtils : public Singleton<ImageVaultUtils>
     QString extract_file(const QString& file,
                          const ProgressMonitor& monitor,
                          bool delete_original = false,
-                         const DecoderT& = DefaultDecoderT{}) const;
+                         const DecoderT& = DecoderT{}) const;
 
     using HostMap = std::unordered_map<std::string, VMImageHost*>;
     using Hosts = std::vector<VMImageHost*>;

src/daemon/default_vm_image_vault.cpp

@@ -360,8 +360,7 @@ mp::VMImage mp::DefaultVMImageVault::fetch_image(const FetchType& fetch_type,
                                        0,
                                        checksum.has_value()};
 
-                QFileInfo file_info{image_url.path()};
-                const auto image_filename = file_info.fileName();
+                const auto image_filename = QFileInfo{image_url.path()}.fileName();
                 // Attempt to make a sane directory name based on the filename of the image
 
                 const auto image_dir_name =

src/platform/backends/lxd/lxd_vm_image_vault.cpp

@@ -307,8 +307,7 @@ mp::VMImage mp::LXDVMImageVault::fetch_image(const FetchType& fetch_type,
             if (query.query_type != Query::Type::LocalFile)
             {
                 // TODO: Need to make this async like in DefaultVMImageVault
-                QFileInfo file_info{info.image_location};
-                image_path = lxd_import_dir.filePath(file_info.fileName());
+                image_path = lxd_import_dir.filePath(QFileInfo{info.image_location}.fileName());
 
                 url_download_image(info, image_path, monitor);
             }

tests/test_image_vault_utils.cpp

@@ -35,7 +35,7 @@ namespace
 
 struct TestImageVaultUtils : public ::testing::Test
 {
-    const mpt::MockFileOps::GuardedMock mock_file_ops_guard{StrictMock<mpt::MockFileOps>::inject()};
+    const mpt::MockFileOps::GuardedMock mock_file_ops_guard{mpt::MockFileOps::inject<NiceMock>()};
     mpt::MockFileOps& mock_file_ops{*mock_file_ops_guard.first};
 
     const QDir test_dir{"secrets/secret_filled_folder"};