Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiBranch.cpp

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 515bdf9c12af6950f099c1b6a6ac8f803d614570..10c24e1ec51e02d37149b6ec59882492b677f2bf 100644 (file)
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -25,19 +25,16 @@
 #include "insets/InsetBranch.h"
 
 #include <QPushButton>
-#include <QCloseEvent>
 
-using std::string;
-using std::vector;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiBranch::GuiBranch(LyXView & lv)
-       : GuiDialog(lv, "branch")
+GuiBranch::GuiBranch(GuiView & lv)
+       : GuiDialog(lv, "branch", qt_("Branch Settings"))
 {
        setupUi(this);
-       setViewTitle(_("Branch Settings"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -49,13 +46,6 @@ GuiBranch::GuiBranch(LyXView & lv)
 }
 
 
-void GuiBranch::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBranch::change_adaptor()
 {
        changed();
@@ -94,7 +84,7 @@ void GuiBranch::applyView()
 
 bool GuiBranch::initialiseParams(string const & data)
 {
-       InsetBranchMailer::string2params(data, params_);
+       InsetBranch::string2params(data, params_);
        return true;
 }
 
@@ -107,11 +97,11 @@ void GuiBranch::clearParams()
 
 void GuiBranch::dispatchParams()
 {
-       dispatch(FuncRequest(getLfun(), InsetBranchMailer::params2string(params_)));
+       dispatch(FuncRequest(getLfun(), InsetBranch::params2string(params_)));
 }
 
 
-Dialog * createGuiBranch(LyXView & lv) { return new GuiBranch(lv); }
+Dialog * createGuiBranch(GuiView & lv) { return new GuiBranch(lv); }
 
 
 } // namespace frontend