From 666bf1a261433cf499d6689f790654cad04fdf03 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 23 May 2009 09:47:20 +0000 Subject: [PATCH] Next camel git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29811 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiRef.cpp | 12 ++++++------ src/frontends/qt4/GuiRef.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index 54cfdb3bd3..668198c27c 100644 --- a/src/frontends/qt4/GuiRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -58,8 +58,8 @@ GuiRef::GuiRef(GuiView & lv) connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); - connect(closePB, SIGNAL(clicked()), this, SLOT(reset_dialog())); - connect(this, SIGNAL(rejected()), this, SLOT(dialog_rejected())); + connect(closePB, SIGNAL(clicked()), this, SLOT(resetDialog())); + connect(this, SIGNAL(rejected()), this, SLOT(dialogRejected())); connect(typeCO, SIGNAL(activated(int)), this, SLOT(changed_adaptor())); @@ -186,16 +186,16 @@ void GuiRef::updateClicked() } -void GuiRef::dialog_rejected() +void GuiRef::dialogRejected() { - reset_dialog(); + resetDialog(); // We have to do this manually, instead of calling slotClose(), because // the dialog has already been made invisible before rejected() triggers. Dialog::disconnect(); } -void GuiRef::reset_dialog() +void GuiRef::resetDialog() { at_ref_ = false; setGotoRef(); @@ -205,7 +205,7 @@ void GuiRef::reset_dialog() void GuiRef::closeEvent(QCloseEvent * e) { slotClose(); - reset_dialog(); + resetDialog(); e->accept(); } diff --git a/src/frontends/qt4/GuiRef.h b/src/frontends/qt4/GuiRef.h index cf2a3d491c..b931f70280 100644 --- a/src/frontends/qt4/GuiRef.h +++ b/src/frontends/qt4/GuiRef.h @@ -40,8 +40,8 @@ private Q_SLOTS: void sortToggled(); void caseSensitiveToggled(); void updateClicked(); - void reset_dialog(); - void dialog_rejected(); + void resetDialog(); + void dialogRejected(); private: /// -- 2.39.2