X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FAction.cpp;h=3014e9a82f6a6604279c0f6aada3d071ec203d3a;hb=39d569661a3f4411d4501f9a8db9c7360ef5d568;hp=bf18bef6db267122161dae252f5053e96be57a5e;hpb=200f5a292f596a5a789a21ec5e790a42f94f8e45;p=lyx.git

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index bf18bef6db..3014e9a82f 100644
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,30 +12,26 @@
 
 #include "Action.h"
 
-#include "frontends/LyXView.h"
-
-#include "debug.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"
 
 namespace lyx {
 namespace frontend {
 
 
-Action::Action(GuiViewBase & 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)
 {
-#if QT_VERSION >= 0x040200
 	// only Qt/Mac handles that
 	setMenuRole(NoRole);
-#endif
 	setIcon(icon);
 	setText(text);
 	setToolTip(tooltip);
@@ -49,10 +45,10 @@ void Action::update()
 {
 	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 {
@@ -65,13 +61,13 @@ void Action::update()
 
 void Action::action()
 {
-	//	LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: "
-	//	"\n";
-	lyxView_.dispatch(func_);
+	//LYXERR(Debug::ACTION, "calling lyx::dispatch: func_: ");
+
+	lyx::dispatch(func_);
 	triggered(this);
 }
 
 } // namespace frontend
 } // namespace lyx
 
-#include "Action_moc.cpp"
+#include "moc_Action.cpp"