rename QPrintDialog to avoid name conflict

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5557 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt2/ChangeLog

@@ -1,3 +1,16 @@
+2002-10-30  John Levon  <levon@movementarian.org>
+
+	* QPrintDialog.[hC]: move to ...
+
+	* QLPrintDialog.[hC]: ... here to prevent name clash
+
+	* QPrint.h:
+	* QPrint.C:
+	* Dialogs_impl.h: 
+	* Makefile.dialogs: from above
+ 
+	* QSpellchecker.C: reset progress
+ 
 2002-10-30  John Levon  <levon@movementarian.org>
 
 	* QGraphics.C:

src/frontends/qt2/Dialogs_impl.h

@@ -91,7 +91,7 @@
 #include "QPreambleDialog.h"
 //#include "QPreferences.h"
 #include "QPrint.h"
-#include "QPrintDialog.h"
+#include "QLPrintDialog.h"
 #include "QRef.h"
 #include "QRefDialog.h"
 #include "QSearch.h"

src/frontends/qt2/Makefile.dialogs

@@ -73,8 +73,8 @@ DIALOGSOURCES = \
 	QParagraph.C QParagraphDialog.C \
 	QPreamble.h QPreambleDialog.h \
 	QPreamble.C QPreambleDialog.C \
-	QPrint.h QPrintDialog.h \
+	QPrint.h QLPrintDialog.h \
-	QPrint.C QPrintDialog.C \
+	QPrint.C QLPrintDialog.C \
 	QRef.h QRefDialog.h \
 	QRef.C QRefDialog.C \
 	QSearch.h QSearchDialog.h \
@@ -121,7 +121,7 @@ MOCDIALOGS = \
 	QMinipageDialog_moc.C \
 	QParagraphDialog_moc.C \
 	QPreambleDialog_moc.C \
-	QPrintDialog_moc.C \
+	QLPrintDialog_moc.C \
 	QRefDialog_moc.C \
 	QSearchDialog_moc.C \
 	QSendtoDialog_moc.C \

src/frontends/qt2/QLPrintDialog.C

@@ -1,5 +1,5 @@
 /**
- * \file QPrintDialog.C
+ * \file QLPrintDialog.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -20,7 +20,7 @@
 #include "support/lstrings.h"
 
 #include "QPrint.h"
-#include "QPrintDialog.h"
+#include "QLPrintDialog.h"
 
 #include <qfiledialog.h>
 #include <qcheckbox.h>
@@ -31,7 +31,7 @@
 #include <qspinbox.h>
 
 
-QPrintDialog::QPrintDialog(QPrint * f)
+QLPrintDialog::QLPrintDialog(QPrint * f)
 	: QPrintDialogBase(0, 0, false, 0),
 	form_(f)
 {
@@ -42,13 +42,13 @@ QPrintDialog::QPrintDialog(QPrint * f)
 }
 
 
-void QPrintDialog::change_adaptor()
+void QLPrintDialog::change_adaptor()
 {
 	form_->changed();
 }
 
 
-void QPrintDialog::browseClicked()
+void QLPrintDialog::browseClicked()
 {
 	QString file =
 		QFileDialog::getOpenFileName(QString::null,
@@ -62,7 +62,7 @@ void QPrintDialog::browseClicked()
 }
 
 
-void QPrintDialog::fileChanged()
+void QLPrintDialog::fileChanged()
 {
 	if (!fileED->text().isEmpty())
 		fileRB->setChecked(true);
@@ -70,21 +70,21 @@ void QPrintDialog::fileChanged()
 }
 
 
-void QPrintDialog::copiesChanged(int i)
+void QLPrintDialog::copiesChanged(int i)
 {
 	collateCB->setEnabled(i != 1);
 	form_->changed();
 }
 
 
-void QPrintDialog::printerChanged()
+void QLPrintDialog::printerChanged()
 {
 	printerRB->setChecked(true);
 	form_->changed();
 }
 
 
-void QPrintDialog::pagerangeChanged()
+void QLPrintDialog::pagerangeChanged()
 {
 	int const from = strToUnsignedInt(fromED->text().latin1());
 	int const to = strToUnsignedInt(toED->text().latin1());

src/frontends/qt2/QLPrintDialog.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file QPrintDialog.h
+ * \file QLPrintDialog.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
  * Full author contact details are available in file CREDITS
  */
 
-#ifndef QPRINTDIALOG_H
+#ifndef QLPRINTDIALOG_H
-#define QPRINTDIALOG_H
+#define QLPRINTDIALOG_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -21,10 +21,10 @@
 
 class QPrint;
 
-class QPrintDialog : public QPrintDialogBase {
+class QLPrintDialog : public QPrintDialogBase {
 	Q_OBJECT
 public:
-	QPrintDialog(QPrint * f);
+	QLPrintDialog(QPrint * f);
 protected slots:
 	virtual void change_adaptor();
 	virtual void browseClicked();
@@ -36,4 +36,4 @@ private:
 	QPrint * form_;
 };
 
-#endif // QPRINTDIALOG_H
+#endif // QLPRINTDIALOG_H

src/frontends/qt2/QPrint.C

@@ -22,7 +22,7 @@
 #include "gettext.h"
 
 #include "QPrint.h"
-#include "QPrintDialog.h"
+#include "QLPrintDialog.h"
 #include "Qt2BC.h"
 
 #include <qlineedit.h>
@@ -31,10 +31,8 @@
 #include <qspinbox.h>
 #include <qpushbutton.h>
 
-// FIXME FIXME QPrintDialog is getting destructed twice !!!!
 
-
+typedef Qt2CB<ControlPrint, Qt2DB<QLPrintDialog> > base_class;
-typedef Qt2CB<ControlPrint, Qt2DB<QPrintDialog> > base_class;
 
 
 QPrint::QPrint()
@@ -45,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);

src/frontends/qt2/QPrint.h

@@ -20,15 +20,15 @@
 #include "Qt2Base.h"
 
 class ControlPrint;
-class QPrintDialog;
+class QLPrintDialog;
 
 ///
 class QPrint
-	: public Qt2CB<ControlPrint, Qt2DB<QPrintDialog> >
+	: public Qt2CB<ControlPrint, Qt2DB<QLPrintDialog> >
 {
 public:
 	///
-	friend class QPrintDialog;
+	friend class QLPrintDialog;
 	///
 	QPrint();
 private:

src/frontends/qt2/QSpellchecker.C

@@ -50,6 +50,7 @@ void QSpellchecker::update_contents()
 	dialog_->wordED->setText("");
 	dialog_->replaceCO->clear();
 	dialog_->suggestionsLB->clear();
+	dialog_->spellcheckPR->setProgress(0.0);
 }
 
 

src/frontends/qt2/TODO

@@ -4,10 +4,6 @@ is incomplete.
 
 Those with asterisks are what I perceive as being "big jobs"
 
-lyx_gui (qt)
-
-	- move out lyxserver
- 
 QDocument
 
 	- finalize bullets 
@@ -18,7 +14,7 @@ QDocument
 
 qfont_loader
 
-	- use lyxrc, check for failure
+	- use lyxrc
  
 QForks
 
@@ -41,10 +37,6 @@ QLyXKeySym
 
 	- getISOEncoded - get this to work (*)
 
-QMathDialog
-
-	- finish
- 
 QPreferences
 
 	- implement me (*)