From 6627177575b97af9d6692571f59fe9317630c902 Mon Sep 17 00:00:00 2001 From: John Levon Date: Wed, 30 Oct 2002 19:47:15 +0000 Subject: [PATCH] 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 | 13 +++++++++++++ src/frontends/qt2/Dialogs_impl.h | 2 +- src/frontends/qt2/Makefile.dialogs | 6 +++--- .../qt2/{QPrintDialog.C => QLPrintDialog.C} | 18 +++++++++--------- .../qt2/{QPrintDialog.h => QLPrintDialog.h} | 12 ++++++------ src/frontends/qt2/QPrint.C | 8 +++----- src/frontends/qt2/QPrint.h | 6 +++--- src/frontends/qt2/QSpellchecker.C | 1 + src/frontends/qt2/TODO | 10 +--------- 9 files changed, 40 insertions(+), 36 deletions(-) rename src/frontends/qt2/{QPrintDialog.C => QLPrintDialog.C} (81%) rename src/frontends/qt2/{QPrintDialog.h => QLPrintDialog.h} (77%) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 9ff458d913..4c94c4268d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,16 @@ +2002-10-30 John Levon + + * 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 * QGraphics.C: diff --git a/src/frontends/qt2/Dialogs_impl.h b/src/frontends/qt2/Dialogs_impl.h index 90617f27b4..cdb72e97a3 100644 --- a/src/frontends/qt2/Dialogs_impl.h +++ b/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" diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs index 6ed774bc3a..c7e931cc30 100644 --- a/src/frontends/qt2/Makefile.dialogs +++ b/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.C QPrintDialog.C \ + QPrint.h QLPrintDialog.h \ + 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 \ diff --git a/src/frontends/qt2/QPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C similarity index 81% rename from src/frontends/qt2/QPrintDialog.C rename to src/frontends/qt2/QLPrintDialog.C index 573fb710f1..3b9d54d923 100644 --- a/src/frontends/qt2/QPrintDialog.C +++ b/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 #include @@ -31,7 +31,7 @@ #include -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()); diff --git a/src/frontends/qt2/QPrintDialog.h b/src/frontends/qt2/QLPrintDialog.h similarity index 77% rename from src/frontends/qt2/QPrintDialog.h rename to src/frontends/qt2/QLPrintDialog.h index b28f872c70..dfcc87bbdb 100644 --- a/src/frontends/qt2/QPrintDialog.h +++ b/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 -#define QPRINTDIALOG_H +#ifndef QLPRINTDIALOG_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 diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index bff4975181..07f721d0f3 100644 --- a/src/frontends/qt2/QPrint.C +++ b/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 @@ -31,10 +31,8 @@ #include #include -// FIXME FIXME QPrintDialog is getting destructed twice !!!! - -typedef Qt2CB > base_class; +typedef Qt2CB > 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); diff --git a/src/frontends/qt2/QPrint.h b/src/frontends/qt2/QPrint.h index f036a15a2a..e189488c1c 100644 --- a/src/frontends/qt2/QPrint.h +++ b/src/frontends/qt2/QPrint.h @@ -20,15 +20,15 @@ #include "Qt2Base.h" class ControlPrint; -class QPrintDialog; +class QLPrintDialog; /// class QPrint - : public Qt2CB > + : public Qt2CB > { public: /// - friend class QPrintDialog; + friend class QLPrintDialog; /// QPrint(); private: diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index adeb9f643a..d3df1219c9 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/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); } diff --git a/src/frontends/qt2/TODO b/src/frontends/qt2/TODO index 0f3790db7a..8d1b121210 100644 --- a/src/frontends/qt2/TODO +++ b/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 (*) -- 2.39.2