return true;
}
-extern void fgPresetAirport (puObject *);
-static bool
-do_preset_airport_dialog (const SGPropertyNode * arg)
-{
- fgPresetAirport(0);
- return true;
-}
-
-extern void fgPresetRunway (puObject *);
-static bool
-do_preset_runway_dialog (const SGPropertyNode * arg)
-{
- fgPresetRunway(0);
- return true;
-}
-
-extern void fgPresetOffsetDistance (puObject *);
-static bool
-do_preset_offset_distance_dialog (const SGPropertyNode * arg)
-{
- fgPresetOffsetDistance(0);
- return true;
-}
-
-extern void fgPresetAltitude (puObject *);
-static bool
-do_preset_altitude_dialog (const SGPropertyNode * arg)
-{
- fgPresetAltitude(0);
- return true;
-}
-
-extern void fgPresetGlideslope (puObject *);
-static bool
-do_preset_glideslope_dialog (const SGPropertyNode * arg)
-{
- fgPresetGlideslope(0);
- return true;
-}
-
-extern void fgPresetAirspeed (puObject *);
-static bool
-do_preset_airspeed_dialog (const SGPropertyNode * arg)
-{
- fgPresetAirspeed(0);
- return true;
-}
-
-extern void fgPresetCommit (puObject *);
-static bool
-do_preset_commit_dialog (const SGPropertyNode * arg)
-{
- fgPresetCommit(0);
- return true;
-}
-
extern void AddWayPoint (puObject *);
static bool
do_ap_add_waypoint_dialog (const SGPropertyNode * arg)
} deprecated_dialogs [] = {
{ "old-save-dialog", do_save_dialog },
{ "old-load-dialog", do_load_dialog },
- { "old-reinit_dialog", do_reinit_dialog },
+ { "old-reinit-dialog", do_reinit_dialog },
#if defined(TR_HIRES_SNAP)
{ "old-hires-snapshot-dialog", do_hires_snapshot_dialog },
#endif
{ "old-pilot-offset-dialog", do_pilot_offset_dialog },
{ "old-hud-alpha-dialog", do_hud_alpha_dialog },
{ "old-properties-dialog", do_properties_dialog },
- { "old-preset-airport-dialog", do_preset_airport_dialog },
- { "old-preset-runway-dialog", do_preset_runway_dialog },
- { "old-preset-offset-distance-dialog", do_preset_offset_distance_dialog },
- { "old-preset-altitude-dialog", do_preset_altitude_dialog },
- { "old-preset-glideslope-dialog", do_preset_glideslope_dialog },
- { "old-preset-airspeed-dialog", do_preset_airspeed_dialog },
- { "old-preset-commit-dialog", do_preset_commit_dialog },
{ "old-ap-add-waypoint-dialog", do_ap_add_waypoint_dialog },
{ "old-ap-pop-waypoint-dialog", do_ap_pop_waypoint_dialog },
{ "old-ap-clear-route-dialog", do_ap_clear_route_dialog },
hide();
puDeleteObject(_menuBar);
- int i;
+ unsigned int i;
// Delete all the character arrays
// we were forced to keep around for
// plib.
- std::cerr << "Deleting char arrays\n";
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting char arrays");
for (i = 0; i < _char_arrays.size(); i++) {
for (int j = 0; _char_arrays[i][j] != 0; j++)
free(_char_arrays[i][j]); // added with strdup
- delete _char_arrays[i];
+ delete[] _char_arrays[i];
}
// Delete all the callback arrays
// we were forced to keep around for
// plib.
- std::cerr << "Deleting callback arrays\n";
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting callback arrays");
for (i = 0; i < _callback_arrays.size(); i++)
- delete _callback_arrays[i];
+ delete[] _callback_arrays[i];
// Delete all those bindings
- std::cerr << "Deleting bindings\n";
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings");
map<string,vector<FGBinding *> >::iterator it;
it = _bindings.begin();
for (it = _bindings.begin(); it != _bindings.end(); it++) {
- std::cerr << "Deleting bindings for " << it->first << std::endl;
- for (int i = 0; i < it->second.size(); i++)
+ SG_LOG(SG_GENERAL, SG_INFO, "Deleting bindings for " << it->first);
+ for ( i = 0; i < it->second.size(); i++ )
delete it->second[i];
}
- std::cerr << "Done.\n";
+ SG_LOG(SG_GENERAL, SG_INFO, "Done.");
}
void
char ** items = make_char_array(array_size);
puCallback * callbacks = make_callback_array(array_size);
- for (int i = 0, j = item_nodes.size() - 1;
+ for (unsigned int i = 0, j = item_nodes.size() - 1;
i < item_nodes.size();
i++, j--) {
vector<SGPropertyNode_ptr> binding_nodes =
item_nodes[i]->getChildren("binding");
- for (int k = 0; k < binding_nodes.size(); k++)
+ for (unsigned int k = 0; k < binding_nodes.size(); k++)
_bindings[items[j]].push_back(new FGBinding(binding_nodes[k]));
}
fgLoadProps("gui/menubar.xml", &props);
vector<SGPropertyNode_ptr> menu_nodes = props.getChildren("menu");
- for (int i = 0; i < menu_nodes.size(); i++)
+ for (unsigned int i = 0; i < menu_nodes.size(); i++)
make_menu(menu_nodes[i]);
_menuBar->close();