Reverse yesterday's attempt to squash b_u_g 1530.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8801 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-06-02 20:13:18 +00:00
parent f277063f66
commit 684299d107
37 changed files with 41 additions and 36 deletions

View File

@ -1,3 +1,8 @@
2004-06-02 Angus Leeming <leeming@lyx.org>
* Q[a-zA-Z]*DialogBase.C: reverse yesterday's patch, as discussed
on the list.
2004-06-01 Angus Leeming <leeming@lyx.org> 2004-06-01 Angus Leeming <leeming@lyx.org>
* Q[a-zA-Z]*DialogBase.C: tell the QDialog base class who the * Q[a-zA-Z]*DialogBase.C: tell the QDialog base class who the

View File

@ -19,7 +19,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QBibitemDialog::QBibitemDialog(QBibitem * form) QBibitemDialog::QBibitemDialog(QBibitem * form)
: QBibitemDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QBibitemDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -32,7 +32,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QBibtexDialog::QBibtexDialog(QBibtex * form) QBibtexDialog::QBibtexDialog(QBibtex * form)
: QBibtexDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QBibtexDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -24,7 +24,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QBoxDialog::QBoxDialog(QBox * form) QBoxDialog::QBoxDialog(QBox * form)
: QBoxDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QBoxDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(restorePB, SIGNAL(clicked()), connect(restorePB, SIGNAL(clicked()),

View File

@ -19,7 +19,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QBranchDialog::QBranchDialog(QBranch * form) QBranchDialog::QBranchDialog(QBranch * form)
: QBranchDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QBranchDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QChangesDialog::QChangesDialog(QChanges * form) QChangesDialog::QChangesDialog(QChanges * form)
: QChangesDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QChangesDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QCharacterDialog::QCharacterDialog(QCharacter * form) QCharacterDialog::QCharacterDialog(QCharacter * form)
: QCharacterDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QCharacterDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -34,7 +34,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QCitationDialog::QCitationDialog(QCitation * form) QCitationDialog::QCitationDialog(QCitation * form)
: QCitationDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QCitationDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(restorePB, SIGNAL(clicked()), connect(restorePB, SIGNAL(clicked()),

View File

@ -74,7 +74,7 @@ string fix_name(const string & str)
QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form) QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form)
: QDelimiterDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QDelimiterDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
setCaption(qt_("LyX: Delimiters")); setCaption(qt_("LyX: Delimiters"));

View File

@ -46,7 +46,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QDocumentDialog::QDocumentDialog(QDocument * form) QDocumentDialog::QDocumentDialog(QDocument * form)
: QDocumentDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), form_(form) : QDocumentDialogBase(0, 0, false, 0), form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),
form, SLOT(slotOK())); form, SLOT(slotOK()));

View File

@ -19,7 +19,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QERTDialog::QERTDialog(QERT * form) QERTDialog::QERTDialog(QERT * form)
: QERTDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QERTDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QErrorListDialog::QErrorListDialog(QErrorList * form) QErrorListDialog::QErrorListDialog(QErrorList * form)
: QErrorListDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QErrorListDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -57,7 +57,7 @@ LengthValidator * unsignedLengthValidator(QLineEdit * ed)
QExternalDialog::QExternalDialog(QExternal * form) QExternalDialog::QExternalDialog(QExternal * form)
: QExternalDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QExternalDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -21,7 +21,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QFloatDialog::QFloatDialog(QFloat * form) QFloatDialog::QFloatDialog(QFloat * form)
: QFloatDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QFloatDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(restorePB, SIGNAL(clicked()), connect(restorePB, SIGNAL(clicked()),

View File

@ -31,7 +31,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QGraphicsDialog::QGraphicsDialog(QGraphics * form) QGraphicsDialog::QGraphicsDialog(QGraphics * form)
: QGraphicsDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QGraphicsDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -22,7 +22,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QIncludeDialog::QIncludeDialog(QInclude * form) QIncludeDialog::QIncludeDialog(QInclude * form)
: QIncludeDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QIncludeDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -23,7 +23,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QIndexDialog::QIndexDialog(QIndex * form) QIndexDialog::QIndexDialog(QIndex * form)
: QIndexDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QIndexDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -25,7 +25,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QLPrintDialog::QLPrintDialog(QPrint * f) QLPrintDialog::QLPrintDialog(QPrint * f)
: QPrintDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QPrintDialogBase(0, 0, false, 0),
form_(f) form_(f)
{ {
connect(printPB, SIGNAL(clicked()), connect(printPB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QLogDialog::QLogDialog(QLog * form) QLogDialog::QLogDialog(QLog * form)
: QLogDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QLogDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -77,7 +77,7 @@ bool panel_initialised[nr_panels];
QMathDialog::QMathDialog(QMath * form) QMathDialog::QMathDialog(QMath * form)
: QMathDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QMathDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
// enlarge the symbols ComboBox (no scrollbar) // enlarge the symbols ComboBox (no scrollbar)

View File

@ -40,7 +40,7 @@ char v_align_c[] = "tcb";
QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form) QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form)
: QMathMatrixDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QMathMatrixDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
setCaption(qt_("LyX: Insert Matrix")); setCaption(qt_("LyX: Insert Matrix"));

View File

@ -19,7 +19,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QNoteDialog::QNoteDialog(QNote * form) QNoteDialog::QNoteDialog(QNote * form)
: QNoteDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QNoteDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -26,7 +26,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QParagraphDialog::QParagraphDialog(QParagraph * form) QParagraphDialog::QParagraphDialog(QParagraph * form)
: QParagraphDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QParagraphDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -53,7 +53,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QPrefsDialog::QPrefsDialog(QPrefs * form) QPrefsDialog::QPrefsDialog(QPrefs * form)
: QPrefsDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), form_(form) : QPrefsDialogBase(0, 0, false, 0), form_(form)
{ {
connect(savePB, SIGNAL(clicked()), connect(savePB, SIGNAL(clicked()),
form, SLOT(slotOK())); form, SLOT(slotOK()));

View File

@ -23,7 +23,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QRefDialog::QRefDialog(QRef * form) QRefDialog::QRefDialog(QRef * form)
: QRefDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QRefDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -42,7 +42,7 @@ void uniqueInsert(QComboBox * box, QString const & text)
QSearchDialog::QSearchDialog(QSearch * form) QSearchDialog::QSearchDialog(QSearch * form)
: QSearchDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QSearchDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QSendtoDialog::QSendtoDialog(QSendto * form) QSendtoDialog::QSendtoDialog(QSendto * form)
: QSendtoDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QSendtoDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -19,7 +19,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QShowFileDialog::QShowFileDialog(QShowFile * form) QShowFileDialog::QShowFileDialog(QShowFile * form)
: QShowFileDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QShowFileDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -21,7 +21,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form)
: QSpellcheckerDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QSpellcheckerDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -22,7 +22,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form) QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form)
: QTabularCreateDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QTabularCreateDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
table->setMinimumSize(100,100); table->setMinimumSize(100,100);

View File

@ -29,7 +29,7 @@ namespace frontend {
QTabularDialog::QTabularDialog(QTabular * form) QTabularDialog::QTabularDialog(QTabular * form)
: QTabularDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QTabularDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -25,7 +25,7 @@ namespace frontend {
QTexinfoDialog::QTexinfoDialog(QTexinfo * form) QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
: QTexinfoDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QTexinfoDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),

View File

@ -27,7 +27,7 @@ namespace frontend {
QThesaurusDialog::QThesaurusDialog(QThesaurus * form) QThesaurusDialog::QThesaurusDialog(QThesaurus * form)
: QThesaurusDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QThesaurusDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
// hide the pointless QHeader // hide the pointless QHeader

View File

@ -21,7 +21,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QTocDialog::QTocDialog(QToc * form) QTocDialog::QTocDialog(QToc * form)
: QTocDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QTocDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
// disable sorting // disable sorting

View File

@ -20,7 +20,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QURLDialog::QURLDialog(QURL * form) QURLDialog::QURLDialog(QURL * form)
: QURLDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QURLDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -28,7 +28,7 @@ namespace lyx {
namespace frontend { namespace frontend {
QVSpaceDialog::QVSpaceDialog(QVSpace * form) QVSpaceDialog::QVSpaceDialog(QVSpace * form)
: QVSpaceDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QVSpaceDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(okPB, SIGNAL(clicked()), connect(okPB, SIGNAL(clicked()),

View File

@ -20,7 +20,7 @@ namespace frontend {
QWrapDialog::QWrapDialog(QWrap * form) QWrapDialog::QWrapDialog(QWrap * form)
: QWrapDialogBase(qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), 0, false, 0), : QWrapDialogBase(0, 0, false, 0),
form_(form) form_(form)
{ {
connect(restorePB, SIGNAL(clicked()), connect(restorePB, SIGNAL(clicked()),