move our stuff off the Q* namespace

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

diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h
index 03a3e0da8d9c471f02b3cf71f2075e3955f5620f..79bf2b5ff07676e9d11f8952a6a1a6f29795d369 100644 (file)
--- a/src/frontends/qt4/Action.h
+++ b/src/frontends/qt4/Action.h
@@ -13,35 +13,31 @@
 #define ACTION_H
 
 #include "frontends/LyXView.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/docstring.h"
 
 #include <QAction>
 
-//class FuncRequest;
-
-//class string;
-
 namespace lyx {
 namespace frontend {
 
-class GuiView;
+class GuiViewBase;
 
 /**
  * Action - Qt interface with LyX' FuncRequest.
  *
  * Action can be used in LyX menubar and/or toolbars.
  */
-class Action: public QAction {
+class Action : public QAction {
        Q_OBJECT
 public:
 
-       Action(GuiView & lyxView, lyx::docstring const & text,
-               FuncRequest const & func, lyx::docstring const & tooltip = lyx::docstring());
+       Action(GuiViewBase & lyxView, docstring const & text,
+               FuncRequest const & func, docstring const & tooltip = docstring());
 
-       Action(GuiView & lyxView, std::string const & icon, lyx::docstring const & text,
-               FuncRequest const & func, lyx::docstring const & tooltip = lyx::docstring());
+       Action(GuiViewBase & lyxView, std::string const & icon, docstring const & text,
+               FuncRequest const & func, docstring const & tooltip = docstring());
 
        void update();
 
@@ -56,7 +52,7 @@ private Q_SLOTS:
 
 private:
        FuncRequest const & func_ ;
-       GuiView & lyxView_;
+       GuiViewBase & lyxView_;
 };