Cleanup Action class: The mother should be the main window (GuiView). This will hopef...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16807 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C
index 504012308e024332752bb9e67d8e234f439ee166..1aba7f9a8fe1db1faf7e6174a323c07b69aa6b6f 100644 (file)
--- a/src/frontends/qt4/Action.C
+++ b/src/frontends/qt4/Action.C
@@ -12,15 +12,14 @@
 
 #include "Action.h"
 
+#include "GuiView.h"
+#include "qt_helpers.h"
+
 #include "lyx_cb.h"
 #include "lyxfunc.h"
 #include "FuncStatus.h"
 #include "debug.h"
 
-#include "frontends/LyXView.h"
-
-#include "qt_helpers.h"
-
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
@@ -40,9 +39,9 @@ int const statusbar_timer_value = 3000;
 
 } // namespace anon
 
-Action::Action(LyXView & lyxView, docstring const & text,
+Action::Action(GuiView & lyxView, docstring const & text,
                FuncRequest const & func, docstring const & tooltip)
-       : QAction(this), func_(func), lyxView_(lyxView)
+       : QAction(&lyxView), func_(func), lyxView_(lyxView)
 {
        setText(toqstr(text));
        setToolTip(toqstr(tooltip));
@@ -51,9 +50,9 @@ Action::Action(LyXView & lyxView, docstring const & text,
        update();
 }
 
-Action::Action(LyXView & lyxView, string const & icon, docstring const & text,
+Action::Action(GuiView & lyxView, string const & icon, docstring const & text,
                FuncRequest const & func, docstring const & tooltip)
-               : QAction(this), func_(func), lyxView_(lyxView)
+               : QAction(&lyxView), func_(func), lyxView_(lyxView)
 {
        setIcon(QPixmap(icon.c_str()));
        setText(toqstr(text));

diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h
index c037171041212679727556dcb1d799d93a4145e9..06dbf18898927fa44410d7fa911a08b34164dcfa 100644 (file)
--- a/src/frontends/qt4/Action.h
+++ b/src/frontends/qt4/Action.h
@@ -26,6 +26,8 @@
 namespace lyx {
 namespace frontend {
 
+class GuiView;
+
 /**
  * Action - Qt interface with LyX' FuncRequest.
  *
@@ -35,10 +37,10 @@ class Action: public QAction {
        Q_OBJECT
 public:
 
-       Action(LyXView & lyxView, lyx::docstring const & text,
+       Action(GuiView & lyxView, lyx::docstring const & text,
                FuncRequest const & func, lyx::docstring const & tooltip = lyx::docstring());
 
-       Action(LyXView & lyxView, std::string const & icon, lyx::docstring const & text,
+       Action(GuiView & lyxView, std::string const & icon, lyx::docstring const & text,
                FuncRequest const & func, lyx::docstring const & tooltip = lyx::docstring());
 
        void update();
@@ -50,8 +52,7 @@ private Q_SLOTS:
 
 private:
        FuncRequest const & func_ ;
-       //FuncRequest func_ ;
-       LyXView & lyxView_;
+       GuiView & lyxView_;
 };
 
 

diff --git a/src/frontends/qt4/QLToolbar.C b/src/frontends/qt4/QLToolbar.C
index 41cce17ae8c2e0e45ff576272421899223903699..79e4ca3003cd1debf21f79dd4375551ca2dc46b0 100644 (file)
--- a/src/frontends/qt4/QLToolbar.C
+++ b/src/frontends/qt4/QLToolbar.C
@@ -193,7 +193,11 @@ void QLToolbar::add(FuncRequest const & func, docstring const & tooltip)
                if (lyx::getStatus(func).unknown())
                        break;
 
-               Action * action = new Action(owner_, toolbarbackend.getIcon(func), lyx::docstring(), func, tooltip);
+               Action * action = new Action(owner_,
+                       toolbarbackend.getIcon(func),
+                       tooltip,
+                       func,
+                       tooltip);
                addAction(action);
                ActionVector.push_back(action);
                break;