From ca46e8d5d599f80ab00fd83ab042e0c1581cb921 Mon Sep 17 00:00:00 2001 From: mfranz Date: Fri, 28 Apr 2006 09:59:31 +0000 Subject: [PATCH] rename NewGUI::getDialog() to NewGUI::getDialogProperties() getDialog wrongly implies that it returns an FGDialog, and we might later need a real getDialog. --- src/ATC/ATCDialog.cxx | 6 +++--- src/GUI/gui_funcs.cxx | 2 +- src/GUI/new_gui.cxx | 2 +- src/GUI/new_gui.hxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ATC/ATCDialog.cxx b/src/ATC/ATCDialog.cxx index 8fc3e0f1e..3119ae336 100644 --- a/src/ATC/ATCDialog.cxx +++ b/src/ATC/ATCDialog.cxx @@ -191,7 +191,7 @@ bool FGATCDialog::trans_reg( const string &station, int code, atc_type type ) { // Display the ATC popup dialog box with options relevant to the users current situation. void FGATCDialog::PopupDialog() { const char *dialog_name = "atc-dialog"; - SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); + SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); if (!dlg) return; @@ -306,7 +306,7 @@ struct atcdata { void FGATCDialog::FreqDialog() { const char *dialog_name = "atc-freq-search"; - SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); + SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); if (!dlg) return; @@ -357,7 +357,7 @@ void FGATCDialog::FreqDialog() { void FGATCDialog::FreqDisplay(string& ident) { const char *dialog_name = "atc-freq-display"; - SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); + SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); if (!dlg) return; diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx index 8e94939f3..7086481af 100644 --- a/src/GUI/gui_funcs.cxx +++ b/src/GUI/gui_funcs.cxx @@ -164,7 +164,7 @@ void mkDialog (const char *txt) NewGUI *gui = (NewGUI *)globals->get_subsystem("gui"); if (!gui) return; - SGPropertyNode_ptr dlg = gui->getDialog("message"); + SGPropertyNode_ptr dlg = gui->getDialogProperties("message"); if (!dlg) return; diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx index 4cb0fe882..03f9f68cc 100644 --- a/src/GUI/new_gui.cxx +++ b/src/GUI/new_gui.cxx @@ -166,7 +166,7 @@ NewGUI::closeDialog (const string& name) } SGPropertyNode_ptr -NewGUI::getDialog (const string &name) +NewGUI::getDialogProperties (const string &name) { if(_dialog_props.find(name) != _dialog_props.end()) return _dialog_props[name]; diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx index 59425d86d..1ccd5662d 100644 --- a/src/GUI/new_gui.hxx +++ b/src/GUI/new_gui.hxx @@ -143,7 +143,7 @@ public: * @param name The name of the dialog box. * @return node pointer if the dialog was found, zero otherwise. */ - virtual SGPropertyNode_ptr getDialog (const string &name); + virtual SGPropertyNode_ptr getDialogProperties (const string &name); /** * Return a pointer to the current menubar. -- 2.39.5