Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 41f358e31c1729466e87806a1312a172892818fe..53a132d5ff987a300eea9908fe3fb81dee4f257f 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -13,6 +13,9 @@
 #include "GuiDialog.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
+#include "FuncRequest.h"
+
+#include "insets/InsetCommand.h"
 
 #include "support/debug.h"
 
@@ -26,15 +29,15 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
-GuiDialog::GuiDialog(GuiView & lv, string const & name, QString const & title)
+GuiDialog::GuiDialog(GuiView & lv, QString const & name, QString const & title)
        :  QDialog(&lv), Dialog(lv, name, "LyX: " + title), is_closing_(false)
 {}
 
 
-void GuiDialog::closeEvent(QCloseEvent *e)
+void GuiDialog::closeEvent(QCloseEvent * ev)
 {
        slotClose();
-       e->accept();
+       ev->accept();
 }
 
 
@@ -109,9 +112,6 @@ void GuiDialog::updateView()
        setUpdatesEnabled(true);
 }
 
-} // namespace frontend
-} // namespace lyx
-
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -119,17 +119,11 @@ void GuiDialog::updateView()
 //
 /////////////////////////////////////////////////////////////////////
 
-#include "FuncRequest.h"
-#include "insets/InsetCommand.h"
-
-using namespace std;
-
-namespace lyx {
-namespace frontend {
 
-GuiCommand::GuiCommand(GuiView & lv, string const & name,
+GuiCommand::GuiCommand(GuiView & lv, QString const & name,
        QString const & title)
-       : GuiDialog(lv, name, title), params_(insetCode(name)), lfun_name_(name)
+       : GuiDialog(lv, name, title), params_(insetCode(fromqstr(name))),
+               lfun_name_(fromqstr(name))
 {
 }
 
@@ -138,7 +132,7 @@ bool GuiCommand::initialiseParams(string const & data)
 {
        // The name passed with LFUN_INSET_APPLY is also the name
        // used to identify the mailer.
-       InsetCommandMailer::string2params(lfun_name_, data, params_);
+       InsetCommand::string2params(lfun_name_, data, params_);
        return true;
 }
 
@@ -148,8 +142,7 @@ void GuiCommand::dispatchParams()
        if (lfun_name_.empty())
                return;
 
-       string const lfun = 
-               InsetCommandMailer::params2string(lfun_name_, params_);
+       string const lfun = InsetCommand::params2string(lfun_name_, params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }