From 9ac757647f259c7e38b243d347c573e05fb0bd75 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 24 Jun 2021 16:28:24 +0100 Subject: [PATCH] FileManager: Switch FileOperationProgressWidget::did_error() to SV& --- .../FileManager/FileOperationProgressWidget.cpp | 8 ++++---- .../FileManager/FileOperationProgressWidget.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp index f88b09440e..84f5a2c861 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp @@ -66,7 +66,7 @@ FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation m_notifier->on_ready_to_read = [this] { auto line = m_helper_pipe->read_line(); if (line.is_null()) { - did_error("Read from pipe returned null."); + did_error("Read from pipe returned null."sv); return; } @@ -74,12 +74,12 @@ FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation VERIFY(!parts.is_empty()); if (parts[0] == "ERROR"sv) { - did_error(line.substring(6)); + did_error(line.substring_view(6)); return; } if (parts[0] == "WARN"sv) { - did_error(line.substring(5)); + did_error(line.substring_view(5)); return; } @@ -115,7 +115,7 @@ void FileOperationProgressWidget::did_finish() window()->close(); } -void FileOperationProgressWidget::did_error(String const message) +void FileOperationProgressWidget::did_error(StringView const& message) { // FIXME: Communicate more with the user about errors. close_pipe(); diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.h b/Userland/Applications/FileManager/FileOperationProgressWidget.h index cb4f815245..b6b651945d 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.h +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.h @@ -22,7 +22,7 @@ private: FileOperationProgressWidget(FileOperation, NonnullRefPtr helper_pipe); void did_finish(); - void did_error(String message); + void did_error(StringView const& message); void did_progress(off_t bytes_done, off_t total_byte_count, size_t files_done, size_t total_file_count, off_t current_file_done, off_t current_file_size, StringView const& current_filename); void close_pipe();