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

getDialog wrongly implies that it returns an FGDialog, and we might later
need a real getDialog.

diff --git a/src/ATC/ATCDialog.cxx b/src/ATC/ATCDialog.cxx
index 8fc3e0f1efbb3c83a2cb53ab8d70c003733f16b4..3119ae3364adbb6862f4ee114f5656b0f677efc9 100644 (file)
--- 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 8e94939f3941694c3205e3527a54eaf4360069f7..7086481aff3d184cb8eb4964d2cd3020d7305c00 100644 (file)
--- 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 4cb0fe882967e714be275e458036a7afc64cb620..03f9f68cc4068e0ed0bcccb536b5f4bd87ac14b6 100644 (file)
--- 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 59425d86d4f7055b95a83e9afc57bf450bdae947..1ccd5662d62299f843d15bcff2022ac586691da8 100644 (file)
--- 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.