* a configuration value for the mouse wheel scrolling speed:

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

diff --git a/src/frontends/qt4/GuiBranch.h b/src/frontends/qt4/GuiBranch.h
index 7fe05e6897b786ee73ce6bf71a370a2378ec0d10..e33e151a73c7ec221ffbf4d7a6e3b80744e38e09 100644 (file)
--- a/src/frontends/qt4/GuiBranch.h
+++ b/src/frontends/qt4/GuiBranch.h
@@ -22,12 +22,12 @@
 namespace lyx {
 namespace frontend {
 
-class GuiBranch : public GuiDialog, public Ui::BranchUi, public Controller
+class GuiBranch : public GuiDialog, public Ui::BranchUi
 {
        Q_OBJECT
 
 public:
-       GuiBranch(LyXView & lv);
+       GuiBranch(GuiView & lv);
 
 private Q_SLOTS:
        void change_adaptor();
@@ -35,8 +35,6 @@ private Q_SLOTS:
 private:
        ///
        void closeEvent(QCloseEvent * e);
-       /// parent controller
-       Controller & controller() { return *this; }
        ///  Apply changes
        void applyView();
        /// Update dialog before showing it