fly/flightgear
1
0
Fork 0
Code Activity

PUIDialog: some C++11 style clean-ups

Browse source
This commit is contained in:
James Turner 2020-04-24 21:51:17 +01:00
parent 027bd7105e
commit 1f07a8eba8
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/GUI/FGPUIDialog.cxx
View file

@ -666,22 +666,21 @@ copy_from_pui (puObject *object, SGPropertyNode *node)
FGPUIDialog::FGPUIDialog (SGPropertyNode *props) :
FGDialog(props),
_object(0),
_gui((NewGUI *)globals->get_subsystem("gui")),
_object(nullptr),
_gui(globals->get_subsystem<NewGUI>()),
_props(props),
_needsRelayout(false)
{
_module = string("__dlg:") + props->getStringValue("name", "[unnamed]");
_name = props->getStringValue("name", "[unnamed]");
SGPropertyNode *nasal = props->getNode("nasal");
if (nasal) {
auto nas = globals->get_subsystem<FGNasalSys>();
if (nasal && nas) {
_nasal_close = nasal->getNode("close");
SGPropertyNode *open = nasal->getNode("open");
if (open) {
const char *s = open->getStringValue();
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
if (nas)
nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), props);
nas->createModule(_module.c_str(), _module.c_str(), s, strlen(s), props);
}
}
display(props);
@ -694,7 +693,7 @@ FGPUIDialog::~FGPUIDialog ()
_props->setIntValue("lastx", x);
_props->setIntValue("lasty", y);
FGNasalSys *nas = (FGNasalSys *)globals->get_subsystem("nasal");
auto nas = globals->get_subsystem<FGNasalSys>();
if (nas) {
if (_nasal_close) {
const char *s = _nasal_close->getStringValue();