Change History::load_from_file() to accept PathBuf

2 files changed, 12 insertions, 4 deletions

diff --git a/rust/libnewsboat-ffi/src/history.rs b/rust/libnewsboat-ffi/src/history.rs
index 922c680b..26b777c3 100644
--- a/rust/libnewsboat-ffi/src/history.rs
+++ b/rust/libnewsboat-ffi/src/history.rs
@@ -1,3 +1,4 @@
+use crate::filepath::PathBuf;
 use libnewsboat::history;
 
 // cxx doesn't allow to share types from other crates, so we have to wrap it
@@ -6,6 +7,13 @@ struct History(history::History);
 
 #[cxx::bridge(namespace = "newsboat::history::bridged")]
 mod bridged {
+    #[namespace = "newsboat::filepath::bridged"]
+    extern "C++" {
+        include!("libnewsboat-ffi/src/filepath.rs.h");
+
+        type PathBuf = crate::filepath::PathBuf;
+    }
+
     extern "Rust" {
         type History;
 
@@ -14,7 +22,7 @@ mod bridged {
         fn add_line(history: &mut History, line: &str);
         fn previous_line(history: &mut History) -> String;
         fn next_line(history: &mut History) -> String;
-        fn load_from_file(history: &mut History, file: &str);
+        fn load_from_file(history: &mut History, file: &PathBuf);
         fn save_to_file(history: &mut History, file: &str, limit: usize);
     }
 }
@@ -35,10 +43,10 @@ fn next_line(history: &mut History) -> String {
     history.0.next_line()
 }
 
-fn load_from_file(history: &mut History, file: &str) {
+fn load_from_file(history: &mut History, file: &PathBuf) {
     // Original C++ code did nothing if it failed to open file.
     // Returns a [must_use] type so safely ignoring the value.
-    let _ = history.0.load_from_file(file);
+    let _ = history.0.load_from_file(&file.0);
 }
 
 fn save_to_file(history: &mut History, file: &str, limit: usize) {
diff --git a/src/history.cpp b/src/history.cpp
index 8ea86a20..3c60d3c5 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -24,7 +24,7 @@ std::string History::next_line()
 
 void History::load_from_file(const Filepath& file)
 {
-	history::bridged::load_from_file(*rs_object, file.to_locale_string());
+	history::bridged::load_from_file(*rs_object, file);
 }
 
 void History::save_to_file(const Filepath& file, unsigned int limit)