do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp
index 0349fdf448f5012dc243d58befe0851637bae56e..80e2152a9908b0eb6528aae3af0d8032a0b0d388 100644 (file)
--- a/src/frontends/qt4/GuiPrint.cpp
+++ b/src/frontends/qt4/GuiPrint.cpp
@@ -17,12 +17,10 @@
 #include "qt_helpers.h"
 #include "PrinterParams.h"
 
-#include "frontend_helpers.h"
-
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "support/convert.h"
 #include "support/FileFilterList.h"
@@ -35,21 +33,17 @@
 #include <QSpinBox>
 #include <QPushButton>
 
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileFilterList;
-
 
-GuiPrint::GuiPrint(LyXView & lv)
-       : GuiDialog(lv, "print"), Controller(this)
+GuiPrint::GuiPrint(GuiView & lv)
+       : GuiDialog(lv, "print", qt_("Print Document"))
 {
        setupUi(this);
-       setController(this, false);
-       setViewTitle(_("Print Document"));
 
        connect(printPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -172,7 +166,7 @@ void GuiPrint::applyView()
 
        params_ = PrinterParams(t,
                fromqstr(printerED->text()),
-               support::os::internal_path(fromqstr(fileED->text())),
+               os::internal_path(fromqstr(fileED->text())),
                allRB->isChecked(),
                fromED->text().toUInt(),
                toED->text().toUInt(),
@@ -185,14 +179,14 @@ void GuiPrint::applyView()
 }
 
 
-bool GuiPrint::initialiseParams(std::string const &)
+bool GuiPrint::initialiseParams(string const &)
 {
        /// get global printer parameters
-       string const name = support::changeExtension(buffer().fileName(),
+       string const name = changeExtension(buffer().absFileName(),
                                        lyxrc.print_file_extension);
        params_ = PrinterParams(PrinterParams::PRINTER, lyxrc.printer, name);
 
-       dialog().setButtonsValid(true); // so that the user can press Ok
+       setButtonsValid(true); // so that the user can press Ok
        return true;
 }
 
@@ -260,7 +254,7 @@ void GuiPrint::dispatchParams()
 }
 
 
-Dialog * createGuiPrint(LyXView & lv) { return new GuiPrint(lv); }
+Dialog * createGuiPrint(GuiView & lv) { return new GuiPrint(lv); }
 
 
 } // namespace frontend