X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FAction.cpp;h=ca229fbbe5dc0eb48222c2b4a7b592c9de88eb8f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=006cf3a9fa3055dbb09bfe08eae5785811274386;hpb=2bf1c09376de37a3d66b79ca5f4304f29d5b4d06;p=lyx.git diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index 006cf3a9fa..ca229fbbe5 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -25,10 +25,10 @@ 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"