fly/flightgear
1
0
Fork 0
Code Activity

Use type-safe subsystem access

Browse source
This commit is contained in:
James Turner 2022-03-24 10:32:43 +00:00
parent a9e09a0ae4
commit abb394935d
1 changed files with 7 additions and 7 deletions

14
src/Main/fg_scene_commands.cxx
View file

@ -308,7 +308,7 @@ do_dialog_new (const SGPropertyNode * arg, SGPropertyNode * root)
static bool static bool
do_dialog_show (const SGPropertyNode * arg, SGPropertyNode * root) do_dialog_show (const SGPropertyNode * arg, SGPropertyNode * root)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); auto gui = globals->get_subsystem<NewGUI>();
gui->showDialog(arg->getStringValue("dialog-name")); gui->showDialog(arg->getStringValue("dialog-name"));
return true; return true;
} }
@ -321,7 +321,7 @@ do_dialog_show (const SGPropertyNode * arg, SGPropertyNode * root)
static bool static bool
do_dialog_toggle (const SGPropertyNode * arg, SGPropertyNode * root) do_dialog_toggle (const SGPropertyNode * arg, SGPropertyNode * root)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); auto gui = globals->get_subsystem<NewGUI>();
gui->toggleDialog(arg->getStringValue("dialog-name")); gui->toggleDialog(arg->getStringValue("dialog-name"));
return true; return true;
} }
@ -333,7 +333,7 @@ do_dialog_toggle (const SGPropertyNode * arg, SGPropertyNode * root)
static bool static bool
do_dialog_close (const SGPropertyNode * arg, SGPropertyNode * root) do_dialog_close (const SGPropertyNode * arg, SGPropertyNode * root)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); auto gui = globals->get_subsystem<NewGUI>();
if(arg->hasValue("dialog-name")) if(arg->hasValue("dialog-name"))
return gui->closeDialog(arg->getStringValue("dialog-name")); return gui->closeDialog(arg->getStringValue("dialog-name"));
return gui->closeActiveDialog(); return gui->closeActiveDialog();
@ -348,7 +348,7 @@ do_dialog_close (const SGPropertyNode * arg, SGPropertyNode * root)
static bool static bool
do_dialog_update (const SGPropertyNode * arg, SGPropertyNode * root) do_dialog_update (const SGPropertyNode * arg, SGPropertyNode * root)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); auto gui = globals->get_subsystem<NewGUI>();
FGDialog * dialog; FGDialog * dialog;
if (arg->hasValue("dialog-name")) if (arg->hasValue("dialog-name"))
dialog = gui->getDialog(arg->getStringValue("dialog-name")); dialog = gui->getDialog(arg->getStringValue("dialog-name"));
@ -401,14 +401,14 @@ do_open_launcher(const SGPropertyNode*, SGPropertyNode*)
static bool static bool
do_dialog_apply (const SGPropertyNode * arg, SGPropertyNode * root) do_dialog_apply (const SGPropertyNode * arg, SGPropertyNode * root)
{ {
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); auto gui = globals->get_subsystem<NewGUI>();
FGDialog * dialog; FGDialog* dialog = nullptr;
if (arg->hasValue("dialog-name")) if (arg->hasValue("dialog-name"))
dialog = gui->getDialog(arg->getStringValue("dialog-name")); dialog = gui->getDialog(arg->getStringValue("dialog-name"));
else else
dialog = gui->getActiveDialog(); dialog = gui->getActiveDialog();
if (dialog != 0) { if (dialog) {
dialog->applyValues(arg->getStringValue("object-name")); dialog->applyValues(arg->getStringValue("object-name"));
return true; return true;
} else { } else {