diff options
author | hassless <85612141+hassless@users.noreply.github.com> | 2021-06-18 17:17:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-18 17:17:26 +0200 |
commit | 84a6c88e98d8b1420edbddd7b67a38737bf5cbb2 (patch) | |
tree | b10cab7ef1a7645fa897aabb179c2e8849a919d7 /src/displayapp/screens/settings/Settings.cpp | |
parent | d0df278b0be2aae0493d901569a094dba221ce99 (diff) | |
parent | e90e8c7426f9a44e696b208a5b393a60476a3d43 (diff) |
Merge branch 'JF002:develop' into improve-battery-percentage-to-battery-icon-mapping
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index 2c72c832..e63a3584 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -46,7 +46,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() { {Symbols::clock, "Watch face", Apps::SettingWatchFace}, }}; - return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications)); + return std::make_unique<Screens::List>(0, 2, app, settingsController, applications); } std::unique_ptr<Screen> Settings::CreateScreen2() { @@ -58,5 +58,5 @@ std::unique_ptr<Screen> Settings::CreateScreen2() { {Symbols::list, "About", Apps::SysInfo}, }}; - return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications)); + return std::make_unique<Screens::List>(1, 2, app, settingsController, applications); } |