fly/flightgear
1
0
Fork 0
Code Activity

rename NewGUI::getDialog() to NewGUI::getDialogProperties()

Browse source 
getDialog wrongly implies that it returns an FGDialog, and we might later
need a real getDialog.
This commit is contained in:
mfranz 2006-04-28 09:59:31 +00:00
parent 2ae061c9c3
commit ca46e8d5d5
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ATC/ATCDialog.cxx
View file

@ -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. // Display the ATC popup dialog box with options relevant to the users current situation.
void FGATCDialog::PopupDialog() { void FGATCDialog::PopupDialog() {
const char *dialog_name = "atc-dialog"; const char *dialog_name = "atc-dialog";
SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name);
if (!dlg) if (!dlg)
return; return;
@ -306,7 +306,7 @@ struct atcdata {
void FGATCDialog::FreqDialog() { void FGATCDialog::FreqDialog() {
const char *dialog_name = "atc-freq-search"; const char *dialog_name = "atc-freq-search";
SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name);
if (!dlg) if (!dlg)
return; return;
@ -357,7 +357,7 @@ void FGATCDialog::FreqDialog() {
void FGATCDialog::FreqDisplay(string& ident) { void FGATCDialog::FreqDisplay(string& ident) {
const char *dialog_name = "atc-freq-display"; const char *dialog_name = "atc-freq-display";
SGPropertyNode_ptr dlg = _gui->getDialog(dialog_name); SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name);
if (!dlg) if (!dlg)
return; return;

2
src/GUI/gui_funcs.cxx
View file

@ -164,7 +164,7 @@ void mkDialog (const char *txt)
NewGUI *gui = (NewGUI *)globals->get_subsystem("gui"); NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
if (!gui) if (!gui)
return; return;
SGPropertyNode_ptr dlg = gui->getDialog("message"); SGPropertyNode_ptr dlg = gui->getDialogProperties("message");
if (!dlg) if (!dlg)
return; return;

2
src/GUI/new_gui.cxx
View file

@ -166,7 +166,7 @@ NewGUI::closeDialog (const string& name)
} }
SGPropertyNode_ptr SGPropertyNode_ptr
NewGUI::getDialog (const string &name) NewGUI::getDialogProperties (const string &name)
{ {
if(_dialog_props.find(name) != _dialog_props.end()) if(_dialog_props.find(name) != _dialog_props.end())
return _dialog_props[name]; return _dialog_props[name];

2
src/GUI/new_gui.hxx
View file

@ -143,7 +143,7 @@ public:
* @param name The name of the dialog box. * @param name The name of the dialog box.
* @return node pointer if the dialog was found, zero otherwise. * @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. * Return a pointer to the current menubar.