diff --git a/src/blackgui/views/aircraftmodelview.h b/src/blackgui/views/aircraftmodelview.h index bacf3ab74..0ff74989e 100644 --- a/src/blackgui/views/aircraftmodelview.h +++ b/src/blackgui/views/aircraftmodelview.h @@ -106,7 +106,7 @@ namespace BlackGui bool highlightModelStrings() const; //! Loading data will be restricted to simulator - void setSimulatorForLoading(const BlackMisc::Simulation::CSimulatorInfo &sim) { m_loadingRequiresSimulator = sim; } + void setSimulatorForLoading(const BlackMisc::Simulation::CSimulatorInfo &simulator) { m_loadingRequiresSimulator = simulator; } signals: //! Request to stash if applicable diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 36c809b11..5785dccdf 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -271,7 +271,7 @@ namespace BlackGui break; } case MenuMaterializeFilter: { ma.addAction(CIcons::tableRelationship16(), "Materialize filtered data", CMenuAction::pathViewFilter(), { this, &CViewBaseNonTemplate::materializeFilter }); break; } - case MenuLoad: { ma.addAction(CIcons::disk16(), "Load from file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::ps_loadJsonAction }); break; } + case MenuLoad: { ma.addAction(CIcons::disk16(), "Load from file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::loadJsonAction }); break; } case MenuSave: { ma.addAction(CIcons::disk16(), "Save data in file", CMenuAction::pathViewLoadSave(), { this, &CViewBaseNonTemplate::saveJsonAction }, CShortcut::keySaveViews()); break; } case MenuCut: { @@ -609,7 +609,7 @@ namespace BlackGui m_filterWidget->show(); } - void CViewBaseNonTemplate::ps_loadJsonAction() + void CViewBaseNonTemplate::loadJsonAction() { if (!m_menus.testFlag(MenuLoad)) { return; } const CStatusMessage m = this->ps_loadJson(); diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 620cd40eb..2975e5e7e 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -438,9 +438,12 @@ namespace BlackGui //! Draw drop indicator virtual void drawDropIndicator(bool indicator) = 0; - //! Save JSON for action/menu, no return signatur + //! Save JSON for action/menu, void return signatur void saveJsonAction(); + //! Load JSON for action/menu, void return signatur + void loadJsonAction(); + //! Display the filter dialog void displayFilterDialog(); @@ -515,9 +518,6 @@ namespace BlackGui //! Load JSON virtual BlackMisc::CStatusMessage ps_loadJson() = 0; - //! Load JSON for action/menu, no return signatur - void ps_loadJsonAction(); - //! Save JSON virtual BlackMisc::CStatusMessage ps_saveJson() = 0;