do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 7832e9e05e128b78a84abce87a62b683c9f7fb44..0f6793d2d14f9f554d4186b52602fdba2e0593ad 100644 (file)
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -25,20 +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"), Controller(this)
+GuiBranch::GuiBranch(GuiView & lv)
+       : GuiDialog(lv, "branch", qt_("Branch Settings"))
 {
        setupUi(this);
-       setController(this, false);
-       setViewTitle(_("Branch Settings"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -50,13 +46,6 @@ GuiBranch::GuiBranch(LyXView & lv)
 }
 
 
-void GuiBranch::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiBranch::change_adaptor()
 {
        changed();
@@ -112,7 +101,7 @@ void GuiBranch::dispatchParams()
 }
 
 
-Dialog * createGuiBranch(LyXView & lv) { return new GuiBranch(lv); }
+Dialog * createGuiBranch(GuiView & lv) { return new GuiBranch(lv); }
 
 
 } // namespace frontend