* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h
index 836da8217e03024131858e6cda45accc874c8603..b491d738bec9f7b2579509722001abb81b5cb499 100644 (file)
--- a/src/frontends/qt4/GuiBranch.h
+++ b/src/frontends/qt4/GuiBranch.h
@@ -4,58 +4,53 @@
  * 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.
  */
 
-#ifndef QBRANCH_H
-#define QBRANCH_H
+#ifndef GUIBRANCH_H
+#define GUIBRANCH_H
 
-#include "GuiDialogView.h"
+#include "GuiDialog.h"
 #include "ui_BranchUi.h"
+#include "insets/InsetBranch.h"
 
-#include <QCloseEvent>
-#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_;
-};
 
-class ControlBranch;
-
-/** This class provides a QT implementation of the Branch Dialog.
- */
-class GuiBranch : public QController<ControlBranch, GuiView<GuiBranchDialog> >
-{
 public:
-       friend class GuiBranchDialog;
+       GuiBranch(GuiView & lv);
+
+private Q_SLOTS:
+       void change_adaptor();
 
-       /// Constructor
-       GuiBranch(Dialog &);
 private:
        ///  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
 } // namespace lyx
 
-#endif // QBRANCH_H
+#endif // GUIBRANCH_H