X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBranch.h;h=b491d738bec9f7b2579509722001abb81b5cb499;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=2bf448d46cb94a2e1e1af88f8e55da00f4f45438;hpb=212386be8a1573fb52b5da718961835816a3c8e2;p=lyx.git

diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h
index 2bf448d46c..b491d738be 100644
--- a/src/frontends/qt4/GuiBranch.h
+++ b/src/frontends/qt4/GuiBranch.h
@@ -4,7 +4,9 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Spitzmüller
+ * \author Angus Leeming
+ * \author Martin Vermeer
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,52 +14,40 @@
 #ifndef GUIBRANCH_H
 #define GUIBRANCH_H
 
-#include "GuiDialogView.h"
-#include "ControlBranch.h"
+#include "GuiDialog.h"
 #include "ui_BranchUi.h"
+#include "insets/InsetBranch.h"
 
-#include <QDialog>
 
 namespace lyx {
 namespace frontend {
 
-class GuiBranch;
-
-class GuiBranchDialog : public QDialog, public Ui::BranchUi {
+class GuiBranch : public GuiDialog, public Ui::BranchUi
+{
 	Q_OBJECT
+
 public:
-	GuiBranchDialog(GuiBranch * form);
-protected Q_SLOTS:
-	virtual void change_adaptor();
-protected:
-	virtual void closeEvent(QCloseEvent * e);
-private:
-	GuiBranch * form_;
-};
+	GuiBranch(GuiView & lv);
 
+private Q_SLOTS:
+	void change_adaptor();
 
-/** This class provides a QT implementation of the Branch Dialog.
- */
-class GuiBranch : public GuiView<GuiBranchDialog> 
-{
-public:
-	/// Constructor
-	GuiBranch(GuiDialog &);
-	/// parent controller
-	ControlBranch & controller()
-	{ return static_cast<ControlBranch &>(this->getController()); }
-	/// parent controller
-	ControlBranch const & controller() const
-	{ return static_cast<ControlBranch const &>(this->getController()); }
 private:
-	friend class GuiBranchDialog;
-
 	///  Apply changes
-	virtual void apply();
-	/// Build the dialog
-	virtual void build_dialog();
+	void applyView();
 	/// Update dialog before showing it
-	virtual void update_contents();
+	void updateContents();
+	///
+	bool initialiseParams(std::string const & data);
+	///
+	void clearParams();
+	///
+	void dispatchParams();
+	///
+	bool isBufferDependent() const { return true; }
+
+	///
+	InsetBranchParams params_;
 };
 
 } // namespace frontend