Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QPrint.C

diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C
index 2bb4f578f6620ca28e85110fde6654261a7b187f..07f721d0f39b3bbca1c2d5f9a35229d579831d47 100644 (file)
--- a/src/frontends/qt2/QPrint.C
+++ b/src/frontends/qt2/QPrint.C
@@ -1,10 +1,12 @@
 /**
  * \file QPrint.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
- * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author John Levon
+ * \author Edwin Leuven
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -14,12 +16,13 @@
 #endif
 
 #include "LyXView.h"
+#include "PrinterParams.h"
 #include "ControlPrint.h"
 #include "support/lstrings.h"
 #include "gettext.h"
 
 #include "QPrint.h"
-#include "QPrintDialog.h"
+#include "QLPrintDialog.h"
 #include "Qt2BC.h"
 
 #include <qlineedit.h>
@@ -28,9 +31,9 @@
 #include <qspinbox.h>
 #include <qpushbutton.h>
 
-// FIXME FIXME QPrintDialog is getting destructed twice !!!!
- 
-typedef Qt2CB<ControlPrint, Qt2DB<QPrintDialog> > base_class;
+
+typedef Qt2CB<ControlPrint, Qt2DB<QLPrintDialog> > base_class;
+
 
 QPrint::QPrint()
        : base_class(_("Print"))
@@ -40,7 +43,7 @@ QPrint::QPrint()
 
 void QPrint::build_dialog()
 {
-       dialog_.reset(new QPrintDialog(this));
+       dialog_.reset(new QLPrintDialog(this));
 
        bc().setOK(dialog_->printPB);
        bc().setCancel(dialog_->closePB);
@@ -54,7 +57,7 @@ void QPrint::update_contents()
        // only reset params if a different buffer
        if (!pp.file_name.empty() && pp.file_name == dialog_->fileED->text().latin1())
                return;
- 
+
        dialog_->printerED->setText(pp.printer_name.c_str());
        dialog_->fileED->setText(pp.file_name.c_str());
 
@@ -65,19 +68,19 @@ void QPrint::update_contents()
        dialog_->reverseCB->setChecked(pp.reverse_order);
 
        dialog_->copiesSB->setValue(pp.count_copies);
- 
+
        dialog_->oddCB->setChecked(pp.odd_pages);
        dialog_->evenCB->setChecked(pp.even_pages);
- 
+
        dialog_->collateCB->setChecked(pp.sorted_copies);
- 
+
        if (pp.all_pages) {
                dialog_->allRB->setChecked(true);
                return;
        }
 
        dialog_->rangeRB->setChecked(true);
- 
+
        QString s;
        s.setNum(pp.from_page);
        dialog_->fromED->setText(s);
@@ -95,9 +98,9 @@ void QPrint::apply()
        PrinterParams const pp(t,
                dialog_->printerED->text().latin1(),
                dialog_->fileED->text().latin1(),
-               dialog_->allRB->isChecked(), 
+               dialog_->allRB->isChecked(),
                dialog_->fromED->text().toUInt(),
-               dialog_->toED->text().toUInt(), 
+               dialog_->toED->text().toUInt(),
                dialog_->oddCB->isChecked(),
                dialog_->evenCB->isChecked(),
                dialog_->copiesSB->text().toUInt(),