Skip paint event when in the middle of a buffer operation

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

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 724d9daf8ba2ba658a7bd09f69e1fda69dd1d6ef..bd102e6b73a8f987c248ec55dec6e07759ee35c0 100644 (file)
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,23 +12,44 @@
 
 #include "Action.h"
 
+// DispatchResult.h is needed by the windows compiler because lyx::dispatch
+// returns a DispatchResult const reference. Gcc does not complain. Weird...
+#include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "GuiView.h"
-#include "LyXFunc.h"
+#include "LyX.h"
+
 #include "qt_helpers.h"
 
 #include "support/debug.h"
 #include "support/lstrings.h"
 
+using namespace std;
+
+
 namespace lyx {
 namespace frontend {
 
 
-Action::Action(GuiView * lyxView, QIcon const & icon,
-         QString const & text, FuncRequest const & func,
-         QString const & tooltip, QObject * parent)
-       : QAction(parent), func_(func), lyxView_(lyxView)
+Action::Action(FuncRequest func, QIcon const & icon, QString const & text,
+               QString const & tooltip, QObject * parent)
+       : QAction(parent), func_(make_shared<FuncRequest>(move(func)))
+{
+       init(icon, text, tooltip);
+}
+
+
+Action::Action(shared_ptr<FuncRequest const> func,
+               QIcon const & icon, QString const & text,
+               QString const & tooltip, QObject * parent)
+       : QAction(parent), func_(func)
+{
+       init(icon, text, tooltip);
+}
+
+
+void Action::init(QIcon const & icon, QString const & text,
+                  QString const & tooltip)
 {
        // only Qt/Mac handles that
        setMenuRole(NoRole);
@@ -43,12 +64,12 @@ Action::Action(GuiView * lyxView, QIcon const & icon,
 
 void Action::update()
 {
-       FuncStatus const status = getStatus(func_);
+       FuncStatus const status = getStatus(*func_);
 
-       if (status.onoff(true)) {
+       if (status.onOff(true)) {
                setCheckable(true);
                setChecked(true);
-       } else if (status.onoff(false)) {
+       } else if (status.onOff(false)) {
                setCheckable(true);
                setChecked(false);
        } else {
@@ -61,16 +82,13 @@ void Action::update()
 
 void Action::action()
 {
-       //LYXERR(Debug::ACTION, "calling LyXFunc::dispatch: func_: ");
-
-       if (lyxView_)
-               theLyXFunc().setLyXView(lyxView_);
+       //LYXERR(Debug::ACTION, "calling lyx::dispatch: func_: ");
 
-       lyx::dispatch(func_);
+       lyx::dispatch(*func_);
        triggered(this);
 }
 
 } // namespace frontend
 } // namespace lyx
 
-#include "Action_moc.cpp"
+#include "moc_Action.cpp"