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

src/frontends/qt2/ChangeLog

@@ -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>
 
 	* Q[a-zA-Z]*DialogBase.C: tell the QDialog base class who the

src/frontends/qt2/QBibitemDialog.C

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

src/frontends/qt2/QBibtexDialog.C

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

src/frontends/qt2/QBoxDialog.C

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

src/frontends/qt2/QBranchDialog.C

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

src/frontends/qt2/QChangesDialog.C

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

src/frontends/qt2/QCharacterDialog.C

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

src/frontends/qt2/QCitationDialog.C

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

src/frontends/qt2/QDelimiterDialog.C

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

src/frontends/qt2/QDocumentDialog.C

@@ -46,7 +46,7 @@ namespace lyx {
 namespace frontend {
 
 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()),
 		form, SLOT(slotOK()));

src/frontends/qt2/QERTDialog.C

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

src/frontends/qt2/QErrorListDialog.C

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

src/frontends/qt2/QExternalDialog.C

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

src/frontends/qt2/QFloatDialog.C

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

src/frontends/qt2/QGraphicsDialog.C

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

src/frontends/qt2/QIncludeDialog.C

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

src/frontends/qt2/QIndexDialog.C

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

src/frontends/qt2/QLPrintDialog.C

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

src/frontends/qt2/QLogDialog.C

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

src/frontends/qt2/QMathDialog.C

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

src/frontends/qt2/QMathMatrixDialog.C

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

src/frontends/qt2/QNoteDialog.C

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

src/frontends/qt2/QParagraphDialog.C

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

src/frontends/qt2/QPrefsDialog.C

@@ -53,7 +53,7 @@ namespace lyx {
 namespace frontend {
 
 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()),
 		form, SLOT(slotOK()));

src/frontends/qt2/QRefDialog.C

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

src/frontends/qt2/QSearchDialog.C

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

src/frontends/qt2/QSendtoDialog.C

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

src/frontends/qt2/QShowFileDialog.C

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

src/frontends/qt2/QSpellcheckerDialog.C

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

src/frontends/qt2/QTabularCreateDialog.C

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

src/frontends/qt2/QTabularDialog.C

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

src/frontends/qt2/QTexinfoDialog.C

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

src/frontends/qt2/QThesaurusDialog.C

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

src/frontends/qt2/QTocDialog.C

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

src/frontends/qt2/QURLDialog.C

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

src/frontends/qt2/QVSpaceDialog.C

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

src/frontends/qt2/QWrapDialog.C

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