From dc972df59d33a4b18bb95dae8cd94e2c96612557 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 19 Jan 2015 16:44:54 -0800 Subject: [PATCH] Fixed load/saveAction types --- interface/src/Menu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index c23b603936..49d89b3a99 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -555,13 +555,13 @@ Menu::Menu() { #endif } -void Menu::loadAction(QSettings& settings, QAction& action) { +void Menu::loadAction(Settings& settings, QAction& action) { if (action.isChecked() != settings.value(action.text(), action.isChecked()).toBool()) { action.trigger(); } } -void Menu::saveAction(QSettings& settings, QAction& action) { +void Menu::saveAction(Settings& settings, QAction& action) { settings.setValue(action.text(), action.isChecked()); } @@ -572,12 +572,12 @@ void Menu::scanMenuBar(settingsAction modifySetting) { } } -void Menu::scanMenu(QMenu& menu, settingsAction modifySetting, QSettings& settings) { +void Menu::scanMenu(QMenu& menu, settingsAction modifySetting, Settings& settings) { settings.beginGroup(menu.title()); foreach (QAction* action, menu.actions()) { if (action->menu()) { scanMenu(*action->menu(), modifySetting, settings); - } else (action->isCheckable()) { + } else if (action->isCheckable()) { modifySetting(settings, *action); } }