diff options
| author | Alexander Batischev <eual.jp@gmail.com> | 2021-04-30 21:56:06 +0300 |
|---|---|---|
| committer | Alexander Batischev <eual.jp@gmail.com> | 2021-05-17 15:23:13 +0300 |
| commit | 3721ff814a50723a6302f328aaf105e720299cf2 (patch) | |
| tree | d913ca1da338a0be417b22ff12f9e7928ee27c9e | |
| parent | 615bb55ab5705d5273fd830790e6a7ec83561564 (diff) | |
Switch OcNewsUrlReader's storage to Utf8String
| -rw-r--r-- | include/ocnewsurlreader.h | 3 | ||||
| -rw-r--r-- | mk/mk.deps | 4 | ||||
| -rw-r--r-- | src/ocnewsurlreader.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/ocnewsurlreader.h b/include/ocnewsurlreader.h index 7ac54c7d..66a37c37 100644 --- a/include/ocnewsurlreader.h +++ b/include/ocnewsurlreader.h @@ -2,6 +2,7 @@ #define NEWSBOAT_OCNEWSURLREADER_H_ #include "urlreader.h" +#include "utf8string.h" namespace newsboat { @@ -15,7 +16,7 @@ public: std::string get_source() override; private: - std::string file; + Utf8String file; RemoteApi* api; }; @@ -602,8 +602,8 @@ src/ocnewsapi.o: src/ocnewsapi.cpp include/ocnewsapi.h \ target/cxxbridge/libnewsboat-ffi/src/logger.rs.h \ target/cxxbridge/libnewsboat-ffi/src/utils.rs.h src/ocnewsurlreader.o: src/ocnewsurlreader.cpp include/ocnewsurlreader.h \ - include/urlreader.h 3rd-party/optional.hpp include/fileurlreader.h \ - include/utf8string.h include/logger.h config.h include/strprintf.h \ + include/urlreader.h 3rd-party/optional.hpp 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/configactionhandler.h include/utils.h \ 3rd-party/expected.hpp include/logger.h \ diff --git a/src/ocnewsurlreader.cpp b/src/ocnewsurlreader.cpp index bb2a63b6..bfcd362f 100644 --- a/src/ocnewsurlreader.cpp +++ b/src/ocnewsurlreader.cpp @@ -8,7 +8,7 @@ namespace newsboat { OcNewsUrlReader::OcNewsUrlReader(const std::string& url_file, RemoteApi* a) - : file(url_file) + : file(Utf8String::from_utf8(url_file)) , api(a) { } @@ -21,7 +21,7 @@ nonstd::optional<std::string> OcNewsUrlReader::reload() tags.clear(); alltags.clear(); - 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()); |