diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index aa0f42f3b0..c249792d33 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2228,7 +2228,7 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form) // shortcutsTW->setSelectionMode(QAbstractItemView::MultiSelection); connect(bindFilePB, SIGNAL(clicked()), - this, SLOT(select_bind())); + this, SLOT(selectBind())); connect(bindFileED, SIGNAL(textChanged(QString)), this, SIGNAL(changed())); connect(removePB, SIGNAL(clicked()), @@ -2246,13 +2246,13 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form) connect(shortcut_->cancelPB, SIGNAL(clicked()), shortcut_, SLOT(reject())); connect(shortcut_->clearPB, SIGNAL(clicked()), - this, SLOT(shortcut_clearPB_pressed())); + this, SLOT(shortcutClearPressed())); connect(shortcut_->removePB, SIGNAL(clicked()), - this, SLOT(shortcut_removePB_pressed())); + this, SLOT(shortcutRemovePressed())); connect(shortcut_->okPB, SIGNAL(clicked()), - this, SLOT(shortcut_okPB_pressed())); + this, SLOT(shortcutOkPressed())); connect(shortcut_->cancelPB, SIGNAL(clicked()), - this, SLOT(shortcut_cancelPB_pressed())); + this, SLOT(shortcutCancelPressed())); } @@ -2527,7 +2527,7 @@ void PrefShortcuts::removeShortcut() } -void PrefShortcuts::select_bind() +void PrefShortcuts::selectBind() { QString file = form_->browsebind(internalPath(bindFileED->text())); if (!file.isEmpty()) { @@ -2596,7 +2596,7 @@ docstring makeCmdString(FuncRequest const & f) } -void PrefShortcuts::shortcut_okPB_pressed() +void PrefShortcuts::shortcutOkPressed() { QString const new_lfun = shortcut_->lfunLE->text(); FuncRequest func = lyxaction.lookupFunc(fromqstr(new_lfun)); @@ -2659,19 +2659,19 @@ void PrefShortcuts::shortcut_okPB_pressed() } -void PrefShortcuts::shortcut_cancelPB_pressed() +void PrefShortcuts::shortcutCancelPressed() { shortcut_->shortcutWG->reset(); } -void PrefShortcuts::shortcut_clearPB_pressed() +void PrefShortcuts::shortcutClearPressed() { shortcut_->shortcutWG->reset(); } -void PrefShortcuts::shortcut_removePB_pressed() +void PrefShortcuts::shortcutRemovePressed() { shortcut_->shortcutWG->removeFromSequence(); } diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h index 103f45d3b5..1fb7d069d3 100644 --- a/src/frontends/qt4/GuiPrefs.h +++ b/src/frontends/qt4/GuiPrefs.h @@ -453,18 +453,19 @@ public: KeySequence const & shortcut, KeyMap::ItemType tag); public Q_SLOTS: - void select_bind(); + void selectBind(); void on_modifyPB_pressed(); void on_newPB_pressed(); void on_removePB_pressed(); void on_searchLE_textEdited(); /// void on_shortcutsTW_itemSelectionChanged(); - void shortcut_okPB_pressed(); - void shortcut_cancelPB_pressed(); - void shortcut_clearPB_pressed(); - void shortcut_removePB_pressed(); void on_shortcutsTW_itemDoubleClicked(); + /// + void shortcutOkPressed(); + void shortcutCancelPressed(); + void shortcutClearPressed(); + void shortcutRemovePressed(); private: ///