summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/FirmwareUpdate.cpp
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2020-10-08 20:58:24 +0200
committerGitHub <noreply@github.com>2020-10-08 20:58:24 +0200
commit0a8d8953f73cd09844652515651d55b12ce6f2bf (patch)
tree3464df442327b60b3c7f77464f246a66c68f0d9a /src/displayapp/screens/FirmwareUpdate.cpp
parent9d43eff43a5984dfb368445d3428560dae9269da (diff)
parente85d1ffc625c73dcbb30c783707bfb6110af6a41 (diff)
Merge pull request #80 from Avamander/patch-1
Switched from NULL to nullptr
Diffstat (limited to 'src/displayapp/screens/FirmwareUpdate.cpp')
-rw-r--r--src/displayapp/screens/FirmwareUpdate.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/displayapp/screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp
index e831114d..778409eb 100644
--- a/src/displayapp/screens/FirmwareUpdate.cpp
+++ b/src/displayapp/screens/FirmwareUpdate.cpp
@@ -10,19 +10,19 @@ extern lv_font_t jetbrains_mono_bold_20;
FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Ble& bleController) :
Screen(app), bleController{bleController} {
- titleLabel = lv_label_create(lv_scr_act(), NULL);
+ titleLabel = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text(titleLabel, "Firmware update");
lv_obj_set_auto_realign(titleLabel, true);
- lv_obj_align(titleLabel, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
+ lv_obj_align(titleLabel, nullptr, LV_ALIGN_IN_TOP_MID, 0, 50);
- bar1 = lv_bar_create(lv_scr_act(), NULL);
+ bar1 = lv_bar_create(lv_scr_act(), nullptr);
lv_obj_set_size(bar1, 200, 30);
- lv_obj_align(bar1, NULL, LV_ALIGN_CENTER, 0, 0);
+ lv_obj_align(bar1, nullptr, LV_ALIGN_CENTER, 0, 0);
lv_bar_set_anim_time(bar1, 10);
lv_bar_set_range(bar1, 0, 100);
lv_bar_set_value(bar1, 0, LV_ANIM_OFF);
- percentLabel = lv_label_create(lv_scr_act(), NULL);
+ percentLabel = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text(percentLabel, "");
lv_obj_set_auto_realign(percentLabel, true);
lv_obj_align(percentLabel, bar1, LV_ALIGN_OUT_TOP_MID, 0, 60);