X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FAction.cpp;h=ca229fbbe5dc0eb48222c2b4a7b592c9de88eb8f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=d15bdaecdd2980a20c15579c4348d76d4360d242;hpb=1060f922f06f1906e49d68498e1e8dc8d919a3f0;p=lyx.git diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index d15bdaecdd..ca229fbbe5 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -12,23 +12,23 @@ #include "Action.h" -#include "debug.h" #include "FuncRequest.h" #include "FuncStatus.h" #include "GuiView.h" #include "LyXFunc.h" #include "qt_helpers.h" +#include "support/debug.h" #include "support/lstrings.h" namespace lyx { namespace frontend { -Action::Action(GuiView & lyxView, QIcon const & icon, +Action::Action(GuiView * lyxView, QIcon const & icon, QString const & text, FuncRequest const & func, - QString const & tooltip) - : QAction(&lyxView), func_(func), lyxView_(lyxView) + QString const & tooltip, QObject * parent) + : QAction(parent), func_(func), lyxView_(lyxView) { // only Qt/Mac handles that setMenuRole(NoRole); @@ -62,7 +62,7 @@ void Action::update() void Action::action() { //LYXERR(Debug::ACTION, "calling LyXFunc::dispatch: func_: "); - theLyXFunc().setLyXView(&lyxView_); + lyx::dispatch(func_); triggered(this); } @@ -70,4 +70,4 @@ void Action::action() } // namespace frontend } // namespace lyx -#include "Action_moc.cpp" +#include "moc_Action.cpp"