Switch InoreaderUrlReader's storage to Utf8String

3 files changed, 10 insertions, 9 deletions

diff --git a/include/inoreaderurlreader.h b/include/inoreaderurlreader.h
index faaf0a60..6f71748f 100644
--- a/include/inoreaderurlreader.h
+++ b/include/inoreaderurlreader.h
@@ -2,6 +2,7 @@
 #define NEWSBOAT_INOREADERURLREADER_H_
 
 #include "urlreader.h"
+#include "utf8string.h"
 
 namespace newsboat {
 
@@ -19,7 +20,7 @@ public:
 
 private:
 	ConfigContainer* cfg;
-	std::string file;
+	Utf8String file;
 	RemoteApi* api;
 };
 
diff --git a/mk/mk.deps b/mk/mk.deps
index 26f1a8ac..69c47259 100644
--- a/mk/mk.deps
+++ b/mk/mk.deps
@@ -441,12 +441,12 @@ src/inoreaderapi.o: src/inoreaderapi.cpp include/inoreaderapi.h \
  target/cxxbridge/libnewsboat-ffi/src/utils.rs.h
 src/inoreaderurlreader.o: src/inoreaderurlreader.cpp \
  include/inoreaderurlreader.h include/urlreader.h 3rd-party/optional.hpp \
- include/configcontainer.h include/configactionhandler.h \
- include/utf8string.h include/fileurlreader.h include/logger.h config.h \
- include/strprintf.h target/cxxbridge/libnewsboat-ffi/src/logger.rs.h \
- include/remoteapi.h include/configcontainer.h include/utils.h \
- 3rd-party/expected.hpp include/logger.h \
- target/cxxbridge/libnewsboat-ffi/src/utils.rs.h
+ include/utf8string.h include/configcontainer.h \
+ include/configactionhandler.h include/fileurlreader.h include/logger.h \
+ config.h include/strprintf.h \
+ target/cxxbridge/libnewsboat-ffi/src/logger.rs.h include/remoteapi.h \
+ include/configcontainer.h include/utils.h 3rd-party/expected.hpp \
+ include/logger.h target/cxxbridge/libnewsboat-ffi/src/utils.rs.h
 src/itemlistformaction.o: src/itemlistformaction.cpp \
  include/itemlistformaction.h 3rd-party/optional.hpp include/history.h \
  target/cxxbridge/libnewsboat-ffi/src/history.rs.h \
diff --git a/src/inoreaderurlreader.cpp b/src/inoreaderurlreader.cpp
index b2d5c32d..219d0734 100644
--- a/src/inoreaderurlreader.cpp
+++ b/src/inoreaderurlreader.cpp
@@ -12,7 +12,7 @@ InoreaderUrlReader::InoreaderUrlReader(ConfigContainer* c,
 	const std::string& url_file,
 	RemoteApi* a)
 	: cfg(c)
-	, file(url_file)
+	, file(Utf8String::from_utf8(url_file))
 	, api(a)
 {
 }
@@ -54,7 +54,7 @@ nonstd::optional<std::string> InoreaderUrlReader::reload()
 			std::string("~") + _("Saved web pages"));
 	}
 
-	FileUrlReader ur(file);
+	FileUrlReader ur(file.to_utf8());
 	const auto error_message = ur.reload();
 	if (error_message.has_value()) {
 		LOG(Level::DEBUG, "Reloading failed: %s", error_message.value());