refs #912, formatting, typos, const

This commit is contained in:
Klaus Basan
2017-03-18 20:40:05 +01:00
committed by Mathew Sutcliffe
parent ea50533755
commit 422e6626c8
10 changed files with 29 additions and 26 deletions

View File

@@ -79,8 +79,10 @@ namespace BlackGui
void initStyleSheet();
//! Runs the hotkey dialog and returns the result
static BlackMisc::Input::CActionHotkey getActionHotkey(const BlackMisc::Input::CActionHotkey &initial, const BlackMisc::CIdentifierList &applications,
QWidget *parent = nullptr);
static BlackMisc::Input::CActionHotkey getActionHotkey(
const BlackMisc::Input::CActionHotkey &initial,
const BlackMisc::CIdentifierList &applications,
QWidget *parent = nullptr);
private:
void ps_advancedModeChanged();
@@ -88,9 +90,9 @@ namespace BlackGui
void ps_combinationSelectionChanged(const BlackMisc::Input::CHotkeyCombination &combination);
void ps_combinationSelectionFinished(const BlackMisc::Input::CHotkeyCombination &combination);
void ps_changeSelectedAction(const QItemSelection &selected, const QItemSelection &deselected);
void changeApplicableMachine(int index);
void ps_accept();
void changeApplicableMachine(int index);
void synchronize();
void synchronizeSimpleSelection();
void synchronizeAdvancedSelection();
@@ -102,7 +104,7 @@ namespace BlackGui
QScopedPointer<Ui::CHotkeyDialog> ui;
BlackMisc::Input::CActionHotkey m_actionHotkey;
BlackGui::Models::CActionModel m_actionModel;
BlackCore::CInputManager *m_inputManager;
BlackCore::CInputManager *m_inputManager = nullptr;
};
} // ns
} // ns