header cleanup

[lyx.git] / src / frontends / qt4 / Action.cpp

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 683f073165015a0ea67be11a53a89c38472838fe..c048729970d449da4f22c457a580ee980bd485f9 100644 (file)
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,10 +12,7 @@
 
 #include "Action.h"
 
-#include "frontends/LyXView.h"
-
-#include "callback.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "GuiView.h"
@@ -28,16 +25,14 @@ namespace lyx {
 namespace frontend {
 
 
-Action::Action(GuiViewBase & lyxView, QString const & icon,
+Action::Action(GuiView & lyxView, QIcon const & icon,
          QString const & text, FuncRequest const & func,
          QString const & tooltip)
        : QAction(&lyxView), func_(func), lyxView_(lyxView)
 {
-#if QT_VERSION >= 0x040200
        // only Qt/Mac handles that
        setMenuRole(NoRole);
-#endif
-       setIcon(QPixmap(icon));
+       setIcon(icon);
        setText(text);
        setToolTip(tooltip);
        setStatusTip(tooltip);
@@ -66,9 +61,9 @@ void Action::update()
 
 void Action::action()
 {
-       //      LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: "
-       //      "\n";
-       lyxView_.dispatch(func_);
+       //LYXERR(Debug::ACTION, "calling LyXFunc::dispatch: func_: ");
+       theLyXFunc().setLyXView(&lyxView_);
+       lyx::dispatch(func_);
        triggered(this);
 }