Next camel

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29811 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2009-05-23 09:47:20 +00:00
parent 079ef62651
commit 666bf1a261
2 changed files with 8 additions and 8 deletions

View File

@ -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();
}

View File

@ -40,8 +40,8 @@ private Q_SLOTS:
void sortToggled();
void caseSensitiveToggled();
void updateClicked();
void reset_dialog();
void dialog_rejected();
void resetDialog();
void dialogRejected();
private:
///