diff options
author | JF002 <JF002@users.noreply.github.com> | 2021-03-31 20:33:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-31 20:33:37 +0200 |
commit | 58a2d000c4d49d96121894d6dd6bb861d7564bea (patch) | |
tree | e4a941aa36b6db254426bed309c48dd42d79dfd5 /src/displayapp/screens/Clock.cpp | |
parent | 136d4bb85e36777f0f9877fd065476ba1c02ca90 (diff) | |
parent | 8eb947a2239d431146de9295e281ee0163fa20e2 (diff) |
Merge pull request #238 from nscooling/make_unique
Resolved C++14 Cmake build issues so correctly building to C99/C++14
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
-rw-r--r-- | src/displayapp/screens/Clock.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index 342dd222..69180370 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -64,20 +64,20 @@ bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) { } std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() { - return std::unique_ptr<Screen>(new Screens::WatchFaceDigital(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, heartRateController)); + return std::make_unique<Screens::WatchFaceDigital>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, heartRateController); } std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() { - return std::unique_ptr<Screen>(new Screens::WatchFaceAnalog(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController)); + return std::make_unique<Screens::WatchFaceAnalog>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController); } /* // Examples for more watch faces std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() { - return std::unique_ptr<Screen>(new Screens::WatchFaceMinimal(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController)); + return std::make_unique<Screens::WatchFaceMinimal>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController); } std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() { - return std::unique_ptr<Screen>(new Screens::WatchFaceCustom(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController)); + return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController); } */
\ No newline at end of file |