summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Modal.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/Modal.cpp
parent9d43eff43a5984dfb368445d3428560dae9269da (diff)
parente85d1ffc625c73dcbb30c783707bfb6110af6a41 (diff)
Merge pull request #80 from Avamander/patch-1
Switched from NULL to nullptr
Diffstat (limited to 'src/displayapp/screens/Modal.cpp')
-rw-r--r--src/displayapp/screens/Modal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/displayapp/screens/Modal.cpp b/src/displayapp/screens/Modal.cpp
index 63ae70c0..29f7bfa7 100644
--- a/src/displayapp/screens/Modal.cpp
+++ b/src/displayapp/screens/Modal.cpp
@@ -54,7 +54,7 @@ void Modal::Show(const char* msg) {
modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK;
modal_style.body.opa = LV_OPA_50;
- obj = lv_obj_create(lv_scr_act(), NULL);
+ obj = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_style(obj, &modal_style);
lv_obj_set_pos(obj, 0, 0);
lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES);
@@ -63,10 +63,10 @@ void Modal::Show(const char* msg) {
static const char * btns2[] = {"Ok", ""};
/* Create the message box as a child of the modal background */
- mbox = lv_mbox_create(obj, NULL);
+ mbox = lv_mbox_create(obj, nullptr);
lv_mbox_add_btns(mbox, btns2);
lv_mbox_set_text(mbox, msg);
- lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
+ lv_obj_align(mbox, nullptr, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_event_cb(mbox, Modal::mbox_event_cb);
mbox->user_data = this;