diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-09-26 13:36:07 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-09-26 13:36:07 +1000 |
| commit | 4d99d22e10a3cb2a421da1618c127128816613c9 (patch) | |
| tree | 527490a466348e5cf40cf10a8f3768aa5be4e7c1 /src/ui/include | |
| parent | f6d06421090f88094aba76b72b04d614f54efafa (diff) | |
| download | tangara-fw-4d99d22e10a3cb2a421da1618c127128816613c9.tar.gz | |
std::string -> std::pmr::string in psram
Diffstat (limited to 'src/ui/include')
| -rw-r--r-- | src/ui/include/modal_confirm.hpp | 2 | ||||
| -rw-r--r-- | src/ui/include/modal_progress.hpp | 2 | ||||
| -rw-r--r-- | src/ui/include/screen.hpp | 2 | ||||
| -rw-r--r-- | src/ui/include/screen_onboarding.hpp | 2 | ||||
| -rw-r--r-- | src/ui/include/screen_playing.hpp | 3 | ||||
| -rw-r--r-- | src/ui/include/screen_track_browser.hpp | 2 | ||||
| -rw-r--r-- | src/ui/include/widget_top_bar.hpp | 4 |
7 files changed, 10 insertions, 7 deletions
diff --git a/src/ui/include/modal_confirm.hpp b/src/ui/include/modal_confirm.hpp index 4be6b68e..29d80041 100644 --- a/src/ui/include/modal_confirm.hpp +++ b/src/ui/include/modal_confirm.hpp @@ -19,7 +19,7 @@ namespace modals { class Confirm : public Modal { public: - Confirm(Screen*, const std::string& title, bool has_cancel); + Confirm(Screen*, const std::pmr::string& title, bool has_cancel); private: lv_obj_t* container_; diff --git a/src/ui/include/modal_progress.hpp b/src/ui/include/modal_progress.hpp index 96897029..f312d509 100644 --- a/src/ui/include/modal_progress.hpp +++ b/src/ui/include/modal_progress.hpp @@ -19,7 +19,7 @@ namespace modals { class Progress : public Modal { public: - Progress(Screen*, std::string title); + Progress(Screen*, std::pmr::string title); private: lv_obj_t* container_; diff --git a/src/ui/include/screen.hpp b/src/ui/include/screen.hpp index f93d17a5..76251a72 100644 --- a/src/ui/include/screen.hpp +++ b/src/ui/include/screen.hpp @@ -64,7 +64,7 @@ class Screen { class MenuScreen : public Screen { public: - MenuScreen(const std::string& title, bool show_back_button = true); + MenuScreen(const std::pmr::string& title, bool show_back_button = true); }; } // namespace ui diff --git a/src/ui/include/screen_onboarding.hpp b/src/ui/include/screen_onboarding.hpp index 81ce6d3a..0c3c61fb 100644 --- a/src/ui/include/screen_onboarding.hpp +++ b/src/ui/include/screen_onboarding.hpp @@ -18,7 +18,7 @@ namespace screens { class Onboarding : public Screen { public: - Onboarding(const std::string& title, bool show_prev, bool show_next); + Onboarding(const std::pmr::string& title, bool show_prev, bool show_next); private: lv_obj_t* window_; diff --git a/src/ui/include/screen_playing.hpp b/src/ui/include/screen_playing.hpp index f2998c88..2e29130c 100644 --- a/src/ui/include/screen_playing.hpp +++ b/src/ui/include/screen_playing.hpp @@ -45,7 +45,8 @@ class Playing : public Screen { private: auto control_button(lv_obj_t* parent, char* icon) -> lv_obj_t*; - auto next_up_label(lv_obj_t* parent, const std::string& text) -> lv_obj_t*; + auto next_up_label(lv_obj_t* parent, const std::pmr::string& text) + -> lv_obj_t*; auto BindTrack(const database::Track& track) -> void; auto ApplyNextUp(const std::vector<database::Track>& tracks) -> void; diff --git a/src/ui/include/screen_track_browser.hpp b/src/ui/include/screen_track_browser.hpp index 3d347158..fdeb3afe 100644 --- a/src/ui/include/screen_track_browser.hpp +++ b/src/ui/include/screen_track_browser.hpp @@ -23,7 +23,7 @@ class TrackBrowser : public Screen { public: TrackBrowser( std::weak_ptr<database::Database> db, - const std::string& title, + const std::pmr::string& title, std::future<database::Result<database::IndexRecord>*>&& initial_page); ~TrackBrowser() {} diff --git a/src/ui/include/widget_top_bar.hpp b/src/ui/include/widget_top_bar.hpp index 87920338..1a2c826a 100644 --- a/src/ui/include/widget_top_bar.hpp +++ b/src/ui/include/widget_top_bar.hpp @@ -11,6 +11,8 @@ #include "lvgl.h" +#include "memory_resource.hpp" + namespace ui { namespace widgets { @@ -19,7 +21,7 @@ class TopBar { public: struct Configuration { bool show_back_button; - std::string title; + std::pmr::string title; }; enum class PlaybackState { |
