X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FAction.cpp;h=c048729970d449da4f22c457a580ee980bd485f9;hb=ba76bf5eb85db5a10839fccee3430d906d3f7b70;hp=66d8dc413b2479943fe9c9f95d5eac4fb4e770b2;hpb=8c5f097b5d59cc157b39a08fa5d3f5fa82cf1e4f;p=lyx.git

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 66d8dc413b..c048729970 100644
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,58 +12,34 @@
 
 #include "Action.h"
 
+#include "support/debug.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "GuiView.h"
+#include "LyXFunc.h"
 #include "qt_helpers.h"
 
-#include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "FuncStatus.h"
-#include "debug.h"
-
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
-
-using std::string;
-using std::endl;
-
 namespace lyx {
 namespace frontend {
 
 
-Action::Action(GuiView & lyxView, docstring const & text,
-		FuncRequest const & func, docstring const & tooltip)
+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
-	setText(toqstr(text));
-	setToolTip(toqstr(tooltip));
-	setStatusTip(toqstr(tooltip));
+	setIcon(icon);
+	setText(text);
+	setToolTip(tooltip);
+	setStatusTip(tooltip);
 	connect(this, SIGNAL(triggered()), this, SLOT(action()));
 	update();
 }
 
-Action::Action(GuiView & lyxView, string const & icon, docstring const & text,
-		FuncRequest const & func, docstring const & tooltip)
-		: QAction(&lyxView), func_(func), lyxView_(lyxView)
-{
-	setIcon(QPixmap(icon.c_str()));
-	setText(toqstr(text));
-	setToolTip(toqstr(tooltip));
-	setStatusTip(toqstr(tooltip));
-	connect(this, SIGNAL(triggered()), this, SLOT(action()));
-	update();
-}
-
-/*
-void Action::setAction(FuncRequest const & func)
-{
-	func_=func;
-}
-*/
 
 void Action::update()
 {
@@ -85,9 +61,9 @@ void Action::update()
 
 void Action::action()
 {
-//	LYXERR(Debug::ACTION) << "calling LyXFunc::dispatch: func_: " << func_ << endl;
-
-	lyxView_.dispatch(func_);
+	//LYXERR(Debug::ACTION, "calling LyXFunc::dispatch: func_: ");
+	theLyXFunc().setLyXView(&lyxView_);
+	lyx::dispatch(func_);
 	triggered(this);
 }