X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBranch.cpp;h=57484c86f174426fd29c12c7d158339017d265d7;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=7832e9e05e128b78a84abce87a62b683c9f7fb44;hpb=85b05737d4fb83ec80443d79ffd409b5028c7200;p=lyx.git

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 7832e9e05e..57484c86f1 100644
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  * \author Martin Vermeer
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,7 +15,6 @@
 #include "GuiBranch.h"
 
 #include "qt_helpers.h"
-#include "BranchList.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
@@ -25,20 +24,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 +45,6 @@ GuiBranch::GuiBranch(LyXView & lv)
 }
 
 
-void GuiBranch::closeEvent(QCloseEvent * e)
-{
-	slotClose();
-	e->accept();
-}
-
-
 void GuiBranch::change_adaptor()
 {
 	changed();
@@ -77,7 +65,7 @@ void GuiBranch::updateContents()
 	int id = 0;
 	int count = 0;
 	for (const_iterator it = begin; it != end; ++it, ++count) {
-		docstring const & branch = it->getBranch();
+		docstring const & branch = it->branch();
 		branchCO->addItem(toqstr(branch));
 
 		if (cur_branch == branch)
@@ -95,7 +83,7 @@ void GuiBranch::applyView()
 
 bool GuiBranch::initialiseParams(string const & data)
 {
-	InsetBranchMailer::string2params(data, params_);
+	InsetBranch::string2params(data, params_);
 	return true;
 }
 
@@ -108,14 +96,14 @@ 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
 } // namespace lyx
 
-#include "GuiBranch_moc.cpp"
+#include "moc_GuiBranch.cpp"